Merge branch 'develop' into feature-licancan

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -175,7 +175,7 @@ emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91
 
 emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
 
-emp.dispatch.emp.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u7CFB\u7EDF\u65E0\u5BF9\u5E94\u9879\u76EE\u6863\u6848\uFF0C\u6863\u6848\u76F8\u5173\u540C\u8272\u5B57\u6BB5\u5FC5\u586B
+emp.dispatch.emp.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u7CFB\u7EDF\u65E0\u5BF9\u5E94\u9879\u76EE\u6863\u6848\uFF0C\u6863\u6848\u53CA\u5408\u540C\u76F8\u5173\u5B57\u6BB5\u5FC5\u586B
 
 emp.dispatch.settleDomain.stop=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u5DF2\u505C\u6B62\u5408\u4F5C
 

yifu-common/yifu-common-ekp/pom.xml

@@ -19,5 +19,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot</artifactId>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpSalaryUtil.java

 package com.yifu.cloud.plus.v1.yifu.ekp.util;
 
 import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpSalaryProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
+import io.micrometer.core.instrument.util.StringUtils;
 import lombok.extern.log4j.Log4j2;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.http.*;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import cn.hutool.json.JSONObject;
 
 /**
  * @Author fxj
@@ -17,4 +26,48 @@ public class EkpSalaryUtil {
 	@Autowired
 	private EkpSalaryProperties ekpProperties;
 
+	public String sendToEKP(EkpSalaryParam param){
+		log.info("推送EKP开始--薪资明细数据");
+		RestTemplate yourRestTemplate = new RestTemplate();
+		try{
+			String formValues = new ObjectMapper().writeValueAsString(param);
+			//指向EKP的接口url
+			//把ModelingAppModelParameterAddForm转换成MultiValueMap
+			JSONObject loginName = new JSONObject();
+			loginName.append("LoginName",ekpProperties.getLoginName());
+			String loginData = new ObjectMapper().writeValueAsString(loginName);
+			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
+			//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
+			wholeForm.add("docSubject",ekpProperties.getDocSubject());
+			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
+			//wholeForm.add("docCreator", loginData);
+			wholeForm.add("docStatus", ekpProperties.getDocStatus());
+			wholeForm.add("fdModelId", ekpProperties.getFdModelId());
+			wholeForm.add("fdFlowId", ekpProperties.getFdFlowId());
+			//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
+			wholeForm.add("formValues", formValues);
+			//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
+			System.out.println("wholeForm:"+wholeForm);
+			HttpHeaders headers = new HttpHeaders();
+			//如果EKP对该接口启用了Basic认证，那么客户端需要加入
+			//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON
+			headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+			//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
+			HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
+			//有返回值的情况 VO可以替换成具体的JavaBean
+			ResponseEntity<String> obj = yourRestTemplate.exchange(ekpProperties.getUrl(), HttpMethod.POST, entity, String.class);
+			String body = obj.getBody();
+			if (StringUtils.isBlank(body)){
+				log.error(EkpConstants.SEND_FAILED);
+				return null;
+			}else{
+				log.info(EkpConstants.SEND_SUCCESS+body);
+				return body;
+			}
+		}catch (Exception e){
+			log.info(e.getMessage());
+			return null;
+		}
+	}
+
 }

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/constant/EkpConstants.java

+package com.yifu.cloud.plus.v1.yifu.ekp.constant;
+
+/**
+ * @Author fxj
+ * @Date 2022/8/22
+ * @Description
+ * @Version 1.0
+ */
+public interface EkpConstants {
+	/**
+	 * 推送成功
+	 */
+	String SEND_SUCCESS = "推送成功";
+
+	/**
+	 * 推送失败
+	 */
+	String SEND_FAILED = "推送失败";
+}

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java

+package com.yifu.cloud.plus.v1.yifu.ekp.vo;
+
+import lombok.Data;
+
+/**
+ * @Author fxj
+ * @Date 2022/8/22
+ * @Description 薪资明细对应参数
+ * @Version 1.0
+ */
+@Data
+public class EkpSalaryParam {
+}

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/SalaryTask.java

@@ -114,5 +114,18 @@ public class SalaryTask {
 		log.info("------------定时生成时生成最低工资提醒数据-定时任务结束------------");
 	}
 
