合作管理新增分组接口

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

@@ -2,6 +2,8 @@ package com.sckw.core.model.enums;
 
 import lombok.Getter;
 
+import java.util.Map;
+
 /**
  * @author czh
  * @desc 合作状态

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageHelperUtil.java

@@ -57,6 +57,17 @@ public class PageHelperUtil {
         return setPageResult(pageInfo);
     }
 
+    /**
+     * 将分页信息封装到统一的接口  针对于有复杂的业务组装接口
+     * @return PageResult
+     */
+    public static PageResult getPageResult(PageInfo<?> pageInfo, List<?> totalList, int pageSize) {
+        PageInfo<?> pageInfoTotal = new PageInfo<>(totalList);
+        pageInfo.setTotal(pageInfoTotal.getTotal());
+        pageInfo.setPageSize(pageSize);
+        return setPageResult(pageInfo);
+    }
+
     public static PageResult setPageResult(PageInfo<?> pageInfo){
         PageResult pageResult = new PageResult();
         pageResult.setPage(pageInfo.getPageNum());

sckw-modules/sckw-contract/pom.xml

@@ -34,10 +34,6 @@
             <artifactId>sckw-common-remote</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>sckw-common-datasource</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.sckw</groupId>

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcCheckedController.java

@@ -28,9 +28,9 @@ public class KwcCheckedController {
     private KwcContractLogisticsService kwcContractLogisticsService;
 
     /**
-     * @desc: 分页查询
-     * @param: reqVo 分页入参
-     * @author: czh
+     * @desc 分页查询
+     * @param reqVo 分页入参
+     * @author czh
      * @date 2023/7/17
      * @return HttpResult
      */
@@ -42,9 +42,9 @@ public class KwcCheckedController {
     /**
      * @param reqVo 新增入参
      * @return HttpResult
-     * @desc: 新增托运合同
-     * @author: czh
-     * @date: 2023/7/13
+     * @desc 新增托运合同
+     * @author czh
+     * @date 2023/7/13
      */
     @RequestMapping("add")
     public HttpResult addCheckedContract(@Valid @RequestBody ContractLogisticsReqVo reqVo) throws SystemException {
@@ -66,7 +66,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 合同详情
-     * @param: reqVo id
+     * @param reqVo id
      * @author: czh
      * @date 2023/7/16
      * @return HttpResult
@@ -78,7 +78,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 发起签约
-     * @param: reqVo id
+     * @param reqVo id
      * @author: czh
      * @date 2023/7/16
      * @return HttpResult
@@ -91,7 +91,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 修改草稿
-     * @param: reqVo id
+     * @param reqVo id
      * @author: czh
      * @date 2023/7/16
      * @return HttpResult
@@ -105,7 +105,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 手动完结
-     * @param: reqVo ids
+     * @param reqVo ids
      * @author: czh
      * @date 2023/7/16
      * @return HttpResult
@@ -119,7 +119,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 删除
-     * @param: reqVo ids
+     * @param reqVo ids
      * @author: czh
      * @date 2023/7/16
      * @return HttpResult
@@ -133,7 +133,7 @@ public class KwcCheckedController {
 
     /**
      * @desc: 导出
-     * @param: @param null
+     * @param @param null
      * @author: czh
      * @date 2023/7/17
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractTradeController.java

@@ -11,4 +11,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("kwcContractTrade")
 public class KwcContractTradeController {
+    
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmCooperateApplyController.java

@@ -90,4 +90,16 @@ public class KwmCooperateApplyController {
     }
 
 
+    /**
+     * @param reqVo 查询入参
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    @PostMapping("/findListGroup")
+    public HttpResult findListGroup(@Valid @RequestBody CooperateApplyQueryReqVo reqVo) throws SystemException {
+        return HttpResult.ok(kwmCooperateApplyService.findListGroup(reqVo));
+    }
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmCooperateManageController.java

@@ -3,10 +3,7 @@ package com.sckw.manage.controller;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.manage.model.vo.req.BindManagerReqVo;
-import com.sckw.manage.model.vo.req.CooperateManageQueryReqVo;
-import com.sckw.manage.model.vo.req.IdsReqVo;
-import com.sckw.manage.model.vo.req.QueryDetailReqVo;
+import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.service.KwmCooperateManageService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,4 +98,16 @@ public class KwmCooperateManageController {
         kwmCooperateManageService.export(reqVo);
     }
 
+    /**
+     * @param reqVo 查询入参
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    @PostMapping("/findListGroup")
+    public HttpResult findListGroup(@Valid @RequestBody CooperateManageQueryReqVo reqVo) throws SystemException {
+        return HttpResult.ok(kwmCooperateManageService.findListGroup(reqVo));
+    }
+
 }

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

@@ -53,4 +53,9 @@ public class CooperateApplyQueryReqVo extends PageRequest implements Serializabl
      */
     private List<Long> ids;
 
+    /**
+     * 状态 0 审核中  3 已驳回  4 已撤销
+     */
+    private Integer status;
+
 }

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

@@ -48,4 +48,9 @@ public class CooperateManageQueryReqVo extends PageRequest implements Serializab
      */
     private List<Long> ids;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/res/FindListGroupResVo.java

@@ -0,0 +1,34 @@
+package com.sckw.manage.model.vo.res;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 分组查询返参
+ * @date 2023/7/17
+ */
+@Data
+public class FindListGroupResVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -440918758229165837L;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 状态名
+     */
+    private String statusName;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+
+}

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

@@ -1,6 +1,7 @@
 package com.sckw.manage.service;
 
 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;
@@ -9,6 +10,7 @@ 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.vo.res.CooperateManageQueryResVo;
+import com.sckw.manage.model.vo.res.FindListGroupResVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
@@ -195,4 +197,49 @@ public class CommonBusinessService {
         return result;
     }
 
+
+    /**
+     * @return FindListGroupResVo
+     * @desc: 初始化分组返参
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    public List<FindListGroupResVo> init() {
+        CooperateStatusEnum[] values = CooperateStatusEnum.values();
+        List<FindListGroupResVo> result = new ArrayList<>();
+        FindListGroupResVo total = new FindListGroupResVo();
+        total.setCount(0);
+        result.add(total);
+
+        for (int i = 0; i < values.length; i++) {
+            FindListGroupResVo findListGroupResVo = new FindListGroupResVo();
+            findListGroupResVo.setStatus(values[i].getCode());
+            findListGroupResVo.setStatusName(values[i].getName());
+            findListGroupResVo.setCount(0);
+            result.add(findListGroupResVo);
+        }
+        return result;
+    }
+
+
+    /**
+     * @param result 返回分组信息  list 数据集
+     * @desc: 填充分组数据
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    public void fillGroup(List<FindListGroupResVo> result, List<CooperateManageQueryResVo> list) {
+        //按状态分组
+        Map<Integer, List<CooperateManageQueryResVo>> collect = list.stream().collect(Collectors.groupingBy(CooperateManageQueryResVo::getStatus));
+        for (FindListGroupResVo findListGroupResVo : result) {
+            List<CooperateManageQueryResVo> cooperateManageQueryResVos = collect.get(findListGroupResVo.getStatus());
+            if (CollectionUtils.isNotEmpty(cooperateManageQueryResVos)) {
+                findListGroupResVo.setCount(cooperateManageQueryResVos.size());
+            }
+        }
+
+        //给汇总项求和
+        result.get(0).setCount(list.size());
+    }
+
 }

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

@@ -27,15 +27,18 @@ import com.sckw.manage.model.vo.req.CooperateApplyQueryReqVo;
 import com.sckw.manage.model.vo.req.CooperateApproveReqVo;
 import com.sckw.manage.model.vo.req.InitiateReqVo;
 import com.sckw.manage.model.vo.res.CooperateManageQueryResVo;
+import com.sckw.manage.model.vo.res.FindListGroupResVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author czh
@@ -92,9 +95,21 @@ public class KwmCooperateApplyService {
         }
         //只允许查出申请中、已拒绝、已撤销的记录
         List<Integer> status = new ArrayList<>();
-        status.add(CooperateStatusEnum.PROCESS.getCode());
-        status.add(CooperateStatusEnum.REFUSE.getCode());
-        status.add(CooperateStatusEnum.CANCEL.getCode());
+        if (Objects.isNull(reqVo.getStatus())) {
+            status.add(CooperateStatusEnum.PROCESS.getCode());
+            status.add(CooperateStatusEnum.REFUSE.getCode());
+            status.add(CooperateStatusEnum.CANCEL.getCode());
+        }
+
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.PROCESS.getCode()) {
+            status.add(CooperateStatusEnum.PROCESS.getCode());
+        }
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.REFUSE.getCode()) {
+            status.add(CooperateStatusEnum.REFUSE.getCode());
+        }
+        if (Objects.nonNull(reqVo.getStatus()) && reqVo.getStatus() == CooperateStatusEnum.CANCEL.getCode()) {
+            status.add(CooperateStatusEnum.CANCEL.getCode());
+        }
         cooperateManageQueryReqDto.setStatus(status);
         return cooperateManageQueryReqDto;
     }
@@ -320,4 +335,30 @@ public class KwmCooperateApplyService {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_014);
         }
     }
+
+
+    /**
+     * @param reqVo 查询入参
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    public List<FindListGroupResVo> findListGroup(CooperateApplyQueryReqVo reqVo) {
+        //初始化分组返参
+        List<FindListGroupResVo> result = commonBusinessService.init();
+
+        List<CooperateManageQueryResVo> list = commonBusinessService.findList(buildQueryParam(reqVo));
+        if (CollectionUtils.isEmpty(list)) {
+            return result;
+        }
+
+        //填充分组数据
+        commonBusinessService.fillGroup(result, list);
+        return result;
+    }
+
+
+
+
 }

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

@@ -22,6 +22,7 @@ import com.sckw.manage.model.dto.req.CooperateManageQueryReqDto;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.vo.req.CooperateManageQueryReqVo;
 import com.sckw.manage.model.vo.res.CooperateManageQueryResVo;
+import com.sckw.manage.model.vo.res.FindListGroupResVo;
 import com.sckw.manage.model.vo.res.QueryDetailResVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
@@ -85,6 +86,10 @@ public class KwmCooperateManageService {
             cooperateManageQueryReqDto.setCooperateTypes(Arrays.asList(cooperateTypes.split(Global.COMMA)));
         }
 
+        if (Objects.nonNull(reqVo.getStatus())) {
+            cooperateManageQueryReqDto.setStatus(Collections.singletonList(reqVo.getStatus()));
+        }
+
         List<Long> ids = reqVo.getIds();
         if (!CollectionUtils.isEmpty(ids)) {
             cooperateManageQueryReqDto.setIds(ids);
@@ -200,4 +205,25 @@ public class KwmCooperateManageService {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_014);
         }
     }
+
+    /**
+     * @param reqVo 查询入参
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/17
+     */
+    public List<FindListGroupResVo> findListGroup(CooperateManageQueryReqVo reqVo) {
+        //初始化分组返参
+        List<FindListGroupResVo> result = commonBusinessService.init();
+
+        List<CooperateManageQueryResVo> list = commonBusinessService.findList(buildQueryParam(reqVo));
+        if (CollectionUtils.isEmpty(list)) {
+            return result;
+        }
+
+        //填充分组数据
+        commonBusinessService.fillGroup(result, list);
+        return result;
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindPojoParam.java

@@ -58,4 +58,9 @@ public class FindPojoParam extends PageRequest {
      */
     private Integer status;
 
+    /**
+     * 查主体单位  1查主体单位
+     */
+    private Integer entDept;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntFindPageReqVo.java

@@ -84,4 +84,9 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
      */
     private Date approvalEndTime;
 
+    /**
+     * 查主体单位
+     */
+    private Integer entDept;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -253,7 +253,7 @@ public class KwsEnterpriseService {
             entFindPageResVo.setEntryTypeStr(EntryTypeEnum.getName(entFindPageResVo.getEntryType()).getName());
             result.add(entFindPageResVo);
         }
-        return PageHelperUtil.getPageResult(new PageInfo<>(result));
+        return PageHelperUtil.getPageResult(new PageInfo<>(result), list, reqVo.getPageSize());
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -275,10 +275,7 @@ public class KwsRoleService {
                 }
             });
         }
-        PageInfo pageInfo = new PageInfo(list);
-        PageInfo<RoleResVo> roleResVoPageInfo = new PageInfo<>(roleResVos);
-        roleResVoPageInfo.setTotal(pageInfo.getTotal());
-        return PageHelperUtil.getPageResult(roleResVoPageInfo);
+        return PageHelperUtil.getPageResult(new PageInfo<>(roleResVos), list, PageResult.getPageSize(params));
     }
 
     /**

sckw-modules/sckw-system/src/main/resources/mapper/KwsEntDeptDao.xml

@@ -22,12 +22,12 @@
   <select id="selectByKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from kws_ent_dept
+    from kws_ent_dep
     where id = #{id,jdbcType=BIGINT}
   </select>
 
   <insert id="insert" parameterType="com.sckw.system.model.KwsEntDept">
-    insert into kws_ent_dept
+    insert into kws_ent_dep
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -95,7 +95,7 @@
   </insert>
 
   <update id="update" parameterType="com.sckw.system.model.KwsEntDept">
-    update kws_ent_dept
+    update kws_ent_dep
     <set>
       <if test="entId != null">
         ent_id = #{entId,jdbcType=BIGINT},

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -83,7 +83,7 @@
     min(a.update_by) update_by,
     min(a.update_time) update_time,
     min(a.del_flag) del_flag,
-    ifnull(GROUP_CONCAT(b.type), '') type,
+    ifnull(GROUP_CONCAT(distinct b.type), '') type,
     min(k.system_type) system_type,
     min(k.name) createByName
     from kws_enterprise a
@@ -118,12 +118,20 @@
     <if test="dto.status != null and dto.status != ''">
       and a.status = #{dto.status}
     </if>
-    <if test="entryType != null and entryType == '1'">
+    <if test="dto.entryType != null and dto.entryType == '1'">
       and k.system_type = 2
     </if>
-    <if test="entryType != null and entryType == '2'">
+    <if test="dto.entryType != null and dto.entryType == '2'">
       and k.system_type = 1
     </if>
+    <choose>
+      <when test="dto.entDept != null and dto.entDept == 0">
+        and not exists (select 1 from kws_ent_dep dep where a.id = dep.ent_id)
+      </when>
+     <when test="dto.entDept != null and dto.entDept == 1">
+       and exists (select 1 from kws_ent_dep dep where a.id = dep.ent_id)
+     </when>
+    </choose>
     group by a.id
     ) tab
      where tab.id is not null