From 90f4e741f97c01a2f9ee41bc46d426675db57d10 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Thu, 3 Jul 2025 14:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/CoscoAnnualreviewTaskMapper.xml      |  1 +
 .../mapper/CoscoAnnualreviewTaskSupplierMapper.xml  |  1 +
 .../CoscoAnnualreviewTaskSupplierUserMapper.xml     |  1 +
 .../impl/CoscoAnnualreviewTemplateServiceImpl.java  |  2 +-
 .../coscoBlack/dao/mapper/CoscoBlacklistMapper.xml  | 13 +++++++------
 .../dao/mapper/CoscoEvaluateTaskMapper.xml          |  1 +
 .../dao/mapper/CoscoEvaluateTaskSupplierMapper.xml  |  3 ++-
 .../dao/mapper/CoscoEvaluateTemplateMapper.xml      |  1 +
 .../service/impl/CoscoEvaluateTaskServiceImpl.java  |  4 ++--
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
index 467cda2..10dcc48 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
@@ -237,6 +237,7 @@
                 and cat.status = #{vo.status}
             </if>
         </where>
+        order by cat.create_time desc
     </select>
 
     <update id="updateNOTask">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
index 6731ae3..4123075 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
@@ -65,6 +65,7 @@
         <if test="vo.startTime!=null and vo.endTime!=null">
             and cats.last_update_time between #{vo.startTime} and #{vo.endTime}
         </if>
+        order by cat.create_time desc
     </select>
 
     <select id="selectCoscoAnnualreviewTaskSupplierList"
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
index 1ef67d1..452b090 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
@@ -91,6 +91,7 @@
                 and catsu.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
             </if>
         </where>
+        order by cat.start_time desc
     </select>
 
     <select id="selectCoscoAnnualreviewTaskSupplierUserList"
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
index 655b8cf..d2d8f4f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
@@ -88,7 +88,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
     @Override
     public int updateCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
         coscoAnnualreviewTemplate.setUpdateTime(new Date());
-        coscoAnnualreviewTemplate.setUpdateBy("admin");
+        coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoAnnualreviewTemplateMapper.updateCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate);
         coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate);
         return 1;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
index ee33cb7..f083e55 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
@@ -210,15 +210,15 @@
     <select id="selectPage" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo"
             parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo">
         SELECT cb.id,
-               '发起部门'            AS deptName,
-               '发起单位'            as unitName,
-               cb.create_time        as createTime,
-               cb.approve_status     as approveStatus,
+               '发起部门'                AS deptName,
+               '发起单位'                as unitName,
+               cb.create_time            as createTime,
+               cb.approve_status         as approveStatus,
                cb.restore_approve_status as restoreApproveStatus,
                case
                    when cb.approve_status is null then '未开始'
                    when cb.approve_status = 0 then '进行中'
-                   else '已结束' end as approveStatusName,
+                   else '已结束' end     as approveStatusName,
                concat((select csb.name
                        from cosco_blacklist_supplier cbs
                                 join cosco_supplier_base csb on cbs.supplier_id = csb.id
@@ -226,8 +226,9 @@
 	(case when cb.backlist_type = 0 then '黑名单申请'
 	else '灰名单申请' end )
 	)
-                                     as themeName
+                                         as themeName
         FROM cosco_blacklist cb
+        order by cb.create_time desc
     </select>
 
     <select id="selectBecomeDue" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
index 45f1516..01e68a9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
@@ -381,6 +381,7 @@
             </if>
         </where>
         group by id
+        order by cet.create_time desc
     </select>
     <select id="selectMyPage"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index f72cf87..24fa0eb 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -130,6 +130,7 @@
                 and cets.level_name = #{vo.levelName}
             </if>
         </where>
+        order by cets.create_time desc
     </select>
 
     <select id="selectCoscoEvaluateTaskSupplierList"
@@ -309,7 +310,7 @@
             <if test="vo.taskId!=null and vo.taskId!=null">and cet.id= #{vo.taskId}</if>
             <if test="vo.supplierId!=null and vo.supplierId!=null">and cets.supplier_id= #{vo.supplierId}</if>
         </where>
-
+        order by cet.create_time desc
     </select>
 
     <update id="deleteByTaskId" parameterType="string">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
index 08d4c7a..ee8c96b 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
@@ -75,6 +75,7 @@
                 and cet.category_id = #{vo.categoryId}
             </if>
         </where>
+        order by cet.create_time desc
     </select>
 
     <select id="selectCoscoEvaluateTemplateList"
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
index 0ac0ee4..b59a0a0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
@@ -264,8 +264,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         Map<String, String> map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision));
         //根据分工参数赋值
         coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> {
-            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0");
-            task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId()));
+            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改
+            task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId())); //2表示未分工 1表示已分工
         });
         return coscoEvaluateTaskListVoIPage;
     }