结算主体ID

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

@@ -37,7 +37,12 @@ public class TCertRecordVo implements Serializable {
 	@ExcelAttribute(name = "员工身份证" )
 	@Schema(description ="员工身份证")
 	private String empIdcard;
-
+	/**
+	 * 项目id
+	 */
+	@ExcelAttribute(name = "项目id" )
+	@Schema(description ="项目id")
+	private String deptId;
 	/**
 	 * 项目名称
 	 */

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

@@ -92,6 +92,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 		vo.setPost(project.getPost());
 		vo.setProjectName(project.getDeptName());
 		vo.setProjectCode(project.getDeptNo());
+		vo.setDeptId(project.getDeptId());
 		// 最新合同时间
 		if (Common.isNotNull(last)){
 			if (Common.isNotNull(last.getContractStart())){

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java

@@ -18,6 +18,11 @@ import java.time.LocalDate;
 public class InsuranceBatchParam implements Serializable {
 	private static final long serialVersionUID = -2689686777914935788L;
 
+	/**
+	 * 项目id
+	 */
+	@Schema(description = "项目id")
+	private String deptId;
 	/**
 	 * 项目编码
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java

@@ -28,6 +28,12 @@ public class InsuranceReplaceParam implements Serializable {
 	@Schema(description = "员工身份证号")
 	private String empIdcardNo;
 
+	/**
+	 * 项目id
+	 */
+	@Schema(description = "项目id")
+	private String deptId;
+
 	/**
 	 * 项目编码
 	 */

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

@@ -351,8 +351,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<InsuranceBatchParam> listSuccess = map.get("listSuccess");
 		List<TInsuranceDetail> detailList = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(listSuccess)){
+			TInsuranceDetail detail;
 			for (InsuranceBatchParam success : listSuccess) {
-				TInsuranceDetail detail = new TInsuranceDetail();
+				detail = new TInsuranceDetail();
 				BeanCopyUtils.copyProperties(success,detail);
 				//购买类型，默认为「批增」
 				detail.setBuyType(CommonConstants.THREE_INT);
@@ -431,6 +432,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				newDetail.setEmpName(success.getReplaceEmpName());
 				newDetail.setEmpIdcardNo(success.getReplaceEmpIdcardNo());
 				newDetail.setDeptNo(success.getReplaceDeptNo());
+				newDetail.setDeptId(success.getDeptId());
 				//替换项目的结算方式
 				newDetail.setSettleType(success.getSettleType());
 				newDetail.setPost(success.getPost());
@@ -927,6 +929,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					detail.setHandledTime(LocalDateTime.now());
 					detail.setUpdateBy(user.getId());
 					detail.setUpdateTime(LocalDateTime.now());
+					if (Common.isNotNull(jsonObject)){
+						detail.setDeptId(jsonObject.getId());
+					}
 					detailList.add(detail);
 				}
 			}
@@ -2304,6 +2309,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							}else {
 								param.setSettleType(Integer.parseInt(settleType));
 							}
+							param.setDeptId(projectSetInfoVo.getId());
 						}
 					}
 				}
@@ -2685,6 +2691,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								continue;
 							}else {
 								param.setSettleType(Integer.parseInt(settleType));
+								param.setDeptId(projectSetInfoVo.getId());
 							}
 						}
 					}