+	/**
+	 * @Author hgw
+	 * @Description 定时生成本期申报
+	 * @Date 2022-8-23 16:36:51
+	 * @Param
+	 * @return
+	 **/
+	public void doRefreshStatisticsTaxAuto() {
+		log.info("------------定时生成本期申报-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprSalarylProperties.getAppUrl(),daprSalarylProperties.getAppId(),"/tstatisticstaxsalary/inner/doRefreshStatisticsTaxAuto","", Object.class, SecurityConstants.FROM_IN);
+		log.info("------------定时生成本期申报-定时任务结束------------");
+	}
+
 
 }
\ No newline at end of file

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -208,6 +208,42 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelAttribute(name = "自有员工应发总额")
 	@ExcelProperty("自有员工应发总额")
 	private BigDecimal ownMoney;
+	/**
+	 * 发薪特殊值人数，默认0
+	 */
+	@ExcelAttribute(name = "发薪特殊值人数，默认0")
+	@ExcelProperty("发薪特殊值人数，默认0")
+	private Integer specialNums;
+	/**
+	 * 发薪特殊值应发总额
+	 */
+	@ExcelAttribute(name = "发薪特殊值应发总额")
+	@ExcelProperty("发薪特殊值应发总额")
+	private BigDecimal specialMoney;
+	/**
+	 * 薪资员工发放稿酬/劳务费人数，默认0
+	 */
+	@ExcelAttribute(name = "薪资员工发放稿酬/劳务费人数，默认0")
+	@ExcelProperty("薪资员工发放稿酬/劳务费人数，默认0")
+	private Integer salaryNums;
+	/**
+	 * 薪资员工发放稿酬/劳务费总额
+	 */
+	@ExcelAttribute(name = "薪资员工发放稿酬/劳务费总额")
+	@ExcelProperty("薪资员工发放稿酬/劳务费总额")
+	private BigDecimal salaryMoney;
+	/**
+	 * 本月是否重复金额人数，默认0
+	 */
+	@ExcelAttribute(name = "本月是否重复金额人数，默认0")
+	@ExcelProperty("本月是否重复金额人数，默认0")
+	private Integer repeatNums;
+	/**
+	 * 本月是否重复金额总额
+	 */
+	@ExcelAttribute(name = "本月是否重复金额总额")
+	@ExcelProperty("本月是否重复金额总额")
+	private BigDecimal repeatMoney;
 	/**
 	 * 自有员工强行提交的备注
 	 */

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsTaxSalaryController.java

@@ -19,8 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsTaxSalary;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsTaxSalaryService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsTaxSalarySearchVo;
@@ -100,6 +102,20 @@ public class TStatisticsTaxSalaryController {
 		tStatisticsTaxSalaryService.listExport(response, searchVo);
 	}
 
+	/**
+	 * @Description: 定时任务-年度报账+工资薪金+本期申报
+	 * @Author: hgw
+	 * @Date: 2022-8-23 16:21:08
+	 * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
+	 **/
+	@Inner
+	@Operation(description = "定时任务-年度报账+工资薪金+本期申报")
+	@PostMapping("/inner/doRefreshStatisticsTaxAuto")
+	public R<String> doRefreshStatisticsTaxAuto() {
+		String settleMonth = DateUtil.addMonth(-1);
+		return tStatisticsTaxSalaryService.doRefreshStatisticsTaxAll(settleMonth);
+	}
+
 	/**
 	 * @param settleMonth 结算月
 	 * @Description: 手动刷新-年度报账+工资薪金+本期申报

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccount2022Mapper.java

@@ -38,6 +38,15 @@ public interface TSalaryAccount2022Mapper extends BaseMapper<TSalaryAccount2022>
      */
     IPage<TSalaryAccount2022> getTSalaryAccount2022Page(Page<TSalaryAccount2022> page, @Param("tSalaryAccount2022") TSalaryAccount2022 tSalaryAccount2022);
 
+	/**
+	 * @param tableName
+	 * @Description: 自动创建年度报账表
+	 * @Author: hgw
+	 * @Date: 2022/8/23 16:32
+	 * @return: void
+	 **/
+	void createAccountYear(@Param("tableName") String tableName);
+
 	int deleteSalaryAccountYearByMonth(@Param("tableName") String tableName, @Param("lastMonth") String lastMonth);
 
 	int insertIntoSalaryAccountYear(@Param("tableName") String tableName, @Param("lastMonth") String lastMonth);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1543,6 +1543,19 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		int ownNum = 0;
 		// 自有员工应发金额
 		BigDecimal ownMoney = BigDecimal.ZERO;
