认领状态修改

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerStatusListVo.java

@@ -24,5 +24,9 @@ public class CustomerStatusListVo implements Serializable {
      * 企业名称
      */
     private String companyName;
+    /**
+     * 企业名称
+     */
+    private Integer status;
 
 }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -71,10 +71,11 @@ public class EnterpriseService {
         Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
         String uipId = MapUtils.getString(uipData, "uipId", null);
         companyData.put("uipId", uipId);
-        Integer status = iCustomerService.status(companyName);
-        if (ObjectUtil.isNotEmpty(status)) {
-            companyData.put("claimStatus", status.equals(0) ? 1 : 0);
-        }
+        companyData.put("claimStatus", iCustomerService.status(companyName));
+//        Integer status = iCustomerService.status(companyName);
+//        if (ObjectUtil.isNotEmpty(status)) {
+//            companyData.put("claimStatus", status.equals(0) ? 1 : 0);
+//        }
         Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", map);
         Integer bondCreditRatingCode = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
         if (200 != bondCreditRatingCode) return R.ok(companyData);
@@ -317,10 +318,10 @@ public class EnterpriseService {
             companyMap.put("guaranteeAmount",MapUtils.getDouble(companyMap, "guaranteeAmount")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeAmount")));
             companyMap.put("guaranteeRatio",MapUtils.getDouble(companyMap, "guaranteeRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeRatio")));
 
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (companyName.equals(vo.getCompanyName())) {
-                    companyMap.put("claimStatus", 1);
+                    companyMap.put("claimStatus", vo.getStatus());
                 }
             }
             for (Map<String, Object> m : objArrayList) {

dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java

@@ -85,11 +85,11 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
                 companyName = companyName.replace("<font color='red'>","");
                 companyName = companyName.replace("</font>","");
             }
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             companyMap.put("bratingSubjectLevel", null);
             for (CustomerStatusListVo vo : customerStatusListVos) {
                 if (companyName.equals(vo.getCompanyName())) {
-                    companyMap.put("claimStatus", 1);
+                    companyMap.put("claimStatus", vo.getStatus());
                 }
             }
             // 去除重复的数据

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -60,10 +60,10 @@
 
     <select id="selectStatusListByCompanyName" resultType="com.dsk.system.domain.customer.vo.CustomerStatusListVo">
         select
-            ct.customer_id, ct.company_name
+            ct.customer_id, ct.company_name, ctu.status
         from customer ct
         join customer_user ctu on ct.customer_id = ctu.customer_id
-        where ctu.user_id = #{userId} and ctu.status = 0 and ct.company_name in
+        where ctu.user_id = #{userId} and ct.company_name in
         <foreach collection="companyNames" item="companyName" open="(" separator="," close=")">
             #{companyName}
         </foreach>