bugfix

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilterConfig.java

@@ -1,27 +0,0 @@
-//package com.sckw.core.filter;
-//
-//import jakarta.annotation.Resource;
-//import org.springframework.boot.web.servlet.FilterRegistrationBean;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * @author czh
-// * @desc TODO
-// * @date 2023/6/14
-// */
-//@Component
-//public class LoginFilterConfig {
-//
-//
-//    @Bean
-//    public FilterRegistrationBean registerBusExceptionFilter() {
-//        FilterRegistrationBean registration = new FilterRegistrationBean();
-//        registration.setFilter(new ExceptionFilterConfig());
-//        registration.setName("ExceptionFilter");
-//        registration.setOrder(-1);
-//        return registration;
-//    }
-//}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CooperateStatusEnum.java

@@ -27,12 +27,12 @@ public enum CooperateStatusEnum {
 
     private final String name;
 
-    CooperateStatusEnum(int code, String name){
+    CooperateStatusEnum(int code, String name) {
         this.code = code;
         this.name = name;
     }
 
-    public static CooperateStatusEnum getName(int code){
+    public static CooperateStatusEnum getName(int code) {
         for (CooperateStatusEnum cooperateStatusEnum : values()) {
             if (cooperateStatusEnum.getCode() == code) {
                 return cooperateStatusEnum;

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/BindManagerReqVo.java

@@ -22,7 +22,7 @@ public class BindManagerReqVo implements Serializable {
     private Long userId;
 
     /**
-     * 合同id
+     * 主键id
      */
     private Long id;
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/CooperateApproveReqVo.java

@@ -31,4 +31,9 @@ public class CooperateApproveReqVo implements Serializable {
      */
     private String remark;
 
+    /**
+     * 客户经理
+     */
+    private Long manager;
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -1,14 +1,18 @@
 package com.sckw.manage.service;
 
+import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CooperateStatusEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.model.dto.req.CooperateManageQueryReqDto;
 import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
+import com.sckw.manage.model.entity.KwmCooperate;
+import com.sckw.manage.model.vo.req.BindManagerReqVo;
 import com.sckw.manage.model.vo.res.CooperateManageQueryResVo;
 import com.sckw.manage.model.vo.res.FindListGroupResVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -248,4 +252,40 @@ public class CommonBusinessService {
         result.get(0).setCount(list.size());
     }
 
+
+    /**
+     * @param userId 用户id id主键
+     * @desc: 绑定客户经理
+     * @author: czh
+     * @date: 2023/7/24
+     */
+    public void bingManager(Long userId, Long id) {
+        KwmCooperate kwmCooperate = kwmCooperateMapper.selectById(id);
+        if (Objects.isNull(kwmCooperate)) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.COOPERATE_NOT_EXISTS);
+        }
+
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(userId);
+        if (Objects.isNull(userCacheResDto)) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
+        }
+
+        Long entId = kwmCooperate.getEntId();
+        Long currentEntId = LoginUserHolder.getEntId();
+        //不相等则不是该合作的创建人，应该修改受邀请人信息
+        if (entId.compareTo(currentEntId) != 0) {
+            kwmCooperate.setInviteeContactsId(userCacheResDto.getId());
+            kwmCooperate.setInviteeContacts(userCacheResDto.getName());
+            kwmCooperate.setInviteePhone(userCacheResDto.getPhone());
+        } else {
+            kwmCooperate.setInviterContactsId(userCacheResDto.getId());
+            kwmCooperate.setInviterContacts(userCacheResDto.getName());
+            kwmCooperate.setInviterPhone(userCacheResDto.getPhone());
+        }
+        kwmCooperate.setUpdateTime(new Date());
+        kwmCooperate.setUpdateBy(LoginUserHolder.getUserId());
+        if (kwmCooperateMapper.updateById(kwmCooperate) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
+    }
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -100,13 +100,13 @@ public class KwmCooperateApplyService {
             status.add(CooperateStatusEnum.CANCEL.getCode());
         }
 
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.PROCESS.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.PROCESS.getCode())) {
             status.add(CooperateStatusEnum.PROCESS.getCode());
         }
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.REFUSE.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.REFUSE.getCode())) {
             status.add(CooperateStatusEnum.REFUSE.getCode());
         }
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.CANCEL.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.CANCEL.getCode())) {
             status.add(CooperateStatusEnum.CANCEL.getCode());
         }
         cooperateManageQueryReqDto.setStatus(status);
