Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -17,6 +17,7 @@
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -117,6 +118,7 @@ public class TEmployeeProject extends BaseEntity {
      */
     @Schema(description ="减项时间")
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
     private LocalDateTime leaveTime;
 
     /**

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java

@@ -215,4 +215,13 @@ public class EmpContractDispatchVo implements Serializable {
 	@ExcelAttribute(name = "客户名称", maxLength = 128)
 	@Schema(description = "客户名称", name = "subjectUnit")
 	private String subjectUnit;
+
+	/**
+	 * 合同年限
+	 */
+	@NotBlank(message = "合同年限不能为空")
+	@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
+	@Schema(description = "合同年限", name = "contractTerm")
+	private String contractTerm;
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -92,6 +92,7 @@ public class InsurancesConstants {
 	 * 项目编码不存在
 	 */
 	public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
+
 	/**
 	 * 替换员工项目不存在
 	 */
@@ -477,9 +478,9 @@ public class InsurancesConstants {
 
 
 	/**
-	 * 替换项目ID和原有项目ID相同
+	 * 替换项目编码和原编码一致
 	 */
-	public static final String DEPT_NO_IDENTICAL = "替换项目ID和原有项目ID相同";
+	public static final String DEPT_NO_IDENTICAL = "替换项目编码和原编码一致";
 
 	/**
 	 * 重复数据

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -2754,7 +2754,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (!BigDecimalUtils.isNullOrZero(actualPremium)){
 						//变更后为单独结算
 						if(CommonConstants.ONE_INT == newSettleType){
-							update(updateWrapper);
 							//作废旧的数据，生成作废结算信息记录
 							TInsuranceSettleCancel cancel = new TInsuranceSettleCancel();
 							cancel.setDeptNo(success.getOldDeptNo());
@@ -2764,6 +2763,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							cancel.setCreateTime(LocalDateTime.now());
 							tInsuranceSettleCancelService.save(cancel);
 							//推送EKP // TODO: 2022/8/2
+							TInsuranceSettle byId = tInsuranceSettleService.getById(insuranceDetailId);
+							//如果已经推送过实际保费，则先作废，再推送新的预估保费和实际保费
+							if (byId.getIsActualPush() ==1){
+
+							}
 							//新增新的结算数据
 							TInsuranceSettle newInsuranceSettle = new TInsuranceSettle();
 							newInsuranceSettle.setInsDetailId(insuranceDetailId);
@@ -2909,7 +2913,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							updateWrapper.set(TInsuranceDetail ::getEstimatePremium,new BigDecimal("0.00"));
 							updateWrapper.set(TInsuranceDetail :: getDefaultSettleId,null);
 							update(updateWrapper);
-							
 						}
 						//变更为合并结算
 						if (CommonConstants.ZERO_INT == newSettleType){
@@ -3553,6 +3556,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<DeptChangeCheckParam> successList = new ArrayList<>();
 		for (int i =0 ;i< deptChangeCheckList.size();i++) {
 			DeptChangeCheckParam param = deptChangeCheckList.get(i);
+			//变更后的项目
 			String newDeptNo = param.getNewDeptNo();
 			if(StringUtils.isBlank(newDeptNo)){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_NOT_EMPTY);
@@ -3573,7 +3577,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			//所属项目
+			//原项目
 			String oldDeptNo = param.getOldDeptNo();
 			if(StringUtils.isBlank(oldDeptNo)){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY);
@@ -3638,7 +3642,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				if (MapUtils.isEmpty(data)){
-					param.setErrorMessage(InsurancesConstants.DEPT_NO_IS_NOT_EXIST);
+					param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_IS_NOT_EXIST);
 					errorList.add(param);
 					continue;
 				}else {

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

@@ -342,6 +342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		EmpDispatchAddVo addVo = new EmpDispatchAddVo();
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
+			empVo = null;
 			excel = excelVOList.get(i);
 			fundSet = fundHoldMap.get(excel.getProvidentHousehold());
 			socialSet = socialHoldMap.get(excel.getSocialHousehold());
@@ -446,6 +447,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			projectsMap = res.getData().getProjectsMap();
 		}
 		for (int i = 0; i < excelVOList.size(); i++) {
+			contract = null;
+			social = null;
+			project = null;
+			fund = null;
 			excel = excelVOList.get(i);
 			if (Common.isNotNull(excelVOTemp) && Common.isNotNull(excelVOTemp.get(excel.getEmpIdcard()))){
 				continue;
@@ -826,8 +831,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										 SysBaseSetInfo fundSet,
 										 TDispatchImportVo excel,
 										 TSocialFundInfo socialFund) {
-		TDispatchInfo dispatch;
-		dispatch = new TDispatchInfo();
+		TDispatchInfo dispatch = new TDispatchInfo();
 		// 初始化派单项
 		initAddHandleItem(excel, socialFund,dispatch,socialSet);
 		dispatch.setOrganName(user.getDeptName());
@@ -882,10 +886,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			dispatch.setEmpId(empVo.getId());
 			dispatch.setEmpNo(empVo.getEmpNo());
 			// 封装合同信息 如果有合同取值实际合同信息
-			dispatch.setContractStart(empVo.getContractStart());
-			dispatch.setContractEnd(empVo.getContractEnd());
-			dispatch.setContractTerm(empVo.getContractTerm());
-			dispatch.setContractType(empVo.getContractType());
+			if (Common.isNotNull(empVo.getContractStart())){
+				dispatch.setContractStart(empVo.getContractStart());
+				dispatch.setContractEnd(empVo.getContractEnd());
+				dispatch.setContractTerm(empVo.getContractTerm());
+				dispatch.setContractType(empVo.getContractType());
+			}
 			dispatch.setFileProvince(empVo.getFileProvince());
 			dispatch.setFileCity(empVo.getFileCity());
 			dispatch.setFileTown(empVo.getFileTown());
@@ -1012,6 +1018,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				fund.setPayPolicy(fundSet.getPayPolicy());
 				fund.setLowerLimit(fundSet.getLowerLimit());
 				fund.setUpperLimit(fundSet.getUpperLimit());
+				fund.setInsuranceIsLatestCardinality(fundSet.getInsuranceIsLatestCardinality());
 				if (Common.isNotNull(fundSet.getProvince())){
 					fund.setFundProvince(Integer.toString(fundSet.getProvince()));
 				}
@@ -1363,10 +1370,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		contract.setContractSubName(excel.getContractSubName());
 		contract.setDeptNo(excel.getSettleDomainCode());
 		contract.setPost(excel.getPost());
-		contract.setSituation(excel.getContractType());
+		contract.setSituation("正常签订");
 		contract.setEmpIdcard(excel.getEmpIdcard());
 		contract.setEmpName(excel.getEmpName());
 		contract.setWorkingHours(excel.getWorkingHours());
+		contract.setContractTerm(excel.getContractTerm());
 		if (Common.isNotNull(excel.getSocialHousehold())){
 			contract.setContractParty(excel.getSocialHousehold());
 		}
@@ -2535,6 +2543,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				Date now = new Date();
 				StringBuffer temp = new StringBuffer();
 				for (TDispatchInfo dis : disList) {
+					auditInfo = new TAuditInfo();
 					if (Common.isNotNull(socialFundMap)){
 						sf = socialFundMap.get(dis.getEmpIdcard());
 					}
@@ -2582,7 +2591,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								}
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
-								auditInfo = new TAuditInfo();
 								auditInfo.setType(CommonConstants.ONE_STRING);
 								if (CommonConstants.ZERO_INT == flag) {
 									temp.setLength(CommonConstants.ZERO_INT);