huych-社保自动化相关提交

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java

@@ -205,6 +205,35 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
 		IGNORE_FIELD.add("id");
 	}
 
+	private static final List<String> SOCIAL_IGNORE_FIELD = new ArrayList<>();
+	static {
+		IGNORE_FIELD.add("joinLeaveDate");
+		IGNORE_FIELD.add("createTime");
+		IGNORE_FIELD.add("empName");
+		IGNORE_FIELD.add("phone");
+		IGNORE_FIELD.add("employeeName");
+		IGNORE_FIELD.add("empIdcard");
+		IGNORE_FIELD.add("deptNo");
+		IGNORE_FIELD.add("deptName");
+		IGNORE_FIELD.add("deptId");
+		IGNORE_FIELD.add("customerUsername");
+		IGNORE_FIELD.add("customerUserLoginname");
+		IGNORE_FIELD.add("position");
+		IGNORE_FIELD.add("contractId");
+		IGNORE_FIELD.add("errorBackInfo");
+		IGNORE_FIELD.add("errorInfo");
+		IGNORE_FIELD.add("errorTime");
+		IGNORE_FIELD.add("socialFundId");
+		IGNORE_FIELD.add("dispatcherId");
+		IGNORE_FIELD.add("contractStatus");
+		IGNORE_FIELD.add("typeSub");
+		IGNORE_FIELD.add("registerId");
+		IGNORE_FIELD.add("createBy");
+		IGNORE_FIELD.add("createName");
+		IGNORE_FIELD.add("updateBy");
+		IGNORE_FIELD.add("id");
+	}
+
 	@Override
 	public void saveModifyAndUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
 			, EmployeeRegistrationPre newInfo, YifuUser user, Map<String, TEmployeeInsurancePre> oldMap,
@@ -426,24 +455,29 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
 			}
 
 			TDispatchInfoPreVo dispatchInfoPreVo = newInfo.getDispatchInfoPreVo();
-			if (!newInfo.getServerItem().contains("社保") && oldInfo.getServerItem().contains("社保")
-					&& Common.isNotNull(dispatchInfoPreOldVo)) {
-				//记录操作记录
-				detailEmpLog = new TEmployeePreLogDetail();
-				detailEmpLog.setModelType(CommonConstants.THREE_STRING);
-				detailEmpLog.setType(CommonConstants.FOUR_STRING);
-				this.setLogBaseInfo(empPreId, dispatchInfoPreOldVo, null, user, null
-						, logId, detailEmpLog);
-				detailList.add(detailEmpLog);
-				if (Common.isNotNull(diffTitle)) {
-					diffTitle += "、社保信息";
-				} else {
-					diffTitle = "社保信息";
+			if (!newInfo.getServerItem().contains("社保") && oldInfo.getServerItem().contains("社保")) {
+				//删除社保待购买相关数据
+				socialDaprUtils.deleteUnProcessSocialPreInfo(empPreId);
+				//如果之前包含流程中的社保待购买数据，记录删除日志
+				if (Common.isNotNull(dispatchInfoPreOldVo)) {
+					//记录操作记录
+					detailEmpLog = new TEmployeePreLogDetail();
+					detailEmpLog.setModelType(CommonConstants.THREE_STRING);
+					detailEmpLog.setType(CommonConstants.FOUR_STRING);
+					this.setLogBaseInfo(empPreId, dispatchInfoPreOldVo, null, user, null
+							, logId, detailEmpLog);
+					detailList.add(detailEmpLog);
+					if (Common.isNotNull(diffTitle)) {
+						diffTitle += "、社保信息";
+					} else {
+						diffTitle = "社保信息";
+					}
 				}
 			}
+
 			if (newInfo.getServerItem().contains("社保") && dispatchInfoPreOldVo != null && dispatchInfoPreVo != null) {
 				differenceSocialKey = HrEquator.comparisonValueIgnoreField(dispatchInfoPreOldVo
-						, dispatchInfoPreVo, CONTRACT_IGNORE_FIELD);
+						, dispatchInfoPreVo, SOCIAL_IGNORE_FIELD);
 				if (differenceSocialKey.length() > 0) {
 					if (Common.isNotNull(diffTitle)) {
 						diffTitle += "、社保信息";
@@ -696,7 +730,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
 				}
 			}
 			if (newInfo.getServerItem().contains("社保") && dispatchInfoPreOldVo != null && dispatchInfoPreVo != null) {
-				differenceSocialKey = HrEquator.comparisonValueIgnoreField(dispatchInfoPreOldVo, dispatchInfoPreVo, CONTRACT_IGNORE_FIELD);
+				differenceSocialKey = HrEquator.comparisonValueIgnoreField(dispatchInfoPreOldVo, dispatchInfoPreVo, SOCIAL_IGNORE_FIELD);
 				if (differenceSocialKey.length() > 0) {
 					if (Common.isNotNull(diffTitle)) {
 						diffTitle += "、社保信息";

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoPreController.java

@@ -167,7 +167,6 @@ public class TDispatchInfoPreController {
 		return tDispatchInfoPreService.saveSocialPreInfo(preVo);
 	}
 
-
 	/**
 	 * 更新社保待购买的前端客服姓名
 	 * @author huych

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

@@ -286,6 +286,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
 		}
 		TDispatchInfoPre preExit = baseMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda()
 				.eq(TDispatchInfoPre::getRegisterId, id)
+				.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
 				.last(CommonConstants.LAST_ONE_SQL));
 		if (Common.isNotNull(preExit)) {
 			TDispatchInfoPreVo pre = new TDispatchInfoPreVo();
@@ -319,6 +320,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
 		this.remove(Wrappers.<TDispatchInfoPre>query().lambda()
 				.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"))
 				.eq(TDispatchInfoPre::getRegisterId, id));
+
+		socialPreDetailService.remove(Wrappers.<TSocialPreDetail>query().lambda()
+				.eq(TSocialPreDetail::getRegisterId, id));
 	}