From 93d84f558db98c35f507eac8729227850b981765 Mon Sep 17 00:00:00 2001 From: pengwei Date: Fri, 4 Jul 2025 17:05:35 +0800 Subject: [PATCH] =?UTF-8?q?fit:1=E3=80=81=E7=9D=A3=E5=AF=9F=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=91=E5=B8=83=E5=90=8E=E7=AB=AFv2=EF=BC=88?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98=E7=9D=A3=E5=AF=9F=EF=BC=89?= =?UTF-8?q?=E4=BC=98=E5=8C=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/pojo/dto/SupRiskPersonalSupRecordDto.java | 2 ++ .../supervision/pojo/entity/SupRiskPersonalSupRecord.java | 3 +++ .../pojo/param/SupRiskPersonalSupRecordQueryParam.java | 2 ++ .../biutag/supervision/service/SupRiskPersonalService.java | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskPersonalSupRecordDto.java b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskPersonalSupRecordDto.java index bbe183e..c95e4d9 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskPersonalSupRecordDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskPersonalSupRecordDto.java @@ -15,6 +15,8 @@ import java.util.List; @Getter @Setter public class SupRiskPersonalSupRecordDto { + //任务ID + private int taskId; private int id; //重点人员姓名 diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java b/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java index ba1b771..707b1ef 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java @@ -15,6 +15,9 @@ public class SupRiskPersonalSupRecord { @TableId(value = "id", type = IdType.AUTO) private int id; + + @TableField("task_id") + private int taskId; //重点人员姓名 @TableField("name") private String name; diff --git a/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalSupRecordQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalSupRecordQueryParam.java index d44d6c7..58ef309 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalSupRecordQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/SupRiskPersonalSupRecordQueryParam.java @@ -8,4 +8,6 @@ import lombok.Setter; public class SupRiskPersonalSupRecordQueryParam extends BasePage { private String idCode; +private int taskId; + } diff --git a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java b/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java index a388cfd..5fc8580 100644 --- a/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java +++ b/src/main/java/com/biutag/supervision/service/SupRiskPersonalService.java @@ -75,7 +75,9 @@ public class SupRiskPersonalService extends ServiceImpl recordPage(SupRiskPersonalSupRecordQueryParam queryParam){ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("t.id_code",queryParam.getIdCode()); + queryWrapper.eq("t.id_code",queryParam.getIdCode()) + .eq("t.task_id",queryParam.getTaskId()); + Page page = supRiskPersonalSupRecordMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); page.getRecords().forEach(item -> {