From 072f0ffeca5a71d399f0c5509b77e60773c68577 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Wed, 16 Jul 2025 15:58:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=9D=A3=E5=AF=9Fapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/controller/AppController.java | 6 +- .../com/biutag/supervision/job/RiskJob.java | 7 +- .../supervision/pojo/dto/TaskProblemDto.java | 2 +- .../pojo/entity/SupTaskProblem.java | 2 +- .../pojo/param/SupRiskPersonalQueryParam.java | 2 + .../TaskTestingAlcoholPeopleQueryParam.java | 2 + .../pojo/vo/TaskInspectionProblemVo.java | 4 +- .../service/SupRiskPersonalService.java | 22 +++++- .../service/SupTaskProblemService.java | 2 +- .../SupTaskTestingAlcoholPeopleService.java | 79 ++++++++++++++++++- .../service/TaskManagementService.java | 24 ++++-- .../mapper/SupRiskPersonalMapper.xml | 3 +- src/main/resources/mapper/SupTaskMapper.xml | 2 +- .../java/com/biutag/supervision/TestCase.java | 4 +- 14 files changed, 132 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/AppController.java b/src/main/java/com/biutag/supervision/controller/AppController.java index 54fc7b3..a068d7b 100644 --- a/src/main/java/com/biutag/supervision/controller/AppController.java +++ b/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())) { - log.info("APP 请求参数：{}", request.getBody()); - } +// if (Objects.nonNull(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()) diff --git a/src/main/java/com/biutag/supervision/job/RiskJob.java b/src/main/java/com/biutag/supervision/job/RiskJob.java index 60860fd..be5c071 100644 --- a/src/main/java/com/biutag/supervision/job/RiskJob.java +++ b/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().eq(SupRiskPersonal::getIdCode, riskPersonal.getIdCode()) .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.todo.name())); + taskService.update(new LambdaUpdateWrapper().eq(SupTask::getId, riskPersonal.getTaskId()) + .set(SupTask::getTaskStatus, WorkStatusEnum.todo.name())); } + } } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java index 56088e7..37419d9 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java index 5d4ef69..170800e 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java +++ b/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") diff --git a/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalQueryParam.java index a0fc4e5..0a0f508 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalQueryParam.java +++ b/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; } diff --git a/src/main/java/com/biutag/supervision/pojo/param/TaskTestingAlcoholPeopleQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/TaskTestingAlcoholPeopleQueryParam.java index 0b57b6a..51a40ca 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/TaskTestingAlcoholPeopleQueryParam.java +++ b/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; + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java index 342f044..70a0050 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/TaskInspectionProblemVo.java +++ b/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") diff --git a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java b/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java index ecc730c..894ad8d 100644 --- a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java +++ b/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 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().eq(SupRiskPersonal::getIdCode, supRecordDto.getIdCode()) - .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.done.name()) - .set(SupRiskPersonal::getSupStatus, supRecordDto.getSupStatus())); - return supRecordService.saveOrUpdate(supRecord); + boolean b = supRecordService.saveOrUpdate(supRecord); + if (b) { + update(new LambdaUpdateWrapper().eq(SupRiskPersonal::getIdCode, supRecordDto.getIdCode()) + .set(SupRiskPersonal::getWorkStatus, WorkStatusEnum.done.name()) + .set(SupRiskPersonal::getSupStatus, supRecordDto.getSupStatus())); + if (!exists(new LambdaUpdateWrapper() + .eq(SupRiskPersonal::getTaskId, supRecordDto.getTaskId()) + .eq(SupRiskPersonal::getWorkStatus, WorkStatusEnum.todo.name()))) { + taskService.update(new LambdaUpdateWrapper().eq(SupTask::getId, supRecordDto.getTaskId()) + .set(SupTask::getTaskStatus, WorkStatusEnum.done.name())); + } + } + + return b; } /** diff --git a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java index 63cea4f..8b29c29 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java @@ -56,7 +56,7 @@ public class SupTaskProblemService extends ServiceImpl { + private final SupTaskProblemService taskProblemService; + private final SupPoliceService policeService; + private final SupDepartService departService; + public Page page(String taskId, TaskTestingAlcoholPeopleQueryParam queryParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("peo.task_id", taskId) @@ -26,11 +40,12 @@ public class SupTaskTestingAlcoholPeopleService extends ServiceImpl { q.like("peo.name", queryParam.getQueryTxt()).or().like("peo.emp_no", queryParam.getQueryTxt()); }) - .orderByAsc("peo.testing_result"); + .orderByDesc("peo.testing_time"); Page 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{ + List list = dto.getSupRiskDtoList().stream().map(item -> item.getControlEmpNo()).distinct().map(empNo -> { //参与人员表 - SupTaskPerson personalSup=new SupTaskPerson(); - personalSup.setEmpNo(s.getControlEmpNo()); - personalSup.setName(s.getControlName()); + SupTaskPerson personalSup = new SupTaskPerson(); + personalSup.setEmpNo(empNo); + 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()); - taskPersonService.save(personalSup); + String controlIdcode = Optional.ofNullable(supRiskDto).map(SupRiskDto::getControlName).orElse(null); + 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 diff --git a/src/main/resources/mapper/SupRiskPersonalMapper.xml b/src/main/resources/mapper/SupRiskPersonalMapper.xml index 9e2f4e7..533f07c 100644 --- a/src/main/resources/mapper/SupRiskPersonalMapper.xml +++ b/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} diff --git a/src/main/resources/mapper/SupTaskMapper.xml b/src/main/resources/mapper/SupTaskMapper.xml index 41a9847..5b87258 100644 --- a/src/main/resources/mapper/SupTaskMapper.xml +++ b/src/main/resources/mapper/SupTaskMapper.xml @@ -5,7 +5,7 @@