新增兑换券信息管理模块

common/src/main/java/com/winsun/bean/YxtCoupon.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 〈院线通兑换券〉
+ *
+ * @author PXL
+ * @create 2020/5/7 10:48
+ */
+@Data
+@TableName("hhr_yxt_card")
+public class YxtCoupon implements Serializable {
+    /**
+     *
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     *兑换券账号
+     */
+    @TableField("card_number")
+    private String cardNumber;
+    /**
+     *
+     */
+    @TableField("password")
+    private String password;
+    /**
+     *上传时间
+     */
+    @TableField("update_date")
+    private Date updateDate;
+    /**
+     *1: 未售出  2：已售出  3:售出中
+     */
+    @TableField("state")
+    private Integer state;
+    /**
+     *有效截止日期
+     */
+    @TableField("validity_period")
+    private Date validityPeriod;
+    /**
+     *上架状态  1：已上架  2：已下架
+     */
+    @TableField("shelf_state")
+    private Integer shelfState;
+    /**
+     * 是否删除（0：未删除，1：已删除）
+     */
+    @TableField("del_flag")
+    private Integer delFlag;
+
+}

common/src/main/java/com/winsun/bean/ZjlWage.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 〈总经理薪酬〉
+ * @author PXL
+ * @create 2020/5/6 14:25
+ */
+@Data
+@TableName("hhr_manager_wage")
+public class ZjlWage implements Serializable {
+
+    private static final long serialVersionUID = 7341453717011045526L;
+    /**
+     *
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     *
+     */
+    @TableField("month")
+    private String month;
+    /**
+     *归属
+     */
+    @TableField("department")
+    private String department;
+    /**
+     *
+     */
+    @TableField("name")
+    private String name;
+    /**
+     *身份证
+     */
+    @TableField("id_card")
+    private String idCard;
+    /**
+     *分公司
+     */
+    @TableField("company")
+    private String company;
+    /**
+     *属性
+     */
+    @TableField("attribute")
+    private String attribute;
+    /**
+     *岗位工资
+     */
+    @TableField("position_wage")
+    private double positionWage;
+    /**
+     *绩效奖金（绩效工资+提成）
+     */
+    @TableField("performance_bonus")
+    private double performanceBonus;
+    /**
+     *专项奖
+     */
+    @TableField("special_bonus")
+    private double specialBonus;
+    /**
+     *年终奖
+     */
+    @TableField("year_end_bonus")
+    private double yearEndBonus;
+    /**
+     *节日费(元旦,春节,五一,十一)
+     */
+    @TableField("festival_fee")
+    private double festivalFee;
+    /**
+     *高温补贴(6-10月)
+     */
+    @TableField("high_subsidy")
+    private double highSubsidy;
+    /**
+     *通讯补贴
+     */
+    @TableField("correspondence_subsidy")
+    private double correspondenceSubsidy;
+    /**
+     *餐费补贴
+     */
+    @TableField("table_money_subsidy")
+    private double tableMoneySubsidy;
+    /**
+     *交通补贴
+     */
+    @TableField("traffic_subsidy")
+    private double trafficSubsidy;
+    /**
+     *专项奖（秋营奖励）
+     */
+    @TableField("special_bonus_autumn")
+    private double specialBonusAutumn;
+    /**
+     *其他补扣补退
+     */
+    @TableField("other_subsidy")
+    private double otherSubsidy;
+    /**
+     *应发合计
+     */
+    @TableField("total_yf")
+    private double totalYf;
+    /**
+     *个人养老保险
+     */
+    @TableField("endowment_insurance_personal")
+    private double endowmentInsurancePersonal;
+    /**
+     *个人缴纳失业保险
+     */
+    @TableField("unenployment_insurance_personal")
+    private double unenploymentInsurancePersonal;
+    /**
+     *个人缴纳医疗保险
+     */
+    @TableField("medicare_personal")
+    private double medicarePersonal;
+    /**
+     *个人保险小计
+     */
+    @TableField("total_insurance")
+    private double totalInsurance;
+    /**
+     *个人缴纳住房公积金
+     */
+    @TableField("reserved_fund")
+    private double reservedFund;
+    /**
+     *个税
+     */
+    @TableField("reserved_fund_tax")
+    private double reservedFundTax;
+    /**
+     *年终奖个税
+     */
+    @TableField("year_end_bonus_tax")
+    private double yearEndBonusTax;
+    /**
+     *个人其他补交补退
+     */
+    @TableField("other_fee_personal")
+    private double otherFeePersonal;
+    /**
+     *个人工会费
+     */
+    @TableField("dues_personal")
+    private double duesPersonal;
+    /**
+     *个人缴交小计
+     */
+    @TableField("total_fee_personal")
+    private double totalFeePersonal;
+    /**
+     *实发合计
+     */
+    @TableField("total_sf")
+    private double totalSf;
+    /**
+     *单位养老保险
+     */
+    @TableField("endowment_insurance_unit")
+        private double endowmentInsuranceUnit;
+    /**
+     *单位失业保险
+     */
+    @TableField("unenployment_insurance_unit")
+    private double unenploymentInsuranceUnit;
+    /**
+     *单位医疗保险
+     */
+    @TableField("medicare_unit")
+    private double medicareUnit;
+    /**
+     *单位工伤保险
+     */
+    @TableField("employment_injury_insurance_unit")
+    private double employmentInjuryInsuranceUnit;
+    /**
+     *单位生育保险
+     */
+    @TableField("birth_insurance_unit")
+    private double birthInsuranceUnit;
+    /**
+     *重大疾病保险
+     */
+    @TableField("illness_insurance_unit")
+    private double illnessInsuranceUnit;
+    /**
+     *单位公积金
+     */
+    @TableField("reserved_fund_unit")
+    private double reservedFundUnit;
+    /**
+     *工会计提
+     */
+    @TableField("labor_union_fee_unit")
+    private double laborUnionFeeUnit;
+    /**
+     *商业意外险
+     */
+    @TableField("accident_insurance_unit")
+    private double accidentInsuranceUnit;
+    /**
+     *残保金
+     */
+    @TableField("disability_insurance_unit")
+    private double disabilityInsuranceUnit;
+    /**
+     *单位其他补交补退
+     */
+    @TableField("other_fee_unit")
+    private double otherFeeUnit;
+    /**
+     *单位缴交小计
+     */
+    @TableField("total_fee_unit")
+    private double totalFeeUnit;
+    /**
+     *总个人人工成本合计
+     */
+    @TableField("total_cast_personal")
+    private double totalCastPersonal;
+    /**
+     *附加信息
+     */
+    @TableField("addition_msg")
+    private String additionMsg;
+    /**
+     *邮电人才服务管理费（200/人）
+     */
+    @TableField("manage_fee")
+    private double manageFee;
+    /**
+     *单位总成本（含支出税点）
+     */
+    @TableField("total_cast_unit")
+    private double totalCastUnit;
+    /**
+     *个人缴纳养老保险2
+     */
+    @TableField("endowment_insurance_personal2")
+    private double endowmentInsurancePersonal2;
+    /**
+     *个人缴纳失业保险2
+     */
+    @TableField("unenployment_insurance_personal2")
+    private double unenploymentInsurancePersonal2;
+    /**
+     *个人缴纳医疗保险2
+     */
+    @TableField("medicare_personal2")
+    private double medicarePersonal2;
+    /**
+     *个人缴纳住房公积金2
+     */
+    @TableField("resvered_fund_personal2")
+    private double resveredFundPersonal2;
+    /**
+     *单位养老保险2
+     */
+    @TableField("endowment_insurance_unit2")
+    private double endowmentInsuranceUnit2;
+    /**
+     *单位失业保险2
+     */
+    @TableField("unenployment_insurance_unit2")
+    private double unenploymentInsuranceUnit2;
+    /**
+     *单位医疗保险2
+     */
+    @TableField("medicare_unit2")
+    private double medicareUnit2;
+    /**
+     *单位工伤保险2
+     */
+    @TableField("employment_injury_insurance_unit2")
+    private double employmentInjuryInsuranceUnit2;
+    /**
+     *单位生育保险2
+     */
+    @TableField("birth_insurance_unit2")
+    private double birthInsuranceUnit2;
+    /**
+     *重大疾病保险企业缴纳2
+     */
+    @TableField("illness_insurance_unit2")
+    private double illnessInsuranceUnit2;
+    /**
+     *单位住房公积金2
+     */
+    @TableField("reserved_insurance_unit2")
+    private double reservedInsuranceUnit2;
+    /**
+     *合并计税
+     */
+    @TableField("total_insurance_unit2")
+    private double totalInsuranceUnit2;
+    /**
+     *本月计税工资
+     */
+    @TableField("wage")
+    private double wage;
+    /**
+     *本月抵税扣除
+     */
+    @TableField("wage_tax")
+    private double wageTax;
+    /**
+     *本月工资抵税
+     */
+    @TableField("wage_tax_after")
+    private double wageTaxAfter;
+    /**
+     *年终奖应税
+     */
+    @TableField("last_year_end_bonus")
+    private double lastYearEndBonus;
+    /**
+     *年终奖个税计算
+     */
+    @TableField("last_year_end_bonus_tax")
+    private double lastYearEndBonusTax;
+    /**
+     *银行账号
+     */
+    @TableField("bank_account")
+    private String bankAccount;
+    /**
+     *督导成本
+     */
+    @TableField("manager_cast")
+    private double managerCast;
+    /**
+     *学子公司成本
+     */
+    @TableField("xz_company_cast")
+    private double xzCompanyCast;
+
+}

