Bläddra i källkod

fix stat and update wording

dengjia 2 månader sedan
förälder
incheckning
fe43d6c900

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -1182,7 +1182,7 @@ public class SysStatisticManager {
                 // 获取监察记录(不可编辑的是监察过的)
                 List<WmTaskSupervision> supervisions = taskSupervisionService.list(Wrappers.<WmTaskSupervision>lambdaQuery()
                         .eq(WmTaskSupervision::getModifiable, false)
-                        .eq(WmTaskSupervision::getSupervisionState, UpmsState.TaskSupervisionState.PASSED)
+                        .eq(WmTaskSupervision::getSupervisionState, UpmsState.TaskSupervisionState.CKT2)
                         .in(WmTaskSupervision::getPackageId, pkgIds.stream().mapToInt(Integer::valueOf).boxed().sorted().distinct().collect(Collectors.toList())));
 
                 total = CollUtil.isNotEmpty(tasks) ? tasks.size() : 0;

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

@@ -1973,7 +1973,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
         && !CollUtil.containsAny(SecurityUtils.getRoles(), List.of(49, 52, 53, 56))) { // 不是监督员
         modifiable = !resource.getSupervision();
         if (resource.getSupervision()) {
-            remarks = supervision.getSupervisionResult() ? "同意监督结果,监督无异常" : "同意监督结果,不符合合规要求,不建议结算";
+            remarks = "同意监督员监督结果";
         }
 
         resource.setRemarks(remarks);