fix: 修复测酒警员头像未展示的问题

fix: 修复批量导入专项督察未匹配的问题

src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java

@@ -42,6 +42,7 @@ import java.net.http.HttpRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -71,7 +72,6 @@ public class InspectionController  {
     }
 
 
-
     @GetMapping("{taskId}")
     public Result<SupTaskInspection> get(@PathVariable Integer taskId) {
         return Result.success(taskInspectionService.getById(taskId));
@@ -80,6 +80,9 @@ public class InspectionController  {
     public Result<Page<TaskInspectionProblemVo>> listProblem(@PathVariable Integer taskId, TaskInspectionProblemQueryParam queryParam) {
         LambdaQueryWrapper<SupTaskProblem> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SupTaskProblem::getTaskId, taskId)
+                .eq(Objects.nonNull(queryParam.getHasProblem()), SupTaskProblem::getHasProblem, queryParam.getHasProblem())
+                .eq(StrUtil.isNotBlank(queryParam.getProblemTypeCode()), SupTaskProblem::getProblemTypeCode, queryParam.getProblemTypeCode())
+                .eq(StrUtil.isNotBlank(queryParam.getDepartId()), SupTaskProblem::getDepartId, queryParam.getDepartId())
                 .orderByDesc(SupTaskProblem::getCreateTime);
         Page<SupTaskProblem> page = taskProblemService.page(Page.of(queryParam.getCurrent(),  queryParam.getSize()), queryWrapper);
         List<TaskInspectionProblemVo> records = page.getRecords().stream().map(item -> {

src/main/java/com/biutag/supervision/job/RiskJob.java

@@ -44,6 +44,9 @@ public class RiskJob {
             // 4小时、1天、30天
             long minutes = duration.toMinutes();
             long util = 240;
+            if ("5分钟".equals(riskPersonal.getControlTimeInterval())) {
+                util = 5;
+            }
             if ("4小时".equals(riskPersonal.getControlTimeInterval())) {
                 util = 240;
             }

src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionProblemQueryParam.java

@@ -12,5 +12,10 @@ import lombok.Setter;
 @Getter
 public class TaskInspectionProblemQueryParam extends BasePage {
 
+    private Boolean hasProblem;
+
+    private String problemTypeCode;
+
+    private String departId;
 
 }

src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java

@@ -23,6 +23,8 @@ public class TaskProblemDto {
 
     private String problemType;
 
+    private String problemTypeCode;
+
     private List<People> peoples;
 
     // 具体情况

src/main/java/com/biutag/supervision/service/SupDictProblemTypeService.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.constants.AppConstants;
@@ -49,6 +50,26 @@ public class SupDictProblemTypeService extends ServiceImpl<SupDictProblemTypeMap
         return node;
     }
 
+    public String getFullName(String code) {
+        if (StrUtil.isBlank(code)) {
+            return null;
+        }
+        SupDictProblemType three = getById(code);
+        String fullName = "";
+        if (Objects.nonNull(three)) {
+            fullName = three.getName();
+            SupDictProblemType two = getById(three.getParentCode());
+            if (Objects.nonNull(two)) {
+                fullName = two.getName() + "/" + fullName;
+                SupDictProblemType one = getById(two.getParentCode());
+                if (Objects.nonNull(one)) {
+                    fullName = one.getName() + "/" + fullName;
+                }
+            }
+        }
+        return fullName;
+    }
+
     public VerifyData.Problem getProblemByFullName(String fullName) {
         String[] arr = fullName.split("/");
         VerifyData.Problem problem = new VerifyData.Problem();

src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java

@@ -93,8 +93,8 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
     public  Page<SupRiskPersonalSupRecordVo> recordPage(SupRiskPersonalSupRecordQueryParam queryParam){
         QueryWrapper<SupRiskPersonalSupRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t.id_code",queryParam.getIdCode())
-                .eq("t.task_id",queryParam.getTaskId());
-
+                .eq("t.task_id",queryParam.getTaskId())
+                .orderByDesc("t.sup_time");
         Page<SupRiskPersonalSupRecordVo> page = supRiskPersonalSupRecordMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
 
         page.getRecords().forEach(item -> {

src/main/java/com/biutag/supervision/service/SupTaskProblemService.java

@@ -35,6 +35,8 @@ public class SupTaskProblemService extends ServiceImpl<SupTaskProblemMapper, Sup
 
     private final SupPhotoService photoService;
 
+    private final SupDictProblemTypeService problemTypeService;
+
     @Transactional(rollbackFor = Exception.class)
     public boolean save(TaskProblemDto dto) {
         SupTaskProblem problem = new SupTaskProblem();
@@ -45,7 +47,8 @@ public class SupTaskProblemService extends ServiceImpl<SupTaskProblemMapper, Sup
         problem.setFiles(JSON.toJSONString(dto.getFiles()));
         if (dto.getHasProblem()) {
             problem.setThingDesc(dto.getThingDesc());
-            problem.setProblemType(dto.getProblemType());
+            problem.setProblemTypeCode(dto.getProblemTypeCode());
+            problem.setProblemType(problemTypeService.getFullName(dto.getProblemTypeCode()));
             if (CollectionUtil.isNotEmpty(dto.getPeoples())) {
                 problem.setPeoples(JSON.toJSONString(dto.getPeoples()));
                 problem.setPeopleNumber(dto.getPeoples().size());