+		// 发薪特殊值人数
+		int specialNums = 0;
+		// 发薪特殊值应发总额
+		BigDecimal specialMoney = BigDecimal.ZERO;
+		// 薪资员工发放稿酬/劳务费人数
+		int salaryNums = 0;
+		// 薪资员工发放稿酬/劳务费总额
+		BigDecimal salaryMoney = BigDecimal.ZERO;
+		// 本月是否重复金额人数
+		int repeatNums = 0;
+		// 本月是否重复金额总额
+		BigDecimal repeatMoney = BigDecimal.ZERO;
+
 		BigDecimal relaySalary;  //工资应发
 		// 劳务费、稿酬是否含有发薪false：否；true：是
 		boolean haveSalaryFlag = false;
@@ -1599,6 +1612,24 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					ownMoney = ownMoney.add(relaySalary);
 				}
 
+				// 发薪特殊值人数以及应发金额
+				if (Common.isNotNull(a.getHaveSpecialFlag()) && a.getHaveSpecialFlag() == 1) {
+					specialNums++;
+					specialMoney = specialMoney.add(relaySalary);
+				}
+
+				// 薪资员工发放稿酬/劳务费人数以及应发金额
+				if (Common.isNotNull(a.getHaveSalaryFlag()) && a.getHaveSalaryFlag() == 1) {
+					salaryNums++;
+					salaryMoney = salaryMoney.add(relaySalary);
+				}
+
+				// 本月是否重复金额人数以及应发金额
+				if (Common.isNotNull(a.getIsRepeat()) && a.getIsRepeat() == 1) {
+					repeatNums++;
+					repeatMoney = repeatMoney.add(relaySalary);
+				}
+
 				//累计扣税list
 				asList = this.getLaborAsList(itemMap.get(a.getEmpIdcard()), a.getSettlementMonth());
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccount2022ServiceImpl.java

@@ -47,6 +47,7 @@ public class TSalaryAccount2022ServiceImpl extends ServiceImpl<TSalaryAccount202
 		if (Common.isEmpty(tableName)) {
 			tableName = "t_salary_account_" + settleMonth.substring(0, 4);
 		}