common/src/main/java/com/winsun/mapper/YxtCouponMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.YxtCoupon;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈兑换券Mapper〉
+ *
+ * @author PXL
+ * @create 2020/5/7 10:55
+ */
+@Mapper
+@Component
+public interface YxtCouponMapper extends BaseMapper<YxtCoupon> {
+}

common/src/main/java/com/winsun/mapper/ZjlWageMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.ZjlWage;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈总经理薪酬Mapper〉
+ *
+ * @author PXL
+ * @create 2020/5/6 15:04
+ */
+@Mapper
+@Component
+public interface ZjlWageMapper extends BaseMapper<ZjlWage> {
+
+}

service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java

@@ -184,14 +184,16 @@ public class ManagerKpiController extends BaseController {
         Page<ManagerKpi> page = new Page<>(pageNo, pageSize);
         Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
         managerKpiWrapper.like(StringUtils.isNotBlank(name),"name",name, SqlLike.DEFAULT);
-        String[] months = month.split("\\,");
-        if(!month.equals(",") && StringUtils.isNotEmpty(month)){
-            String m1 = months[0].substring(0,7);
-            String month1 = m1.substring(0,4) + m1.substring(5);
-            String m2 = months[1].substring(0,7);
-            String month2 = m2.substring(0,4) + m2.substring(5);
-            managerKpiWrapper.ge(StringUtils.isNotBlank(month1),"month",month1);
-            managerKpiWrapper.le(StringUtils.isNotBlank(month2),"month",month2);
+        if(StringUtils.isNotBlank(month)){
+            String[] months = month.split("\\,");
+            if(!month.equals(",") && StringUtils.isNotEmpty(month)){
+                String m1 = months[0].substring(0,7);
+                String month1 = m1.substring(0,4) + m1.substring(5);
+                String m2 = months[1].substring(0,7);
+                String month2 = m2.substring(0,4) + m2.substring(5);
+                managerKpiWrapper.ge(StringUtils.isNotBlank(month1),"month",month1);
+                managerKpiWrapper.le(StringUtils.isNotBlank(month2),"month",month2);
+            }
         }
         List<ManagerKpi> managerKpiList = managerKpiMapper.selectList(managerKpiWrapper);
 

service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java

@@ -94,14 +94,25 @@ public class ExcelDealUtils {
 		headMap.put("组织培训", "designPlan");
 		headMap.put("KPI总值", "kpi");
 		headMap.put("KPI月份", "month");
-
 		Map<String, Object> resultMap = dealHeadMap(headMap);
 		resultMap.put("sheetName", sheetName);
-
 		return resultMap;
 	}
-
-	// kpi管理导出excel表头
+	// 兑换券导出excel表头
+	public static Map<String, Object> exchangeCouponExcel(String sheetName){
+		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
+		headMap.put("兑换券账号", "cardNumber");
+		headMap.put("密码", "password");
+		headMap.put("出售状态(1:未售出,2:已售出,3:售出中)", "state");
+		headMap.put("上架状态(1:已上架,2:已下架)", "shelfState");
+		headMap.put("有效截止日期", "validityPeriod");
+		headMap.put("上传时间", "updateDate");
+		headMap.put("是否删除(0:未删除，1:已删除)", "delFlag");
+		Map<String, Object> resultMap = dealHeadMap(headMap);
+		resultMap.put("sheetName", sheetName);
+		return resultMap;
+	}
+	// 管理导出excel表头
 	public static Map<String, Object> wageExcel(String sheetName){
 		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
 		headMap.put("KPI月份", "month");
@@ -121,6 +132,82 @@ public class ExcelDealUtils {
 		return resultMap;
 	}
 
+	// 总经理薪酬管理导出excel表头
+	public static Map<String, Object> zjlWageExcel(String sheetName){
+		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
+		headMap.put("序号", "id");
+		headMap.put("月份", "month");
+		headMap.put("归属", "department");
+		headMap.put("姓名", "name");
+		headMap.put("身份证", "idCard");
+		headMap.put("分公司", "company");
+		headMap.put("属性", "attribute");
+		headMap.put("岗位工资", "positionWage");
+		headMap.put("绩效奖金\n（绩效工资+提成）", "performanceBonus");
+		headMap.put("专项奖", "specialBonus");
+		headMap.put("年终奖", "yearEndBonus");
+		headMap.put("节日费(元旦,春节,五一,十一)", "festivalFee");
+		headMap.put("高温补贴(6-10月)", "highSubsidy");
+		headMap.put("通讯补贴", "correspondenceSubsidy");
+		headMap.put("餐费补贴", "tableMoneySubsidy");
+		headMap.put("交通补贴", "trafficSubsidy");
+		headMap.put("专项奖（秋营奖励）", "specialBonusAutumn");
+		headMap.put("其他补扣补退", "otherSubsidy");
+		headMap.put("应发合计", "totalYf");
+		headMap.put("个人养老保险", "endowmentInsurancePersonal");
+		headMap.put("个人缴纳失业保险", "unenploymentInsurancePersonal");
+		headMap.put("个人缴纳医疗保险", "medicarePersonal");
+		headMap.put("个人保险小计", "totalInsurance");
+		headMap.put("个人缴纳住房公积金", "reservedFund");
+		headMap.put("个税", "reservedFundTax");
+		headMap.put("年终奖个税", "yearEndBonusTax");
+		headMap.put("个人其他补交补退", "otherFeePersonal");
+		headMap.put("个人工会费", "duesPersonal");
+		headMap.put("个人缴交小计", "totalFeePersonal");
+		headMap.put("实发合计", "totalSf");
+		headMap.put("单位养老保险", "endowmentInsuranceUnit");
+		headMap.put("单位失业保险", "unenploymentInsuranceUnit");
+		headMap.put("单位医疗保险", "medicareUnit");
+		headMap.put("单位工伤保险", "employmentInjuryInsuranceUnit");
+		headMap.put("单位生育保险", "birthInsuranceUnit");
+		headMap.put("重大疾病保险", "illnessInsuranceUnit");
+		headMap.put("单位公积金", "reservedFundUnit");
+		headMap.put("工会计提", "laborUnionFeeUnit");
+		headMap.put("商业意外险", "accidentInsuranceUnit");
+		headMap.put("残保金", "disabilityInsuranceUnit");
+		headMap.put("单位其他补交补退", "otherFeeUnit");
+		headMap.put("单位缴交小计", "totalFeeUnit");
+		headMap.put("总个人人工成本合计", "totalCastPersonal");
+		headMap.put("附加信息", "additionMsg");
+		headMap.put("邮电人才服务管理费（200/人）", "manageFee");
+		headMap.put("单位总成本（含支出税点）", "totalCastUnit");
+		headMap.put("个人缴纳养老保险2", "endowmentInsurancePersonal2");
+		headMap.put("个人缴纳失业保险2", "unenploymentInsurancePersonal2");
+		headMap.put("个人缴纳医疗保险2", "medicarePersonal2");
+		headMap.put("个人缴纳住房公积金2", "resveredFundPersonal2");
+		headMap.put("单位养老保险2", "endowmentInsuranceUnit2");
+		headMap.put("单位失业保险2", "unenploymentInsuranceUnit2");
+		headMap.put("单位医疗保险2", "medicareUnit2");
+		headMap.put("单位工伤保险2", "employmentInjuryInsuranceUnit2");
+		headMap.put("单位生育保险2", "birthInsuranceUnit2");
+		headMap.put("重大疾病保险企业缴纳2", "illnessInsuranceUnit2");
+		headMap.put("单位住房公积金2", "reservedInsuranceUnit2");
+		headMap.put("合并计税", "totalInsuranceUnit2");
+		headMap.put("本月计税工资", "wage");
+		headMap.put("本月抵税扣除", "wageTax");
+		headMap.put("本月工资抵税", "wageTaxAfter");
+		headMap.put("年终奖应税", "lastYearEndBonus");
+		headMap.put("年终奖个税计算", "lastYearEndBonusTax");
+		headMap.put("银行账号", "bankAccount");
+		headMap.put("督导成本", "managerCast");
+		headMap.put("学子公司成本", "xzCompanyCast");
+
+		Map<String, Object> resultMap = dealHeadMap(headMap);
+		resultMap.put("sheetName", sheetName);
+
+		return resultMap;
+	}
+
 	// 总经理kpi管理导出excel表头
 	public static Map<String, Object> managerKpiExcel(String sheetName){
 		Map<String, Object> headMap = new LinkedHashMap<String, Object>();