Merge remote-tracking branch 'origin/bugfix-250825-supSortAndFilter' into cnbg-master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1251,9 +1251,9 @@ public class WmSupervisionManager {
     if (halfVal <= 0) {
         halfVal = deptIds.size();
     }
-    List<WmScorePackage> pkgs = packageService.list(queryWrapper.clone().in(WmScorePackage::getDeptId, deptIds.subList(0, halfVal)));
-    if (halfVal > 0) {
-      pkgs.addAll(packageService.list(queryWrapper.in(WmScorePackage::getDeptId, deptIds.subList(deptIds.size() / 2, deptIds.size()))));
+    List<WmScorePackage> pkgs = packageService.list(queryWrapper.clone().in(WmScorePackage::getSendPackageDeptId, deptIds.subList(0, halfVal)));
+    if (halfVal != deptIds.size()) {
+      pkgs.addAll(packageService.list(queryWrapper.in(WmScorePackage::getSendPackageDeptId, deptIds.subList(deptIds.size() / 2, deptIds.size()))));
     }
 ;
     if (CollUtil.isEmpty(pkgs)) {
@@ -1517,6 +1517,7 @@ public class WmSupervisionManager {
     return CollUtil.isNotEmpty(roleIds) ? roleIds : List.of(49, 52, 53, 56);
   }
 
+  @SuppressWarnings("unchecked")
   public Page<Map<String, Object>> pageTaskSupervision(
       WmSupervisionDto.OnTaskSupervisionPage query) {
 
@@ -1830,6 +1831,15 @@ public class WmSupervisionManager {
 
       maps.addAll(m);
     }
+    // quick fix: 临时方案，去掉group by对全局排序的影响
+    maps.sort((a, b) -> 
+      ((WmTask) b.getOrDefault("taskInfo", new WmTask()))
+          .getCreateTime()
+        .compareTo(
+          ((WmTask) a.getOrDefault("taskInfo", new WmTask()))
+        .getCreateTime()
+        )
+    );
 
     // 封装监察信息
     Map<Integer, WmTaskSupervision> taskId2TaskSupervisionMap =
@@ -2206,6 +2216,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
         taskSupervisionService.list(
             Wrappers.<WmTaskSupervision>lambdaQuery()
                 .in(WmTaskSupervision::getTaskId, taskIds)
+                .eq(WmTaskSupervision::getModifiable, false)
                 .eq(WmTaskSupervision::getCreateBy, user.getUsername()));
 
     // 获取监督意见
@@ -2251,7 +2262,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
       }
 
       if (i == 1) {
-        datas[1][0] = "服务ID";
+        datas[1][0] = "服务编号";
         datas[1][1] = "服务类型";
         datas[1][2] = "服务项目积分（单价）";
         datas[1][3] = "服务供应商公司名称";
@@ -2280,7 +2291,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
 
         // 服务ID
         if (j == 0) {
-          datas[i][j] = wmTaskSupervision.getTaskId().toString();
+          datas[i][j] = tid2EntityMap.getOrDefault(wmTaskSupervision.getTaskId().toString(), new WmTask()).getTaskNumber();
         }
 
         // 服务类型