feat: 企业任务记录-按提交时间倒序

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskController.java

@@ -73,14 +73,21 @@ public class WmDeptTaskController {
 
         List<Map<String, String>> results = new ArrayList<>();
         if (CollUtil.isNotEmpty(packageList)) {
-            packageList.forEach(wmScorePackage -> {
-                Map<String, String> result = new HashMap<>();
-                result.put("id", wmScorePackage.getId());
-                result.put("scorePackageName", wmScorePackage.getScorePackageName());
-                result.put("score", String.valueOf(wmScorePackage.getScore()));
-                result.put("kfpjf", String.valueOf(wmScorePackage.getKfpjf()));
-                results.add(result);
-            });
+            packageList.stream()
+                    .filter(wmScorePackage -> {
+                        if (wmScorePackage.getKfpjf() > 0) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }).forEach(wmScorePackage -> {
+                        Map<String, String> result = new HashMap<>();
+                        result.put("id", wmScorePackage.getId());
+                        result.put("scorePackageName", wmScorePackage.getScorePackageName());
+                        result.put("score", String.valueOf(wmScorePackage.getScore()));
+                        result.put("kfpjf", String.valueOf(wmScorePackage.getKfpjf()));
+                        results.add(result);
+                    });
         }
 
         return R.ok(results);
@@ -119,8 +126,10 @@ public class WmDeptTaskController {
                 .collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getScorePackageName));
 
         // 查询积分包下的企业任务
-        Page<WmTask> taskPage = wmTaskService.page(new Page<>(page.getCurrent(), page.getSize()), Wrappers.<WmTask>lambdaQuery()
-                .in(WmTask::getScorePackageId, packageIdSet));
+        Page<WmTask> taskPage = wmTaskService.page(new Page<>(page.getCurrent(), page.getSize()),
+                Wrappers.<WmTask>lambdaQuery()
+                        .in(WmTask::getScorePackageId, packageIdSet)
+                        .orderByDesc(WmTask::getLookintoDate));
 
         if (CollUtil.isEmpty(taskPage.getRecords())) {
             return R.ok(page);