+		baseMapper.createAccountYear(tableName);
 		int firstDelete = baseMapper.deleteSalaryAccountYearByMonth(tableName, settleMonth);
 		if (firstDelete != -1) {
 			int firstCreate = baseMapper.insertIntoSalaryAccountYear(tableName, settleMonth);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSpecialDeducationSumServiceImpl.java

@@ -12,6 +12,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSpecialDeducationSum;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSpecialDeducationSumMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSpecialDeducationSumService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -99,12 +100,11 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
      }
 
      /**
-      * @param sdsList
-      * @Description: 保存专项
-      * @Author: hgw
-      * @Date: 2019/10/14 14:48
-      * @return: com.yifu.cloud.v1.common.core.util.R
-      **/
+      * @Author fxj
+      * @Description 保存专项
+      * @Date 10:05 2022/8/23
+     **/
+	 @Transactional
      @Override
      public R<List<ErrorMessage>> uploadSds(List<TSpecialDeducationSum> sdsList) {
           if (Common.isNotNull(sdsList)) {
@@ -149,7 +149,7 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
                     s.setCreateBy(String.valueOf(user.getId()));
                }
                if (this.saveBatch(sdsList)){
-				   return R.failed(CommonConstants.SAVE_SUCCESS);
+				   return R.ok(null,CommonConstants.SAVE_SUCCESS);
 			   }else {
 				   return R.failed(CommonConstants.SAVE_FAILED);
 			   }
@@ -163,7 +163,7 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
 		int i =0;
 		for (TSpecialDeducationSum data: sdsList) {
 			i++;
-			errorMessage = util1.checkEntity(data, -1);
+			errorMessage = util1.checkEntity(data, i);
 			if (Common.isNotNull(errorMessage)) {
 				errorMessages.add(errorMessage);
 			}else {

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccount2022Mapper.xml

@@ -208,6 +208,54 @@
         </where>
     </select>
 
+	<!-- 自动创建年度报账表 -->
+	<update id="createAccountYear" statementType="STATEMENT">
+		CREATE TABLE IF NOT EXISTS ${tableName} (
+		`ID` varchar(32) NOT NULL COMMENT '主键',
+		`INVOICE_TITLE` varchar(50) DEFAULT NULL COMMENT '封面抬头',
+		`EMP_ID` varchar(32) DEFAULT NULL COMMENT '员工 ID',
+		`EMP_NAME` varchar(50) DEFAULT NULL COMMENT '员工姓名',
+		`EMP_IDCARD` varchar(25) DEFAULT NULL COMMENT '员工身份证号',
+		`SETTLE_DEPART_ID` varchar(32) DEFAULT NULL COMMENT '结算部门id',
+		`SETTLE_DEPART_NO` varchar(50) DEFAULT NULL COMMENT '结算部门no',
+		`SETTLE_DEPART_NAME` varchar(50) DEFAULT NULL COMMENT '结算部门name',
+		`SETTLEMENT_MONTH` varchar(20) DEFAULT NULL COMMENT '结算月',
+		`TAX_MONTH` varchar(6) DEFAULT NULL COMMENT '计税月份',
+		`REAL_SALARY` decimal(12,2) DEFAULT '0.00' COMMENT '应发',
+		`cost_reduction` decimal(12,2) DEFAULT '0.00' COMMENT '减除',
+		`SPECIAL_DEDU_MONEY` decimal(12,2) DEFAULT '0.00' COMMENT '专项',
+		`child_eduInfo_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计子女教育',
+		`housing_loan_Interest_expense_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计住房贷款利息',
+		`housing_rentalInfo_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计住房租金',
+		`continuing_education_expense_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计继续教育',
+		`support_elderly_expense_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计赡养老人',
+		`PERSONAL_SOCIAL` decimal(12,2) DEFAULT '0.00' COMMENT '个人社保',
+		`PERSONAL_FUND` decimal(12,2) DEFAULT '0.00' COMMENT '个人公积金',
+		`withholiding_person_social` decimal(12,2) DEFAULT '0.00' COMMENT '代扣个人社保',
+		`withholiding_person_fund` decimal(12,2) DEFAULT '0.00' COMMENT '代扣个人公积金',
+		`enterprise_annuity` decimal(12,2) DEFAULT '0.00' COMMENT '企业年金',
+		`salary_tax` decimal(12,2) DEFAULT '0.00' COMMENT '个税',
+		`actual_salary_sum` decimal(12,2) DEFAULT '0.00' COMMENT '实发',
+		`annual_bonus` decimal(12,2) DEFAULT '0.00' COMMENT '年终奖(单独扣税的部分)',
+		`annual_bonus_tax` decimal(12,2) DEFAULT '0.00' COMMENT '年终奖单独扣税',
+		`exemption_persion_tax` decimal(12,2) DEFAULT '0.00' COMMENT '免个税个人代扣',
+		`unit_id` varchar(32) DEFAULT NULL COMMENT '单位id',
+		`unit_no` varchar(50) DEFAULT NULL COMMENT '单位no',
+		`unit_name` varchar(50) DEFAULT NULL COMMENT '单位name',
+		`sum_baby_money` decimal(12,2) DEFAULT '0.00' COMMENT '累计婴幼儿照护费用',
+		`IS_NEW_EMPLOYEE` varchar(1) DEFAULT NULL COMMENT '是否当月新增人员（0否1是）',
+		`CREATE_MONTH` varchar(6) DEFAULT NULL COMMENT '入职年月',
+		`EMP_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '手机号码',
+		PRIMARY KEY (`ID`) USING BTREE,
+		UNIQUE KEY `SY_ACCOUNT_ID` (`ID`) USING BTREE,
+		KEY `SY_ACCOUNT_SETTLEMENT_MONTH` (`SETTLEMENT_MONTH`) USING BTREE,
+		KEY `SY_ACCOUNT_SETTLE_DEPART_ID` (`SETTLE_DEPART_ID`) USING BTREE,
+		KEY `SY_ACCOUNT_EMP_IDCARD` (`EMP_IDCARD`) USING BTREE,
+		KEY `SY_ACCOUNT_EMP_NAME` (`EMP_NAME`) USING BTREE,
+		KEY `SY_ACCOUNT_INVOICETITLE` (`INVOICE_TITLE`) USING BTREE
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='工资报账年度表'
+	</update>
+
 	<delete id="deleteSalaryAccountYearByMonth" >
 		delete from ${tableName} where SETTLEMENT_MONTH = #{lastMonth};
 	</delete>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -63,7 +63,13 @@
     <result property="unitName" column="UNIT_NAME"/>
     <result property="sendTime" column="SEND_TIME"/>
     <result property="sendMonth" column="SEND_MONTH"/>
-	  <result property="invoiceTitle" column="INVOICE_TITLE"/>
+    <result property="invoiceTitle" column="INVOICE_TITLE"/>
+    <result property="specialNums" column="SPECIAL_NUMS"/>
+    <result property="specialMoney" column="SPECIAL_MONEY"/>
+    <result property="salaryNums" column="SALARY_NUMS"/>
+    <result property="salaryMoney" column="SALARY_MONEY"/>
+    <result property="repeatMoney" column="REPEAT_MONEY"/>
+    <result property="repeatNums" column="REPEAT_NUMS"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -106,6 +112,12 @@
                 a.UNIT_NO,
                 a.SEND_TIME,
                 a.SEND_MONTH,
+                a.SPECIAL_NUMS,
+                a.SPECIAL_MONEY,
+                a.SALARY_NUMS,
+                a.SALARY_MONEY,
+                a.REPEAT_MONEY,
+                a.REPEAT_NUMS,
 				a.INVOICE_TITLE
     </sql>
     <sql id="tSalaryStandard_where">
@@ -182,6 +194,24 @@
                     <if test="tSalaryStandard.ownMoney != null">
                         AND a.OWN_MONEY = #{tSalaryStandard.ownMoney}
                     </if>
+			<if test="tSalaryStandard.specialNums != null">
+				AND a.SPECIAL_NUMS = #{tSalaryStandard.specialNums}
+			</if>
+			<if test="tSalaryStandard.specialMoney != null">
+				AND a.SPECIAL_MONEY = #{tSalaryStandard.specialMoney}
+			</if>
+			<if test="tSalaryStandard.salaryNums != null">
+				AND a.SALARY_NUMS = #{tSalaryStandard.salaryNums}
+			</if>
+			<if test="tSalaryStandard.salaryMoney != null">
+				AND a.SALARY_MONEY = #{tSalaryStandard.salaryMoney}
+			</if>
+			<if test="tSalaryStandard.repeatMoney != null">
+				AND a.REPEAT_MONEY = #{tSalaryStandard.repeatMoney}
+			</if>
+			<if test="tSalaryStandard.repeatNums != null">
+				AND a.REPEAT_NUMS = #{tSalaryStandard.repeatNums}
+			</if>
                     <if test="tSalaryStandard.ownRemark != null and tSalaryStandard.ownRemark.trim() != ''">
                         AND a.OWN_REMARK = #{tSalaryStandard.ownRemark}
                     </if>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -54,7 +54,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 身份证号
 	 */
 	@Length(max = 20, message = "身份证号 不能超过20 个字符" )
-	@ExcelAttribute(name = "身份证号", maxLength = 20)
+	@ExcelAttribute(name = "身份证号", maxLength = 20, isNotEmpty = true)
 	@Schema(description = "身份证号" )
 	@ExcelProperty("身份证号" )
 	private String empIdcard;
@@ -148,7 +148,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 就职岗位
 	 */
 	@Length(max = 30, message = "岗位 不能超过30 个字符" )
-	@ExcelAttribute(name = "岗位", maxLength = 30, isNotEmpty = true)
+	@ExcelAttribute(name = "岗位", maxLength = 30)
 	@Schema(description = "岗位" )
 	@ExcelProperty("岗位" )
 	private String post;
@@ -166,7 +166,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 工时制：1标准工时 2 综合工时 3不定时工时制
 	 */
 	@Length(max = 1, message = "工时制 不能超过50 个字符" )
-	@ExcelAttribute(name = "工时制", maxLength = 50, isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS, isNotEmpty = true)
+	@ExcelAttribute(name = "工时制", maxLength = 50, isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS)
 	@Schema(description = "工时制：1标准工时 2 综合工时 3不定时工时制" )
 	@ExcelProperty("工时制" )
 	private String workingHours;
@@ -174,7 +174,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 民族
 	 */
 	@Length(max = 32, message = "民族 不能超过32 个字符" )
-	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL, isNotEmpty = true)
+	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL)
 	@Schema(description = "民族" )
 	@ExcelProperty("民族" )
 	private String empNational;
@@ -239,7 +239,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 学历名称
 	 */
-	@ExcelAttribute(name = "学历")
+	@ExcelAttribute(name = "学历",isNotEmpty = true)
 	@NotNull(message = "学历不可为空")
 	@Schema(description = "学历：派增只做记录" )
 	@ExcelProperty(value ="学历")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1930,11 +1930,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isEmpty(empVo)){
 			if (Common.isEmpty(excel.getFileProvince())
 					|| Common.isEmpty(excel.getFileCity())
+					|| Common.isEmpty(excel.getIdCardProvince())
+					|| Common.isEmpty(excel.getIdCardCity())
 					|| Common.isEmpty(excel.getWorkingHours())
 					|| Common.isEmpty(excel.getEmpNational())
 					|| Common.isEmpty(excel.getEmpMobile())
 					|| Common.isEmpty(excel.getEmpType())
-					|| Common.isEmpty(excel.getPost())){
+					|| Common.isEmpty(excel.getPost())
+					|| Common.isEmpty(excel.getEducationName())
+					|| Common.isEmpty(excel.getContractName())){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_EMPTY)));
 				return true;
 			}