@@ -309,6 +309,8 @@ public class KwmCooperateApplyService {
             if (kwmCooperateMapper.updateById(item) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }
+
+
         });
     }
 
@@ -319,8 +321,15 @@ public class KwmCooperateApplyService {
      * @author: czh
      * @date: 2023/7/11
      */
+    @Transactional(rollbackFor = {})
     public void approve(CooperateApproveReqVo reqVo) {
         updateCooperateInfo(reqVo.getIds(), reqVo.getApprove(), reqVo.getRemark());
+
+        if (reqVo.getApprove().equals(CooperateStatusEnum.OK.getCode())) {
+            for (String id : reqVo.getIds().split(Global.COMMA)) {
+                commonBusinessService.bingManager(reqVo.getManager(), Long.parseLong(id));
+            }
+        }
     }
 
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -82,7 +82,7 @@ public class KwmCooperateManageService {
         CooperateManageQueryReqDto cooperateManageQueryReqDto = new CooperateManageQueryReqDto();
         BeanUtils.copyProperties(reqVo, cooperateManageQueryReqDto);
         String cooperateTypes = reqVo.getCooperateTypes();
-        if (!StringUtils.isBlank(cooperateTypes)) {
+        if (StringUtils.isNotBlank(cooperateTypes)) {
             cooperateManageQueryReqDto.setCooperateTypes(Arrays.asList(cooperateTypes.split(Global.COMMA)));
         }
 
@@ -95,13 +95,13 @@ public class KwmCooperateManageService {
             status.add(CooperateStatusEnum.PASS.getCode());
         }
 
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.PROCESS.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.PROCESS.getCode())) {
             status.add(CooperateStatusEnum.PROCESS.getCode());
         }
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.OK.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.OK.getCode())) {
             status.add(CooperateStatusEnum.OK.getCode());
         }
-        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.PASS.getCode()) {
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus().equals(CooperateStatusEnum.PASS.getCode())) {
             status.add(CooperateStatusEnum.PASS.getCode());
         }
         cooperateManageQueryReqDto.setStatus(status);
@@ -139,35 +139,7 @@ public class KwmCooperateManageService {
      * @date: 2023/7/10
      */
     public void bindManager(BindManagerReqVo reqVo) throws SystemException {
-        Long contractId = reqVo.getId();
-        KwmCooperate kwmCooperate = kwmCooperateMapper.selectById(contractId);
-        if (Objects.isNull(kwmCooperate)) {
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.COOPERATE_NOT_EXISTS);
-        }
-
-        Long userId = reqVo.getUserId();
-        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(userId);
-        if (Objects.isNull(userCacheResDto)) {
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
-        }
-
-        Long entId = kwmCooperate.getEntId();
-        Long currentEntId = LoginUserHolder.getEntId();
-        //不相等则不是该合作的创建人，应该修改受邀请人信息
-        if (entId.compareTo(currentEntId) != 0) {
-            kwmCooperate.setInviteeContactsId(userCacheResDto.getId());
-            kwmCooperate.setInviteeContacts(userCacheResDto.getName());
-            kwmCooperate.setInviteePhone(userCacheResDto.getPhone());
-        } else {
-            kwmCooperate.setInviterContactsId(userCacheResDto.getId());
-            kwmCooperate.setInviterContacts(userCacheResDto.getName());
-            kwmCooperate.setInviterPhone(userCacheResDto.getPhone());
-        }
-        kwmCooperate.setUpdateTime(new Date());
-        kwmCooperate.setUpdateBy(LoginUserHolder.getUserId());
-        if (kwmCooperateMapper.updateById(kwmCooperate) <= 0) {
-            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-        }
+       commonBusinessService.bingManager(reqVo.getUserId(), reqVo.getId());
     }
 
     /**