bug修改，逻辑优化

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -196,8 +196,7 @@ public class CustomerController extends BaseController {
     /**
      * 客户状态
      */
-    @GetMapping("/status/{customerId}")
-    @RepeatSubmit
+    @GetMapping("/status/{companyName}")
     public AjaxResult status(@PathVariable String companyName) {
         return AjaxResult.success(baseService.status(companyName));
     }
@@ -206,18 +205,18 @@ public class CustomerController extends BaseController {
     /**
      * 取消认领
      */
-    @PutMapping("/cancelClaim/{customerId}")
+    @PutMapping("/cancelClaim/{companyName}")
     @RepeatSubmit
-    public AjaxResult cancelClaim(@PathVariable String customerId) {
-        return toAjax(baseService.cancelClaim(customerId));
+    public AjaxResult cancelClaim(@PathVariable String companyName) {
+        return toAjax(baseService.cancelClaim(companyName));
     }
 
     /**
      * 历史认领
      */
-    @PutMapping("/historyClaim/{customerId}")
+    @PutMapping("/historyClaim/{companyName}")
     @RepeatSubmit
-    public AjaxResult historyClaim(@PathVariable String customerId) {
-        return toAjax(baseService.historyClaim(customerId));
+    public AjaxResult historyClaim(@PathVariable String companyName) {
+        return toAjax(baseService.historyClaim(companyName));
     }
 }

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

@@ -40,9 +40,15 @@ public class CustomerFollowRecordListVo implements Serializable {
      * 拜访方式（visit_mode_type）
      */
     private String visitMode;
+    /**
+     * 拜访时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date visitTime;
     /**
      * 下次拜访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date nextVisitTime;
     /**
      * 拜访对象姓名

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

@@ -28,7 +28,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     List<CustomerStatusListVo> selectStatusList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
 
-    List<String> selectUipIdList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
+//    List<String> selectUipIdList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
 
 }
 

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -29,12 +29,12 @@ public interface ICustomerService {
 
     List<CustomerStatusListVo> selectStatusList(List<String> uipIds);
 
-    List<String> selectUipIdList(List<String> uipIds);
+//    List<String> selectUipIdList(List<String> uipIds);
 
     Integer status(String companyName);
 
-    boolean cancelClaim(String customerId);
+    boolean cancelClaim(String companyName);
 
-    boolean historyClaim(String customerId);
+    boolean historyClaim(String companyName);
 
 }

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

@@ -120,10 +120,10 @@ public class CustomerServiceImpl implements ICustomerService {
     }
 
 
-    @Override
-    public List<String> selectUipIdList(List<String> uipIds) {
-        return baseMapper.selectUipIdList(uipIds, SecurityUtils.getUserId());
-    }
+//    @Override
+//    public List<String> selectUipIdList(List<String> uipIds) {
+//        return baseMapper.selectUipIdList(uipIds, SecurityUtils.getUserId());
+//    }
 
     @Override
     public Integer status(String companyName) {
@@ -139,18 +139,22 @@ public class CustomerServiceImpl implements ICustomerService {
     }
 
     @Override
-    public boolean cancelClaim(String customerId) {
-        return updateClaimStatus(customerId, 1);
+    public boolean cancelClaim(String companyName) {
+        return updateClaimStatus(companyName, 1);
     }
 
     @Override
-    public boolean historyClaim(String customerId) {
-        return updateClaimStatus(customerId, 0);
+    public boolean historyClaim(String companyName) {
+        return updateClaimStatus(companyName, 0);
     }
 
     //修改客户认领状态
-    private boolean updateClaimStatus(String customerId, Integer status) {
-        CustomerUser customerUser = customerUserMapper.selectByCustomerIdAndUserId(customerId, SecurityUtils.getUserId());
+    private boolean updateClaimStatus(String companyName, Integer status) {
+        Customer cus = baseMapper.selectByCompanyNameAndUserId(companyName, SecurityUtils.getUserId());
+        if (ObjectUtils.isEmpty(cus)) {
+            throw new ServiceException("数据错误！");
+        }
+        CustomerUser customerUser = customerUserMapper.selectByCustomerIdAndUserId(cus.getCustomerId(), SecurityUtils.getUserId());
         if (ObjectUtils.isEmpty(customerUser)) {
             throw new ServiceException("数据错误！");
         }

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

@@ -5,6 +5,7 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import com.dsk.system.service.ICustomerService;
 import com.dsk.system.service.UrbanInvestmentPlatformService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -51,19 +52,32 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
         for (Object dataMap : list) {
             uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
         }
-        List<String> claimStatusList = iCustomerService.selectUipIdList(uipIds);
+//        List<String> claimStatusList = iCustomerService.selectUipIdList(uipIds);
+        List<CustomerStatusListVo> customerStatusListVos = iCustomerService.selectStatusList(uipIds);
+        //按照城投企业id合并两个list
         //按照城投企业id合并两个list
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
-            String uipId = MapUtils.getString(companyMap, "uipId","uipId");
-            if (CollectionUtils.isEmpty(claimStatusList)) {
+            String uipId = MapUtils.getString(companyMap, "uipId");
             companyMap.put("claimStatus", 0);
-            } else if (claimStatusList.contains(uipId)) {
+            for (CustomerStatusListVo vo : customerStatusListVos) {
+                if (uipId.equals(vo.getUipId())) {
                     companyMap.put("claimStatus", 1);
-            } else {
-                companyMap.put("claimStatus", 0);
                 }
             }
+        }
+
+//        for (Object companyObj : list) {
+//            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+//            String uipId = MapUtils.getString(companyMap, "uipId","uipId");
+//            if (CollectionUtils.isEmpty(claimStatusList)) {
+//                companyMap.put("claimStatus", 0);
+//            } else if (claimStatusList.contains(uipId)) {
+//                companyMap.put("claimStatus", 1);
+//            } else {
+//                companyMap.put("claimStatus", 0);
+//            }
+//        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

@@ -52,22 +52,22 @@
             ct.customer_id, ct.uip_id
         from customer ct
         join customer_user ctu on ct.customer_id = ctu.customer_id
-        where ctu.user_id = #{userId} and ct.uip_id in
+        where ctu.user_id = #{userId} and ctu.status = 0 and ct.uip_id in
         <foreach collection="uipIds" item="uipId" open="(" separator="," close=")">
             #{uipId}
         </foreach>
     </select>
 
-    <select id="selectUipIdList" resultType="java.lang.String">
-        select
-            ct.uip_id
-        from customer ct
-        join customer_user ctu on ct.customer_id = ctu.customer_id
-        where ctu.user_id = #{userId} and ct.uip_id in
-        <foreach collection="uipIds" item="uipId" open="(" separator="," close=")">
-            #{uipId}
-        </foreach>
-    </select>
+<!--    <select id="selectUipIdList" resultType="java.lang.String">-->
+<!--        select-->
+<!--            ct.uip_id-->
+<!--        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.uip_id in-->
+<!--        <foreach collection="uipIds" item="uipId" open="(" separator="," close=")">-->
+<!--            #{uipId}-->
+<!--        </foreach>-->
+<!--    </select>-->
 
 </mapper>