fix: 移动督察app

src/main/java/com/biutag/supervision/controller/AppController.java

@@ -26,9 +26,9 @@ public class AppController {
     @PostMapping("forward")
     public String forward(@RequestBody Request request) {
         log.info("APP 请求地址：{}  请求方式：{}   授权码：{}", request.getUrl(), request.getMethod(), request.getToken());
-        if (Objects.nonNull(request.getBody())) {
+//        if (Objects.nonNull(request.getBody())) {
-            log.info("APP 请求参数：{}", request.getBody());
+//            log.info("APP 请求参数：{}", request.getBody());
-        }
+//        }
         HttpResponse httpResponse = HttpRequest.of(String.format("http://127.0.0.1:8080" + request.getUrl()))
                 .method(getMethod(request.getMethod()))
                 .auth(request.getToken())

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

@@ -40,7 +40,7 @@ public class RiskJob {
         for (SupRiskPersonal riskPersonal : list) {
             SupTask task = taskService.getById(riskPersonal.getTaskId());
 
-            Duration duration = Duration.between(now, task.getCreateTime());
+            Duration duration = Duration.between(task.getCreateTime(), now);
             // 4小时、1天、30天
             long minutes = duration.toMinutes();
             long util = 240;
@@ -50,7 +50,7 @@ public class RiskJob {
             if ("1天".equals(riskPersonal.getControlTimeInterval())) {
                 util = 1440;
             }
-            if ("4小时".equals(riskPersonal.getControlTimeInterval())) {
+            if ("30天".equals(riskPersonal.getControlTimeInterval())) {
                 util = 43200;
             }
             // 取余数
@@ -62,8 +62,11 @@ public class RiskJob {
                 // 状态更新为未督察
                 riskPersonalService.update(new LambdaUpdateWrapper<SupRiskPersonal>().eq(SupRiskPersonal::getIdCode, riskPersonal.getIdCode())
                         .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.todo.name()));
+                taskService.update(new LambdaUpdateWrapper<SupTask>().eq(SupTask::getId, riskPersonal.getTaskId())
+                        .set(SupTask::getTaskStatus, WorkStatusEnum.todo.name()));
 
             }
+
         }
     }
 

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

@@ -14,7 +14,7 @@ import java.util.List;
 @Getter
 public class TaskProblemDto {
 
-    private Integer taskId;
+    private String taskId;
 
     // 是否存在督察问题
     private Boolean hasProblem;

src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java

@@ -19,7 +19,7 @@ public class SupTaskProblem {
 
     // 
     @TableField("task_id")
-    private Integer taskId;
+    private String taskId;
 
     // 是否存在督察问题
     @TableField("has_problem")

src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalQueryParam.java

@@ -14,4 +14,6 @@ public class SupRiskPersonalQueryParam extends BasePage{
     private String name;
 
     private String workStatus;
+
+    private String controlLevel;
 }

src/main/java/com/biutag/supervision/pojo/param/TaskTestingAlcoholPeopleQueryParam.java

@@ -27,4 +27,6 @@ public class TaskTestingAlcoholPeopleQueryParam extends BasePage {
 
     private String queryTxt;
 
+    private String isIllegalBanquet;
+
 }

src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java

@@ -19,7 +19,7 @@ public class TaskInspectionProblemVo {
 
     private Integer id;
 
-    private Integer taskId;
+    private String taskId;
 
     // 是否存在督察问题
     private Boolean hasProblem;
@@ -33,7 +33,7 @@ public class TaskInspectionProblemVo {
     private String problemTypeCode;
 
     // 具体情况
-    private String detail;
+    private String thingDesc;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")

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

@@ -13,6 +13,7 @@ import com.biutag.supervision.mapper.SupRiskPersonalSupRecordMapper;
 import com.biutag.supervision.pojo.dto.SupRiskPersonalSupRecordDto;
 import com.biutag.supervision.pojo.entity.SupRiskPersonal;
 import com.biutag.supervision.pojo.entity.SupRiskPersonalSupRecord;
+import com.biutag.supervision.pojo.entity.SupTask;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.SupRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.param.SupRiskPersonalSupRecordQueryParam;
@@ -35,6 +36,8 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
 
     private final SupRiskPersonalSupRecordMapper supRiskPersonalSupRecordMapper;
 
+    private final SupTaskService taskService;
+
     /**
      * 分页查询
      * */
@@ -42,6 +45,7 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
         QueryWrapper<SupRiskPersonal> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("srp.task_id", queryParam.getTaskId())
                 .eq("srp.work_status", queryParam.getWorkStatus())
+                .eq(StrUtil.isNotEmpty(queryParam.getControlLevel()),"srp.control_level",queryParam.getControlLevel())
                 .like(StrUtil.isNotEmpty(queryParam.getIdCode()),"srp.id_code",queryParam.getIdCode())
                 .like(StrUtil.isNotEmpty(queryParam.getName()),"srp.name",queryParam.getName())
                 .orderByAsc("srp.create_time");
@@ -67,10 +71,20 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
         }
         //补充file
         supRecord.setFiles(JSON.toJSONString(supRecordDto.getFiles()));
-        update(new LambdaUpdateWrapper<SupRiskPersonal>().eq(SupRiskPersonal::getIdCode, supRecordDto.getIdCode())
+        boolean b = supRecordService.saveOrUpdate(supRecord);
-                .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.done.name())
+        if (b) {
-                .set(SupRiskPersonal::getSupStatus, supRecordDto.getSupStatus()));
+            update(new LambdaUpdateWrapper<SupRiskPersonal>().eq(SupRiskPersonal::getIdCode, supRecordDto.getIdCode())
-        return supRecordService.saveOrUpdate(supRecord);
+                    .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.done.name())
+                    .set(SupRiskPersonal::getSupStatus, supRecordDto.getSupStatus()));
+            if (!exists(new LambdaUpdateWrapper<SupRiskPersonal>()
+                    .eq(SupRiskPersonal::getTaskId, supRecordDto.getTaskId())
+                    .eq(SupRiskPersonal::getWorkStatus, WorkStatusEnum.todo.name()))) {
+                taskService.update(new LambdaUpdateWrapper<SupTask>().eq(SupTask::getId, supRecordDto.getTaskId())
+                        .set(SupTask::getTaskStatus, WorkStatusEnum.done.name()));
+            }
+        }
+
+        return b;
     }
 
     /**

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

@@ -56,7 +56,7 @@ public class SupTaskProblemService extends ServiceImpl<SupTaskProblemMapper, Sup
         problem.setCreateTime(LocalDateTime.now());
         problem.setCreateUsername(UserContextHolder.getCurrentUser().getUserName());
         problem.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue());
-        if (Objects.nonNull(dto.getTaskId())) {
+        if (StrUtil.isNotBlank(dto.getTaskId())) {
             SupTask task = taskService.getById(dto.getTaskId());
             problem.setTaskType(task.getTaskType());
             if (Objects.nonNull(dto.getContentId())) {

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

@@ -7,17 +7,31 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.constants.enums.TaskStatusEnum;
 import com.biutag.supervision.mapper.SupTaskTestingAlcoholPeopleMapper;
+import com.biutag.supervision.pojo.dto.TaskProblemDto;
 import com.biutag.supervision.pojo.dto.TaskTestingAlcoholPeopleDto;
+import com.biutag.supervision.pojo.entity.SupDepart;
+import com.biutag.supervision.pojo.entity.SupPolice;
 import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople;
 import com.biutag.supervision.pojo.param.TaskTestingAlcoholPeopleQueryParam;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo;
 import com.biutag.supervision.util.JSON;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Objects;
+
+@RequiredArgsConstructor
 @Service
 public class SupTaskTestingAlcoholPeopleService extends ServiceImpl<SupTaskTestingAlcoholPeopleMapper, SupTaskTestingAlcoholPeople> {
 
+    private final SupTaskProblemService taskProblemService;
+    private final SupPoliceService policeService;
+    private final SupDepartService departService;
+
     public Page<TaskTestingAlcoholPeopleVo> page(String taskId, TaskTestingAlcoholPeopleQueryParam queryParam) {
         QueryWrapper<SupTaskTestingAlcoholPeople> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("peo.task_id", taskId)
@@ -26,11 +40,12 @@ public class SupTaskTestingAlcoholPeopleService extends ServiceImpl<SupTaskTesti
                 .like(StrUtil.isNotBlank(queryParam.getEmpNo()), "peo.emp_no", queryParam.getEmpNo())
                 .eq(StrUtil.isNotBlank(queryParam.getTestingResult()), "peo.testing_result", queryParam.getTestingResult())
                 .eq(StrUtil.isNotBlank(queryParam.getDrinkResult()), "peo.drink_result", queryParam.getDrinkResult())
+                .eq(StrUtil.isNotBlank(queryParam.getIsIllegalBanquet()), "peo.is_illegal_banquet", queryParam.getIsIllegalBanquet())
                 .eq(StrUtil.isNotBlank(queryParam.getPosition()), "p.position", queryParam.getPosition())
                 .and(StrUtil.isNotBlank(queryParam.getQueryTxt()), q -> {
                     q.like("peo.name", queryParam.getQueryTxt()).or().like("peo.emp_no", queryParam.getQueryTxt());
                 })
-                .orderByAsc("peo.testing_result");
+                .orderByDesc("peo.testing_time");
         Page<TaskTestingAlcoholPeopleVo> page = baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         page.getRecords().forEach(item -> {
             if (StrUtil.isNotBlank(item.getTestingFiles())) {
@@ -55,9 +70,69 @@ public class SupTaskTestingAlcoholPeopleService extends ServiceImpl<SupTaskTesti
                 updateWrapper.set(SupTaskTestingAlcoholPeople::getAlcoholContent, dto.getAlcoholContent());
             }
         } else {
-            updateWrapper.set(SupTaskTestingAlcoholPeople::getUnTestingDesc, "其他".equals(dto.getUnTestingDesc()) ? dto.getUnTestingDescOther() : dto.getUnTestingDesc());
+            String unTestingDesc = "其他".equals(dto.getUnTestingDesc()) ? dto.getUnTestingDescOther() : dto.getUnTestingDesc();
+            updateWrapper.set(SupTaskTestingAlcoholPeople::getUnTestingDesc, unTestingDesc);
         }
+        saveProblem(dto);
         return update(updateWrapper);
     }
 
+    @Async
+    public void saveProblem(TaskTestingAlcoholPeopleDto dto) {
+        if ("已检测".equals(dto.getTestingResult())) {
+            if ("饮酒".equals(dto.getDrinkResult()) || "是".equals(dto.getIsIllegalBanquet())) {
+                SupPolice police = policeService.getByEmpNo(dto.getEmpNo());
+                SupDepart depart = departService.getById(police.getOrgId());
+                TaskProblemDto problemDto = new TaskProblemDto();
+                TaskProblemDto.People people = new TaskProblemDto.People();
+                people.setName(police.getName());
+                people.setEmpNo(police.getEmpNo());
+                people.setIdCode(police.getIdCode());
+                problemDto.setHasProblem(true);
+                problemDto.setDepartId(police.getOrgId());
+                problemDto.setPeoples(List.of(people));
+                problemDto.setTaskId(dto.getTaskId());
+                problemDto.setFiles(dto.getTestingFiles());
+                // XX年X月X日X时X分，在“公安部六项规定”督察中，发现“XX”单位的“X”存在“违规宴请”的问题情况，请立即组织核实其当时情况。
+                // XX年X月X日X时X分，在“公安部六项规定”督察中，发现“X”单位的“XX”存在“饮酒”的问题情况，请立即组织核实其当时情况.
+                String thingDesc = String.format("%s，在“公安部六项规定”督察中，", dto.getTestingTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分")));
+                if ("饮酒".equals(dto.getDrinkResult())) {
+                    thingDesc += String.format("发现“%s”单位的“%s”存在“饮酒”%s的问题情况，",
+                            depart.getName(),
+                            police.getName(),
+                            Objects.nonNull(dto.getAlcoholContent()) ? String.format("%s（mg/100ml）", dto.getAlcoholContent()) : "");
+                }
+                if ("是".equals(dto.getIsIllegalBanquet())) {
+                    thingDesc += String.format("发现“%s”单位的“%s”存在“违规宴请”的问题情况，",
+                            depart.getName(),
+                            police.getName());
+                }
+                thingDesc += "请立即组织核实其当时情况。";
+                problemDto.setThingDesc(thingDesc);
+                taskProblemService.save(problemDto);
+            }
+        } else {
+            String unTestingDesc = "其他".equals(dto.getUnTestingDesc()) ? dto.getUnTestingDescOther() : dto.getUnTestingDesc();
+            if (!"请假".equals(unTestingDesc)) {
+                SupPolice police = policeService.getByEmpNo(dto.getEmpNo());
+                SupDepart depart = departService.getById(police.getOrgId());
+                TaskProblemDto problemDto = new TaskProblemDto();
+                TaskProblemDto.People people = new TaskProblemDto.People();
+                people.setName(police.getName());
+                people.setEmpNo(police.getEmpNo());
+                people.setIdCode(police.getIdCode());
+                problemDto.setHasProblem(true);
+                problemDto.setDepartId(police.getOrgId());
+                problemDto.setPeoples(List.of(people));
+                problemDto.setTaskId(dto.getTaskId());
+                // X年X月X日X时X分，在“公安部六项规定”督察中，发现“XX”单位的“XX”存在“联系不上”的问题情况，未参加监测，请立即组织核实其当时情况。
+                problemDto.setThingDesc(String.format("%s，在“公安部六项规定”督察中，发现“%s”单位的“%s”存在“%s”的问题情况，未参加监测，请立即组织核实其当时情况。",
+                        dto.getTestingTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分")),
+                        depart.getName(),
+                        police.getName(),
+                        unTestingDesc));
+                taskProblemService.save(problemDto);
+            }
+        }
+    }
 }

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

@@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -145,21 +147,29 @@ public class TaskManagementService {
                return testingAlcoholPeopleService.saveBatch(dto.getUserList());
             }
             if("重点人员管控".equals(dto.getSpecialType())){
-                dto.getSupRiskDtoList().forEach(s->{
+                List<SupTaskPerson> list = dto.getSupRiskDtoList().stream().map(item -> item.getControlEmpNo()).distinct().map(empNo -> {
                     //参与人员表
-                    SupTaskPerson personalSup=new SupTaskPerson();
+                    SupTaskPerson personalSup = new SupTaskPerson();
-                    personalSup.setEmpNo(s.getControlEmpNo());
+                    personalSup.setEmpNo(empNo);
-                    personalSup.setName(s.getControlName());
+                    SupRiskDto supRiskDto = dto.getSupRiskDtoList().stream().filter(item -> empNo.equals(item.getControlEmpNo())).findFirst().orElse(null);
+                    String controlName = Optional.ofNullable(supRiskDto).map(SupRiskDto::getControlName).orElse(null);
+                    personalSup.setName(controlName);
                     personalSup.setCreateTime(LocalDateTime.now());
                     personalSup.setTaskId(task.getId());
-                    personalSup.setIdCode(s.getControlIdcode());
+                    String controlIdcode = Optional.ofNullable(supRiskDto).map(SupRiskDto::getControlName).orElse(null);
-                    taskPersonService.save(personalSup);
+                    personalSup.setIdCode(controlIdcode);
+                    return personalSup;
+                }).toList();
+                taskPersonService.saveBatch(list);
+
+                dto.getSupRiskDtoList().forEach(s->{
+                    SupTaskPerson supTaskPerson = list.stream().filter(item -> item.getEmpNo().equals(s.getControlEmpNo())).findFirst().orElse(null);
                     //重点人员
                     SupRiskPersonal supRiskPersonal=new SupRiskPersonal();
                     BeanUtils.copyProperties(s,supRiskPersonal);
                     supRiskPersonal.setImageBase64(s.getImgBase64());
                     supRiskPersonal.setCreateTime(LocalDateTime.now());
-                    supRiskPersonal.setTaskPersonId(personalSup.getId());
+                    supRiskPersonal.setTaskPersonId(Optional.ofNullable(supTaskPerson).map(SupTaskPerson::getId).orElse(null));
                     supRiskPersonal.setIdCode(supRiskPersonal.getIdCode().trim());
                     supRiskPersonal.setTaskId(task.getId());
                     //age

src/main/resources/mapper/SupRiskPersonalMapper.xml

@@ -25,10 +25,9 @@
             stp.name as controlName,
             stp.emp_no as controlEmpNo,
             srp.sup_status,
-            info.image_base64
+            srp.image_base64
         FROM sup_risk_personal as srp
                  LEFT JOIN sup_task_person as stp on srp.task_person_id = stp.id
-                 LEFT JOIN risk_person_info as info on srp.id_code = info.id_code
                 LEFT JOIN sup_police p on stp.emp_no = p.emp_no
             ${ew.getCustomSqlSegment}
     </select>

src/main/resources/mapper/SupTaskMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.biutag.supervision.mapper.SupTaskMapper">
 
     <select id="queryTask" resultType="com.biutag.supervision.pojo.vo.TaskVo">
-        select t.id,
+        select distinct t.id,
                 t.task_name,
                 t.sup_depart_name,
                 t.begin_time,

src/test/java/com/biutag/supervision/TestCase.java

@@ -35,8 +35,6 @@ public class TestCase {
         WriteCellData<Void> writeCellData = new WriteCellData<>();
         writeCellData.setImageDataList(List.of(imageData, imageData2));
 
-        vo.setFiles(writeCellData);
-
         List<NegativeAuditExportVo> list = List.of(vo, vo);
         EasyExcel.write(new FileOutputStream("D:\\deploy\\审计监督数据台账.xlsx"), NegativeAuditExportVo.class)
                 .inMemory(Boolean.TRUE).sheet("审计监督数据台账").doWrite(list);
@@ -45,7 +43,7 @@ public class TestCase {
 
     @Test
     public void testFileType() {
-        System.out.println(FileUtil.extName("1.gif.PDF1"));
+        System.out.println(3 % 2);
 
     }
 }