Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

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

@@ -15,76 +15,76 @@ import java.util.Date;
 @Data
 public class TCompleteMonitorFlagVo implements Serializable {
 	
-	private String empSex;
+	public String empSex;
 
-	private Date validityStart;
+	public Date validityStart;
 
-	private Date validityEnd;
+	public Date validityEnd;
 
-	private Date empBirthday;
+	public Date empBirthday;
 
-	private Integer empAge;
+	public Integer empAge;
 
-	private String empMarriStatus;
+	public String empMarriStatus;
 
-	private String empNational;
+	public String empNational;
 
-	private String politicalStatus;
+	public String politicalStatus;
 
-	private String empPhone;
+	public String empPhone;
 
-	private String empRegisType;
+	public String empRegisType;
 
-	private Integer fileProvince;
+	public Integer fileProvince;
 
-	private Integer fileCity;
+	public Integer fileCity;
 
-	private Integer isCollege;
+	public Integer isCollege;
 
-	private String hignEducation;
+	public String hignEducation;
 
-	private String school;
+	public String school;
 
-	private String major;
+	public String major;
 
-	private Date admissionDate;
+	public Date admissionDate;
 
-	private Date gradutionDate;
+	public Date gradutionDate;
 
-	private String contactAddress;
+	public String contactAddress;
 
-	private String firstWorkFlag;
+	public String firstWorkFlag;
 
-	private String haveQualification;
+	public String haveQualification;
 
-	private String deptName;
+	public String deptName;
 
-	private String unitName;
+	public String unitName;
 
-	private String businessPrimaryType;
+	public String businessPrimaryType;
 
-	private String businessSecondType;
+	public String businessSecondType;
 
-	private String businessThirdType;
+	public String businessThirdType;
 
-	private String workingHours;
+	public String workingHours;
 
-	private String tryPeriod;
+	public String tryPeriod;
 
-	private Date enjoinDate;
+	public Date enjoinDate;
 
-	private String post;
+	public String post;
 
-	private String empProjectId;
+	public String empProjectId;
 
-	private String contactInfoId;
+	public String contactInfoId;
 
-	private String disabilityFlag;
+	public String disabilityFlag;
 
-	private String badRecordFlag;
+	public String badRecordFlag;
 
-	private String educationFlag;
+	public String educationFlag;
 
-	private String familyFlag;
+	public String familyFlag;
 
 }

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

@@ -36,6 +36,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpMainMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmployeeProjectMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.*;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
@@ -67,10 +69,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 +95,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	private final TEmployeeContractAuditService tEmployeeContractAuditService;
 	private final TEmployeeLogService tEmployeeLogService;
 	private final TWorkHandlerInfoService workHandlerInfoService;
+	private final TPreEmpMainMapper preEmpMainMapper;
+	private final TPreEmployeeProjectMapper preEmployeeProjectMapper;
 	@Autowired
 	private DaprSocialProperties socialProperties;
 	// 缓存信息
@@ -1616,6 +1617,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
 						tEmployeeInfoMapper.updateById(tEmployeeInfo);
 					}
+					//签订类型正常签订的时候更新预入职列表
+					if (EmployeeConstants.SITUATION_ONE.equals(contract.getSituation())) {
+						//根据项目编码和身份证号查询预入职列表
+						TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
+								.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
+								.eq(TPreEmpMain::getDeptNo, contract.getDeptNo()));
+						if (Optional.ofNullable(empMain).isPresent()) {
+							//查询预入职项目档案表
+							TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(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());
+								preEmployeeProjectMapper.updateById(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,