[核查模块] 将核查表单的统计情况变为x/x

dev-config/src/main/java/com/tykj/dev/config/WebMvcConfigConfig.java

@@ -27,6 +27,9 @@ public class WebMvcConfigConfig extends WebMvcConfigurationSupport {
     @Value("${file.path}")
     private String path;
 
+    /**
+     * 发现如果继承了WebMvcConfigurationSupport，则需要在这里重新指定静态资源
+     */
     @Override
     protected void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/file/**").addResourceLocations("file:" + path);

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckStatTableVo.java

 package com.tykj.dev.device.confirmcheck.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,20 +20,27 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@JsonIgnoreProperties(value = { "queryField" })
+@JsonIgnoreProperties(value = {"queryField"})
+@ApiModel("核查统计查询表单")
 public class CheckStatTableVo {
 
+    @ApiModelProperty("统计主键id")
     private Integer id;
 
+    @ApiModelProperty("标题")
     private String title;
 
+    @ApiModelProperty("创建人名称")
     private String creatorName;
 
+    @ApiModelProperty("核查组成员列表")
     private List<String> checkUserNames;
 
+    @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @ApiModelProperty("完成情况")
     private String completion;
 
     private String queryField;

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -9,7 +9,9 @@ import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
 import com.tykj.dev.device.confirmcheck.entity.vo.*;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.service.TaskService;
+import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.dao.UserDao;
@@ -56,6 +58,9 @@ public class ObjTransUtil {
     @Autowired
     private TaskService taskService;
 
+    @Autowired
+    private TaskDao taskDao;
+
 
     /**
      * 装备转化为初始化的装备统计类
@@ -105,18 +110,31 @@ public class ObjTransUtil {
             joiner.add(checkUserBName);
         }
 
-        // 构建完成情况参数，按照对应的task的状态值来计算 9999为已完成，其他为进行中
-        Integer status = taskService.get(stat.getId(), BusinessEnum.CONFIRM_CHECK_STAT.id)
-                .getBillStatus();
+        // 构建完成情况参数 未完成数量/总数
+        // 获得当前节点的子节点总数 = 总数 其中状态为9999的为已完成
+        Integer fatherTaskId = taskService.get(stat.getId(), BusinessEnum.CONFIRM_CHECK_STAT.id)
+                .getId();
+
+        List<Task> childTasks = taskDao.findAllByParentTaskId(fatherTaskId);
+        long total = childTasks.size();
+
+        long done = childTasks.stream()
+                .filter(task -> task.getBillStatus().equals(9999))
+                .count();
 
-        String completion = status == 9999 ? "已完成" : "未完成";
+        String completion;
+
+        if (done == total) {
+            completion = "核查完成";
+        } else {
+            completion = done + "/" + total;
+        }
 
         joiner.add(stat.getTitle());
         joiner.add(creatorName);
         joiner.add(stat.getCreateTime().toString());
         joiner.add(completion);
 
-
         return new CheckStatTableVo(
                 stat.getId(),
                 stat.getTitle(),