修改基础数据-个人业务数据-110、122的取值来源

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")

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

@@ -356,10 +356,10 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         businessPolice.setDepartId(resultMap2.get(gBaseCJD.getCjdxssdwdm()));
         businessPolice.setDepartName(resultMap3.get(gBaseCJD.getCjdxssdwdm()));
         businessPolice.setGroupId(groupId);
-        businessPolice.setNumber(gBaseCJD.getClwbrxmTotal());
-        businessPolice.setPoliceName(gBaseCJD.getClwbrxm());
-        businessPolice.setEmpNo(gBaseCJD.getClwbrbh());
-        businessPolice.setPoliceIdCode(hashConcatenatedStrings(gBaseCJD.getClwbrxm(), gBaseCJD.getClwbrbh()));
+        businessPolice.setNumber(gBaseCJD.getCjdxdmTotal());
+        businessPolice.setPoliceName(gBaseCJD.getCjdxname());
+        businessPolice.setEmpNo(gBaseCJD.getCjdxdm());
+        businessPolice.setPoliceIdCode(hashConcatenatedStrings(gBaseCJD.getCjdxname(), gBaseCJD.getCjdxdm()));
         if (groupId != null) {
             if (groupId == 10L) {
                 businessPolice.setBusinessType("1");
@@ -398,9 +398,9 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
     @DS("slave2")
     public List<GBaseCJD> selectCJDList(List<Date> happenTime) {
         QueryWrapper<GBaseCJD> 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);
     }
 

src/main/resources/mapper/GBaseCJDMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.biutag.supervision.mapper.GBaseCJDMapper">
 
     <select id="selectCJDList" resultType="com.biutag.supervision.pojo.entity.GBaseCJD">
-        select count(clwbrxm) as clwbrxmTotal, clwbrxm, clwbrbh, cjdxssdwdm, cjdxssdwmc
+        select count(cjdxdm) as cjdxdmTotal, cjdxname, cjdxdm, cjdxssdwdm, cjdxssdwmc
         from dwd_asj_zhtx_cjd
                  ${ew.getCustomSqlSegment}
     </select>