Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddLaborLeaderCustomerRiskBo.java

@@ -25,7 +25,7 @@ public class AddLaborLeaderCustomerRiskBo {
      * 劳务队长身份证号
      */
     @NotBlank(message = "劳务队长身份证号不能为空")
-    private String laborCaptainIdCard;
+    private String laborCaptainIdcard;
     /**
      * 劳务队长联系电话
      */
@@ -35,7 +35,7 @@ public class AddLaborLeaderCustomerRiskBo {
      * 挂靠单位(供应商名称)
      */
     @NotBlank(message = "挂靠单位名称不能为空")
-    private String customerName;
+    private String cusomerName;
     /**
      * 不良事由
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/LaborLeaderCustomerRiskServiceImpl.java

@@ -48,19 +48,15 @@ public class LaborLeaderCustomerRiskServiceImpl extends ServiceImpl<LaborLeaderC
         LaborLeaderCustomerRisk risk = BeanUtil.toBean(addBo, LaborLeaderCustomerRisk.class);
         risk.setRiskId(IdUtil.getSnowflakeNextId());
         //查询供应商cid
-        Map<String, Object> map = opportunityRadarService.enterpriseByName(addBo.getCustomerName());
+        Map<String, Object> map = opportunityRadarService.enterpriseByName(addBo.getCusomerName());
         if (!ObjectUtils.isEmpty(map.get("data"))) {
             Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
             Integer companyId = MapUtil.getInt(data, "jskEid");
             Assert.notNull(companyId, "挂靠单位不存在或请填写完整单位名称");
             risk.setCustomerCid(companyId);
         }
-        risk.setLeaderName(addBo.getLeaderName());
-        risk.setLaborCaptainIdCard(addBo.getLaborCaptainIdCard());
-        risk.setLaborCaptainPhone(addBo.getLaborCaptainPhone());
-        risk.setCustomerName(addBo.getCustomerName());
-        risk.setBadReason("挂靠风险");
-        risk.setBadBehaviorSituation(addBo.getLeaderName() + "已存在于" + addBo.getCustomerName() + ",存在挂靠风险");
+        risk.setLaborCaptainIdCard(addBo.getLaborCaptainIdcard());
+        risk.setCustomerName(addBo.getCusomerName());
         return baseMapper.insert(risk);
     }