Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:修改ekp交互实体类"

See merge request fangxinjiang/yifu!178

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java

@@ -139,8 +139,8 @@ public class EKPUtil {
 			TInsuranceSettlePushParam pushParam = new TInsuranceSettlePushParam();
 			param.setHappenDate(format);
 			//ekpId
-			if(null != param.getId() && null != param.getDefaultSettleId()){
-				pushParam.setFd_3afa8a70006bea(param.getId()+CommonConstants.DOWN_LINE_STRING+param.getDefaultSettleId());
+			if(null != param.getDetailId() && null != param.getDefaultSettleId()){
+				pushParam.setFd_3afa8a70006bea(param.getDetailId()+CommonConstants.DOWN_LINE_STRING+param.getDefaultSettleId());
 			}else{
 				pushParam.setFd_3afa8a70006bea(CommonConstants.EMPTY_STRING);
 			}

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

@@ -8,7 +8,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * @author zhaji
@@ -19,6 +18,7 @@ import java.util.Date;
 public class EKPInteractiveParam implements Serializable {
 
 	private static final long serialVersionUID = -2689686777914935788L;
+
 	/**
 	 * 主键
 	 */
@@ -26,6 +26,12 @@ public class EKPInteractiveParam implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
+	/**
+	 * 商险id
+	 */
+	@Schema(description = "主键")
+	private String detailId;
+
 	/**
 	 * 结算id
 	 */

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

@@ -3300,7 +3300,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					String body = EKPUtil.sendToEKP(ekpInteractiveParam);
 					if (!StringUtils.isBlank(body)) {
 						TInsuranceOperate insuranceOperate = new TInsuranceOperate();
-						insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getId());
+						insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId());
 						insuranceOperate.setCreateBy(user.getId());
 						insuranceOperate.setCreateName(user.getNickname());
 						insuranceOperate.setCreateTime(LocalDateTime.now());
@@ -3308,7 +3308,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceOperateService.save(insuranceOperate);
 					} else {
 						for (SettleMonthChangeCheckParam success : successList) {
-							if (success.getId().equals(ekpInteractiveParam.getId())) {
+							if (success.getId().equals(ekpInteractiveParam.getDetailId())) {
 								success.setErrorMessage("更新EKP结算月份失败");
 								errorList.add(success);
 							}
@@ -4959,7 +4959,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 			for (SettleMonthChangeCheckParam param : list) {
 				ProjectSetInfoVo projectSetInfoVo = data.get(param.getDeptNo());
-				ekpInteractiveParam.setId(param.getId());
+				ekpInteractiveParam.setDetailId(param.getId());
 				ekpInteractiveParam.setSettleMonth(param.getSettleMonth());
 				ekpInteractiveParam.setDeptName(projectSetInfoVo.getDepartName());
 				ekpInteractiveParam.setCustomerName(projectSetInfoVo.getCustomerName());