Bläddra i källkod

fix: check info

shc 4 månader sedan
förälder
incheckning
5770aa5af8

+ 9 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/api/ApiController.java

@@ -85,6 +85,7 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TaskStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TaskStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.UserSignResultEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.UserSignResultEnum;
 import com.qunzhixinxi.hnqz.admin.event.TaskInfoImgEvent;
 import com.qunzhixinxi.hnqz.admin.event.TaskInfoImgEvent;
+import com.qunzhixinxi.hnqz.admin.manager.SysCheckChainManager;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScoreTaskTypeMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScoreTaskTypeMapper;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
@@ -133,6 +134,7 @@ import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
+import javax.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -246,6 +248,7 @@ public class ApiController {
     private final ApplicationEventPublisher applicationEventPublisher;
     private final ApplicationEventPublisher applicationEventPublisher;
     private final SysUserAgreementHistoryService userAgreementHistoryService;
     private final SysUserAgreementHistoryService userAgreementHistoryService;
     private final WmDrugQuizRelationService drugQuizRelationService;
     private final WmDrugQuizRelationService drugQuizRelationService;
+    private final SysCheckChainManager checkChainManager;
 
 
     /**
     /**
      * 通过任务类型获取表单配置
      * 通过任务类型获取表单配置
@@ -2373,9 +2376,15 @@ public class ApiController {
             List<WmTaskType> taskTypes = wmTaskTypeService.listByIds(tasktypeIds);
             List<WmTaskType> taskTypes = wmTaskTypeService.listByIds(tasktypeIds);
             Map<String, String> taskTypeMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
             Map<String, String> taskTypeMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
 
 
+            List<Integer> taskIds = page.getRecords().stream().mapToInt(t -> Integer.parseInt(t.getId())).boxed().distinct().sorted()
+                .collect(Collectors.toList());
+
+            Map<Integer, Map<String, Object>> targetLatestCheckState = checkChainManager.getTargetLatestCheckState(taskIds);
+
             page.getRecords().forEach(record -> {
             page.getRecords().forEach(record -> {
                 record.setTaskTypeName(taskTypeMap.get(record.getTaskTypeId()));
                 record.setTaskTypeName(taskTypeMap.get(record.getTaskTypeId()));
                 record.setTaskTypeId(taskTypeMap.get(record.getTaskTypeId()));
                 record.setTaskTypeId(taskTypeMap.get(record.getTaskTypeId()));
+                record.setCheckState(targetLatestCheckState.get(Integer.parseInt(record.getId())));
             });
             });
         }
         }