添加修改

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java

@@ -150,15 +150,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
         IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(),
                 coscoCategoryLibrary.getBasePageRequest().getPageSize());
         IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary);
-        coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> {
-            OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId());
-            coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
-            SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy());
-            if(userById!=null){
-                coscoCategoryLibraryVo.setCreateName(userById.getName());
-            }
-
-        });
+        getOrg(coscoCategoryLibraryVoIPage);
         return coscoCategoryLibraryVoIPage;
 
     }
@@ -174,8 +166,23 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
     public IPage<CoscoCategoryLibraryVo> selectCategoryLibraryBySupplierIdPage(CoscoCategoryLibraryVo coscoCategoryLibrary) {
         IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(),
                 coscoCategoryLibrary.getBasePageRequest().getPageSize());
-        return coscoCategoryLibraryMapper.selectCategoryLibraryBySupplierIdPage(p, coscoCategoryLibrary);
+        IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectCategoryLibraryBySupplierIdPage(p, coscoCategoryLibrary);
 
+        getOrg(coscoCategoryLibraryVoIPage);
+        return coscoCategoryLibraryVoIPage;
+
+    }
+
+    private void getOrg(IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage) {
+        coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> {
+            OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId());
+            coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
+            SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy());
+            if(userById!=null){
+                coscoCategoryLibraryVo.setCreateName(userById.getName());
+            }
+
+        });
     }
 
     /**

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java

@@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
+import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
 import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
@@ -183,6 +184,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
         listCoscoCategoryLibrarySupplierApplyVoIPage.getRecords().forEach(vo -> {
             OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
             vo.setDeptName(orgDeptInfo.getOrgName());
+            SysUser userById = userService.getUserById(vo.getCreateBy());
+            if(userById!=null){
+                vo.setApplyUser(userById.getName());
+            }
         });
         return listCoscoCategoryLibrarySupplierApplyVoIPage;
     }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java

@@ -21,7 +21,11 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable {
     /**
      * 部门名称
      */
-    private String deptName="部门";
+    private String deptName;
+    /**
+     * 申请人id
+     */
+    private String createBy;
     /**
      * 部门id
      */

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml

@@ -214,7 +214,7 @@
         ccl.id,
         ccl.name,
         GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
-        ccl.area,
+        max(dp.dic_name) AS area,
         ccl.create_by,
         ccl.apply_dept_id,
         ccl.term_of_validity AS termOfValidity,
@@ -232,7 +232,7 @@
         WHEN ccl.approve_status = 1 THEN '通过'
         WHEN ccl.approve_status = 2 THEN '驳回'
         END AS approveResult,
-        COUNT(DISTINCT cclsa.id) AS snumber
+        COUNT(DISTINCT ccls.id) AS snumber
         FROM
         cosco_category_library ccl
         LEFT JOIN
@@ -240,10 +240,11 @@
         LEFT JOIN
         cosco_category cc ON cc.id = cclc.category_id and cc.type=1
         LEFT JOIN
-        cosco_category_library_supplier ccls ON ccl.id = ccls.category_library_id
+        cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1
         LEFT JOIN
-        cosco_category_library_supplier_apply cclsa ON ccls.category_library_supplier_apply_id = cclsa.id
-        AND cclsa.approve_status = 1
+        cosco_category_library_supplier ccls ON cclsa.id = ccls.category_library_supplier_apply_id
+        left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
+
         <where>
             and ccl.del_flag = 'normal'
             <if test="vo.name!=null and vo.name!=''">
@@ -274,19 +275,29 @@
         ccl.id,
         ccl.name,
         ccl.area,
-        "集团" AS deptName,
-        "张三" AS createName,
+        max(dp.dic_name) AS area,
+        GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
         ccl.term_of_validity AS termOfValidity,
         ccl.approve_status AS approveStatus,
         ccl.last_update_time as approveTime,
+        ccl.create_by,
+        ccl.apply_dept_id,
         ccl.remark
         from cosco_category_library_supplier ccls
           left join cosco_category_library_supplier_apply cclsa on cclsa.id = ccls.category_library_supplier_apply_id
           left join cosco_category_library  ccl on ccls.category_library_id = ccl.id
+        LEFT JOIN
+        cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
+        LEFT JOIN
+        cosco_category cc ON cc.id = cclc.category_id and cc.type=1
+        left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
+
         where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
+
         <if test="vo.name!=null and vo.name!=''">
             AND ccl.name LIKE CONCAT('%',#{vo.name},'%')
         </if>
+        group by ccl.id
     </select>
 
 </mapper>

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml

@@ -184,7 +184,7 @@
 
     <select id="selectPageList" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo">
 
-        select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
+        select cclsa.id, ccl.name,max(dp.dic_name) AS area,cclsa.create_by as createBy ,
                ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId,
                case when cclsa.approve_status=0 and cclsa.work_flow_id is  null then '未开始'
                     when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
@@ -203,6 +203,7 @@
                  join cosco_category_library ccl on cclsa.category_library_id=ccl.id
                  left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id
                  left join cosco_supplier_base csb on csb.id= ccls.supplier_id
+                left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
         where cclsa.del_flag ='normal'
         <if test="vo.name!=null and vo.name!=''">
          and ccl.name like concat('%',#{vo.name},'%')

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml

@@ -55,7 +55,7 @@
         cets.create_time,
         cets.update_by,
         cets.update_time,
-        cc.category_name ,
+        case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
         cets.last_update_time,
         csb.name as supplier_name
         from cosco_evaluate_task_supplier cets