档案完整监控

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

@@ -67,10 +67,7 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 员工合同
@@ -96,6 +93,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	private final TEmployeeContractAuditService tEmployeeContractAuditService;
 	private final TEmployeeLogService tEmployeeLogService;
 	private final TWorkHandlerInfoService workHandlerInfoService;
+	private final TPreEmpMainService preEmpMainService;
+	private final TPreEmployeeProjectService preEmployeeProjectService;
 	@Autowired
 	private DaprSocialProperties socialProperties;
 	// 缓存信息
@@ -1616,6 +1615,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
 						tEmployeeInfoMapper.updateById(tEmployeeInfo);
 					}
+					//签订类型正常签订的时候更新预入职列表
+					if (EmployeeConstants.SITUATION_ONE.equals(contract.getSituation())) {
+						//根据项目编码和身份证号查询预入职列表
+						TPreEmpMain empMain = preEmpMainService.getOne(Wrappers.<TPreEmpMain>query()
+								.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
+								.eq(TPreEmpMain::getDeptNo, contract.getDeptNo()));
+						if (Optional.ofNullable(empMain).isPresent()) {
+							//查询预入职项目档案表
+							TPreEmployeeProject preEmployeeProject = preEmployeeProjectService.getOne(Wrappers.<TPreEmployeeProject>query()
+									.lambda().eq(TPreEmployeeProject::getPreMainId, empMain.getId()));
+							if (Optional.ofNullable(preEmployeeProject).isPresent()) {
+								preEmployeeProject.setContractType(contract.getContractType());
+								preEmployeeProject.setWorkingHours(contract.getWorkingHours());
+								preEmployeeProject.setPost(contract.getPost());
+								preEmployeeProject.setEnjoinDate(LocalDateTimeUtils.convertLDTToDate(contract.getEnjoinDate()));
+								preEmployeeProject.setTryPeriod(contract.getTryPeriod());
+								preEmployeeProjectService.save(preEmployeeProject);
+							}
+						}
+					}
+
 				} else {
 					//是否同步终止合同、减项、减档为是的时候 单独写逻辑
 					if (EmployeeConstants.SITUATION_SEVEN.equals(contract.getSituation())

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml

@@ -160,6 +160,7 @@
 			a.UNIT_NO,
 			a.DEPT_NAME,
 			a.DEPT_NO,
+		    a.DEPT_ID,
 			a.BUSINESS_PRIMARY_TYPE,
 			,a.BUSINESS_SECOND_TYPE,
 			,a.BUSINESS_THIRD_TYPE,