@@ -1958,6 +1962,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				return true;
 			}
 		}
+		Date contractDateTemp = excel.getContractStart();
 		/*项目档案有可用状态的合同：
 		不对合同做判断，取值：项目档案的合同；
 		项目档案无可用状态的合同：
@@ -2093,7 +2098,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				return true;
 			}
 			//校验各项基数
-			if (validSocialBaseInfo(errorMessageList, excel, empVo, socialSet)){
+			if (validSocialBaseInfo(errorMessageList, excel, empVo, socialSet,contractDateTemp)){
 				return true;
 			}
 		}
@@ -2139,7 +2144,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return false;
 	}
 
-	private boolean validSocialBaseInfo(List<ErrorMessage> errorMessageList, TDispatchImportVo excel, DispatchEmpVo empVo, SysBaseSetInfo socialSet) {
+	private boolean validSocialBaseInfo(List<ErrorMessage> errorMessageList, TDispatchImportVo excel, DispatchEmpVo empVo, SysBaseSetInfo socialSet, Date contractDateTemp) {
 		if (Common.isNotNull(socialSet) && CommonConstants.ONE_STRING.equals(excel.getPaymentType())
 				&& (Common.isNotNull(excel.getPensionCardinal())
 				&& (excel.getPensionCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
@@ -2183,13 +2188,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
 					return true;
 				}
-				flag = (Common.isNotNull(excel.getContractStart())
-						&& ((!excel.getContractStart().equals(excel.getPensionStart()) && Common.isNotNull(excel.getPensionStart()))
-						|| (!excel.getContractStart().equals(excel.getMedicalStart()) && Common.isNotNull(excel.getMedicalStart()))
-						|| (!excel.getContractStart().equals(excel.getUnemployStart()) && Common.isNotNull(excel.getUnemployStart()))
-						|| (!excel.getContractStart().equals(excel.getBirthStart()) && Common.isNotNull(excel.getBirthStart()))
-						|| (!excel.getContractStart().equals(excel.getWorkInjuryStart()) && Common.isNotNull(excel.getWorkInjuryStart()))
-						|| (!excel.getContractStart().equals(excel.getBigailmentStart()) && Common.isNotNull(excel.getBigailmentStart()))));
+				flag = (Common.isNotNull(contractDateTemp)
+						&& ((!contractDateTemp.equals(excel.getPensionStart()) && Common.isNotNull(excel.getPensionStart()))
+						|| (!contractDateTemp.equals(excel.getMedicalStart()) && Common.isNotNull(excel.getMedicalStart()))
+						|| (!contractDateTemp.equals(excel.getUnemployStart()) && Common.isNotNull(excel.getUnemployStart()))
+						|| (!contractDateTemp.equals(excel.getBirthStart()) && Common.isNotNull(excel.getBirthStart()))
+						|| (!contractDateTemp.equals(excel.getWorkInjuryStart()) && Common.isNotNull(excel.getWorkInjuryStart()))
+						|| (!contractDateTemp.equals(excel.getBigailmentStart()) && Common.isNotNull(excel.getBigailmentStart()))));
 				if (flag){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2)));
 					return true;

yifu-social/yifu-social-biz/src/main/resources/application-dev.yml

@@ -48,6 +48,6 @@ spring:
     activate:
       on-profile: dev
   redis:
-    host: 192.168.1.65
-    port: 22379
+    host: 127.0.0.1
+    port: 6379
     password: '@yf_2017'
\ No newline at end of file