1

doc/update.2.2.0.sql

@@ -3256,3 +3256,8 @@ CREATE TABLE `t_auth_page` (
                                `update_time` timestamp NULL DEFAULT NULL,
                                PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+
+ALTER TABLE `4dkankan_v4`.`jy_user`
+    ADD COLUMN `ry_org_code` varchar(255) NULL COMMENT '民警所在单位代码' AFTER `district_name`,
+    ADD COLUMN `ry_org_name` varchar(255) NULL COMMENT '民警所在单位名称' AFTER `ry_org_code`;

src/main/java/com/fdkankan/manage/entity/JyUser.java

@@ -88,4 +88,16 @@ public class JyUser implements Serializable {
 
     @TableField(value = "district_name")
     private String districtName;
+
+    /**
+     * 民警所在单位代码
+     */
+    @TableField(value = "ry_org_code")
+    private String ryOrgCode;
+
+    /**
+     * 民警所在单位名称
+     */
+    @TableField(value = "ry_org_name")
+    private String ryOrgName;
 }

src/main/java/com/fdkankan/manage/service/impl/DataService.java

@@ -80,6 +80,8 @@ public class DataService implements IDataService {
         Integer totalSceneUserCount = dataMapper.totalSceneUserCount(param).size();
 
         param.setUserId(jyUser.getUserId());
+        param.setStartTime(null);
+        param.setEndTime(null);
         Long userSceneCount = dataMapper.totalSceneCount(param);
 
         String updateTime = dataMapper.getLastSceneBuildTime(param);

src/main/java/com/fdkankan/manage/vo/request/UserParam.java

@@ -37,6 +37,10 @@ public class UserParam extends RequestBase {
 
     private String districtName;
 
+    private String ryOrgCode;
+
+    private String ryOrgName;
+
     private Boolean isNew = false;
 
     public String getPhone() {