修改新添加逻辑

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.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;
@@ -150,8 +151,13 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
                 coscoCategoryLibrary.getBasePageRequest().getPageSize());
         IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary);
         coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> {
-            OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getDeptId());
+            OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId());
             coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
+            SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy());
+            if(userById!=null){
+                coscoCategoryLibraryVo.setCreateName(userById.getName());
+            }
+
         });
         return coscoCategoryLibraryVoIPage;
 

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

@@ -41,6 +41,8 @@ public class CoscoCategoryLibraryVo implements Serializable {
      * 创建时间
      */
     private String createTime;
+
+    private String createBy;
     /**
      * 有效期
      */
@@ -80,4 +82,9 @@ public class CoscoCategoryLibraryVo implements Serializable {
 
     private Date startTime;
     private Date endTime;
+
+    /**
+     * 申请建库部门id
+     */
+    private String applyDeptId;
 }

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

@@ -205,6 +205,8 @@
         <result column="dept_id" property="deptId"/>
         <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="apply_dept_id" property="applyDeptId"/>
     </resultMap>
     <select id="selectLibraryPage" parameterType="map"
             resultMap="CoscoCategoryLibraryVoMap">
@@ -213,7 +215,8 @@
         ccl.name,
         GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
         ccl.area,
-        "张三" AS createName,
+        ccl.create_by,
+        ccl.apply_dept_id,
         ccl.term_of_validity AS termOfValidity,
         ccl.dept_id,
         ccl.approve_status AS approveStatus,

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

@@ -215,6 +215,7 @@
         </if>
         GROUP BY
             cclsa.id
+        order by cclsa.create_time desc
     </select>
 
 

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml

@@ -297,6 +297,6 @@
             and csb.name like concat('%',#{vo.supplierName},'%')
         </if>
         ORDER BY
-        csq.term_of_validity ASC
+        csq.term_of_validity desc
     </select>
 </mapper>