30号版本：档案合同、商险、薪资状态；缴费库反馈列；合同提交的直接审核优化等

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

@@ -11,8 +11,6 @@ import lombok.Data;
 public class EmpIdCardAndDeptVo {
 	// 身份证
 	private String idCard;
-	// 项目id
-	private String deptId;
 	// 项目编码：薪资使用的，只有编码
 	private String deptNo;
 	// 状态

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java

@@ -71,6 +71,6 @@ public class EmployeeConstants {
 	 * @Date: 2022/11/25 16:42
 	 * @return:
 	 **/
-	public static final String CONTRACT_NAME[] = {"标准合同","劳动派遣合同","其他"};
+	public static final String CONTRACT_NAME[] = {"标准合同","劳务派遣合同","其他"};
 
 }

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

@@ -852,7 +852,7 @@
 
 	<!-- 更新项目档案商险状态 -->
 	<update id="updateEmployeeInsuranceStatus" >
-		update t_employee_project a set a.INSURANCE_STATUS = #{emp.status} where a.EMP_IDCARD = #{emp.idCard} and a.DEPT_ID = #{emp.deptId}
+		update t_employee_project a set a.INSURANCE_STATUS = #{emp.status} where a.EMP_IDCARD = #{emp.idCard} and a.DEPT_NO = #{emp.deptNo}
 	</update>
 
 	<!-- 更新项目档案薪资状态 -->

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

@@ -1571,11 +1571,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			Map<String , Integer> proStatusMap = new HashMap<>();
 			// 人员档案状态
 			Map<String , Integer> empStatusMap = new HashMap<>();
+			for (TInsuranceDetail detail : sourceList) {
+				proStatusMap.put(detail.getEmpIdcardNo() + CommonConstants.DOWN_LINE_STRING + detail.getDeptNo(), Integer.parseInt(toStatus));
+				empStatusMap.put(detail.getEmpIdcardNo(), Integer.parseInt(toStatus));
+			}
 			Integer proStatus;
 			Integer empStatus;
 			int status;
 			for (TInsuranceDetail detail : sourceEmpList) {
-				proStatus = proStatusMap.get(detail.getEmpIdcardNo() + CommonConstants.DOWN_LINE_STRING + detail.getDeptId());
+				proStatus = proStatusMap.get(detail.getEmpIdcardNo() + CommonConstants.DOWN_LINE_STRING + detail.getDeptNo());
 				empStatus = empStatusMap.get(detail.getEmpIdcardNo());
 
 				// 判断该项目的商险的状态 2正常＞4处理中＞3失效＞0无商险
@@ -1600,7 +1604,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				} else {
 					empStatus = status;
 				}
-				proStatusMap.put(detail.getEmpIdcardNo()+CommonConstants.DOWN_LINE_STRING+detail.getDeptId(), proStatus);
+				proStatusMap.put(detail.getEmpIdcardNo()+CommonConstants.DOWN_LINE_STRING+detail.getDeptNo(), proStatus);
 				empStatusMap.put(detail.getEmpIdcardNo(), empStatus);
 			}
 			if (!proStatusMap.isEmpty()) {
@@ -1631,7 +1635,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		for (Map.Entry<String, Integer> entry : empStatusMap.entrySet()) {
 			if (isDept) {
 				empIdCardAndDeptVo.setIdCard(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[0]);
-				empIdCardAndDeptVo.setDeptId(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[1]);
+				empIdCardAndDeptVo.setDeptNo(entry.getKey().split(CommonConstants.DOWN_LINE_STRING)[1]);
 			} else {
 				empIdCardAndDeptVo.setIdCard(entry.getKey());
 			}
@@ -1680,7 +1684,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<EmpIdCardAndDeptVo> voList = new ArrayList<>();
 		for (TInsuranceDetail d : sourceList) {
 			empIdCardAndDeptVo.setIdCard(d.getEmpIdcardNo());
-			empIdCardAndDeptVo.setDeptId(d.getDeptId());
+			empIdCardAndDeptVo.setDeptNo(d.getDeptNo());
 			empIdCardAndDeptVo.setStatus(status);
 			voList.add(empIdCardAndDeptVo);
 		}