diff --git a/src/main/java/com/biutag/supervision/pojo/entity/GBaseCJD.java b/src/main/java/com/biutag/supervision/pojo/entity/GBaseCJD.java index 22e6c18..7c31bd8 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/GBaseCJD.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/GBaseCJD.java @@ -12,19 +12,19 @@ import java.util.Date; @Getter public class GBaseCJD { - private Integer clwbrxmTotal; + private Integer cjdxdmTotal; - // 处理完毕人姓名 - @TableField("clwbrxm") - private String clwbrxm; + // 出警对象名称 + @TableField("cjdxname") + private String cjdxname; // 处警时间 @TableField("cjsj") private Date cjsj; - // 处理完毕人编号 - @TableField("clwbrbh") - private String clwbrbh; + // 出警对象代码 + @TableField("cjdxdm") + private String cjdxdm; // 处警对象所属单位代码 @TableField("cjdxssdwdm") diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java index 48f30d6..30b661c 100644 --- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java +++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java @@ -356,10 +356,10 @@ public class BusinessPoliceService extends ServiceImpl selectCJDList(List happenTime) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.isNotNull("clwbrxm"); + queryWrapper.isNotNull("cjdxdm"); queryWrapper.between("cjsj", happenTime.get(0), happenTime.get(1)); - queryWrapper.groupBy("clwbrxm", "clwbrbh", "cjdxssdwdm", "cjdxssdwmc"); + queryWrapper.groupBy("cjdxname", "cjdxdm", "cjdxssdwdm", "cjdxssdwmc"); return gBaseCJDMapper.selectCJDList(queryWrapper); } diff --git a/src/main/resources/mapper/GBaseCJDMapper.xml b/src/main/resources/mapper/GBaseCJDMapper.xml index 279c474..468080e 100644 --- a/src/main/resources/mapper/GBaseCJDMapper.xml +++ b/src/main/resources/mapper/GBaseCJDMapper.xml @@ -5,7 +5,7 @@