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 -> {