fix 修改异常列表接口

boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectUserVo">
         select u.id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.union_id, u.open_id,u.grid_id,
-        d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.area_id,d.area_name
+        d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.area_id,d.area_name,
         r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.id

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -99,6 +99,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 , sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
         //拆分搜索接口中年龄字段
         setAgeScope(czrk);
+        startPage();
         List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRl(czrk);
         return czrkNotRl;
     }
@@ -117,6 +118,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 , sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
         //拆分搜索接口中年龄字段
         setAgeScope(czrk);
+        startPage();
         List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRlCz(czrk);
         return czrkNotRl;
     }
@@ -142,6 +144,7 @@ public class CzrkServiceImpl implements ICzrkService {
         //如果查询参数有居住地址,进行连表查询
         if (StringUtils.isNotBlank(provinceId) || StringUtils.isNotBlank(cityId) || StringUtils.isNotBlank(regionId) || StringUtils.isNotBlank(villageTownsId) || StringUtils.isNotBlank(villageId)) {
             long startTimeSql = System.currentTimeMillis();
+            startPage();
             List<Czrk> czrks = czrkMapper.listCzrkByJzdz(czrk);
             long endTimeSql = System.currentTimeMillis() - startTimeSql;
             log.info("执行查询人员信息中包含居住地址的sql语句时间:" + endTimeSql + "ms");
@@ -150,6 +153,7 @@ public class CzrkServiceImpl implements ICzrkService {
         }
         long startTimeSql = System.currentTimeMillis();
         //没有搜索居住地址的条件,进行单表查询
+        startPage();
         List<Czrk> czrks = czrkMapper.listByCzrk(czrk);
         long endTimeSql = System.currentTimeMillis() - startTimeSql;
         log.info("执行查询sql语句时间:" + endTimeSql + "ms");
@@ -169,7 +173,6 @@ public class CzrkServiceImpl implements ICzrkService {
         log.info("{}于{}查询非正常人员人员列表，查询条件：{}"
                 , sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
         setAgeScope(czrk);
-
         //设置权限
         setQueryRole(czrk, sysUser, Czrk.HJ);
         startPage();
@@ -625,6 +628,7 @@ public class CzrkServiceImpl implements ICzrkService {
      */
     @Override
     public AjaxResult changeCzrk(Czrk czrk) {
+        SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         //判断一下id是否存在
         Long id = czrk.getId();
         if (id == null) {
@@ -632,34 +636,35 @@ public class CzrkServiceImpl implements ICzrkService {
         }
         //如果是迁出,则放到待认领中
         String status = czrk.getStatus();
+        //根据id查询出这个人信息
+        Czrk czrkQianchu = czrkMapper.selectCzrkById(id);
+        //先保存这个人的信息,当做历史记录
+        czrkChangeMapper.insertCzrkChange(czrkQianchu);
         if (StringUtils.isNotBlank(status) && "2".equals(status)) {
-            //根据id查询出这个人信息
-            Czrk czrkQianchu = czrkMapper.selectCzrkById(id);
-            //先保存这个人的信息,当做历史记录
-            czrkChangeMapper.insertCzrkChange(czrkQianchu);
             czrkQianchu.setIsRl("否");
             czrkQianchu.setRlr("");
             czrkQianchu.setRlrNike("");
+            czrkQianchu.setIsConfirm("N");
+            czrkQianchu.setConfirmInfoUser("");
+            czrkQianchu.setChangNikeUser("");
+            czrkQianchu.setChangUserTime(null);
+            czrkQianchu.setChangUser(sysUser.getUserName());
+            czrkQianchu.setChangNikeUser(sysUser.getNickName());
+            czrkQianchu.setChangUserTime(DateUtils.getNowDate());
+            czrkQianchu.setStatus("1");
             czrkMapper.updateCzrk(czrkQianchu);
             return AjaxResult.success();
         }
         //接下来则放入其他状态中
-        //往czrk_change表中插入历史数据
-        czrkChangeMapper.insertCzrkChange(czrk);
-        LoginUser loginUser = tokenService.getLoginUser();
-        if (loginUser != null) {
-            SysUser sysUser = loginUser.getSysUser();
-            if (sysUser != null) {
-                String userName = sysUser.getUserName();
-                czrk.setChangUser(userName);
-                czrk.setChangUserTime(DateUtils.getNowDate());
-                czrk.setChangNikeUser(sysUser.getNickName());
-                czrkMapper.changeCzrk(czrk);
-                return AjaxResult.success();
-            }
-            return AjaxResult.error("变更失败:没有获取到登录人信息");
+        if (sysUser != null) {
+            String userName = sysUser.getUserName();
+            czrk.setChangUser(userName);
+            czrk.setChangUserTime(DateUtils.getNowDate());
+            czrk.setChangNikeUser(sysUser.getNickName());
+            czrkMapper.changeCzrk(czrk);
+            return AjaxResult.success();
         }
-        return AjaxResult.error("变更失败");
+        return AjaxResult.error("变更失败:没有获取到登录人信息");
     }
 
     /**
@@ -879,7 +884,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 //没有搜索居住地址的条件,进行单表查询
                 czrks = czrkMapper.listByCzrk(czrk);
             }
-            if (czrks != null && czrks.size() > 0){
+            if (czrks != null && czrks.size() > 0) {
                 //户籍人口全部人员
                 total = czrks.size();
                 //户籍人口已认领

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -77,38 +77,36 @@ public class CzrkUtils {
                 if (role != null){
                      String roleKey = role.getRoleKey();
                      if (StringUtils.isNotBlank(roleKey)){
-                         switch (roleKey){
-                             case "province":
-                                 if (type.equals(Czrk.HJ)){
-                                     czrk.setProvinceId(areaId);
-                                 }else {
-                                     czrk.setProvinceIdXjd(areaId);
-                                 }
-                             case "city":
-                                 if (type.equals(Czrk.HJ)){
-                                     czrk.setCityId(areaId);
-                                 }else {
-                                     czrk.setCityIdXjd(areaId);
-                                 }
-                             case "region":
-                                 if (type.equals(Czrk.HJ)){
-                                     czrk.setRegionId(areaId);
-                                 }else {
-                                     czrk.setRegionIdXjd(areaId);
-                                 }
-                             case "villageTowns":
-                                 if (type.equals(Czrk.HJ)){
-                                     czrk.setVillageTownsId(areaId);
-                                 }else {
-                                     czrk.setVillageTownsXjd(areaId);
-                                 }
-                             case "village":
-                                 if (type.equals(Czrk.HJ)){
-                                     czrk.setVillageId(areaId);
-                                 }else {
-                                     czrk.setVillageIdXjd(areaId);
-                                 }
-                             default:
+                         if ("province".equals(roleKey)){
+                             if (type.equals(Czrk.HJ)){
+                                 czrk.setProvinceId(areaId);
+                             }else {
+                                 czrk.setProvinceIdXjd(areaId);
+                             }
+                         }else if ("city".equals(roleKey)){
+                             if (type.equals(Czrk.HJ)){
+                                 czrk.setCityId(areaId);
+                             }else {
+                                 czrk.setCityIdXjd(areaId);
+                             }
+                         }else if ("region".equals(roleKey)) {
+                             if (type.equals(Czrk.HJ)){
+                                 czrk.setRegionId(areaId);
+                             }else {
+                                 czrk.setRegionIdXjd(areaId);
+                             }
+                         }else if ("villageTowns".equals(roleKey)) {
+                             if (type.equals(Czrk.HJ)){
+                                 czrk.setVillageTownsId(areaId);
+                             }else {
+                                 czrk.setVillageTownsXjd(areaId);
+                             }
+                         }else if ("village".equals(roleKey)) {
+                             if (type.equals(Czrk.HJ)){
+                                 czrk.setVillageId(areaId);
+                             }else {
+                                 czrk.setVillageIdXjd(areaId);
+                             }
                          }
                      }
                 }
@@ -140,35 +138,33 @@ public class CzrkUtils {
                 if (role != null){
                     String roleKey = role.getRoleKey();
                     if (StringUtils.isNotBlank(roleKey)){
-                        switch (roleKey){
-                            case "province":
-                                String provinceId = czrk.getProvinceId();
-                                if (StringUtils.isNotBlank(provinceId) && provinceId.equals(areaId)){
-                                    return flag = false;
-                                }
-                            case "city":
-                                String cityId = czrk.getCityId();
-                                if (StringUtils.isNotBlank(cityId) && cityId.equals(areaId)){
-                                    return  flag = false;
-                                }
-                            case "region":
-                                String regionId = czrk.getRegionId();
-                                if (StringUtils.isNotBlank(regionId) && regionId.equals(areaId)){
-                                    return  flag = false;
-                                }
-                            case "villageTowns":
-                                String villageTownsId = czrk.getVillageTownsId();
-                                if (StringUtils.isNotBlank(villageTownsId) && villageTownsId.equals(areaId)){
-                                    return flag = false;
-                                }
-                            case "village":
-                                String village = czrk.getVillage();
-                                if (StringUtils.isNotBlank(village) && village.equals(areaId)){
-                                    return flag = false;
-                                }
-                            case "admin":
-                                return flag = false;
-                            default:
+                        if ("province".equals(roleKey)){
+                            String provinceId = czrk.getProvinceId();
+                            if (StringUtils.isNotBlank(provinceId) && provinceId.equals(areaId)){
+                                 flag = false;
+                            }
+                        }else if ("city".equals(roleKey)){
+                            String cityId = czrk.getCityId();
+                            if (StringUtils.isNotBlank(cityId) && cityId.equals(areaId)){
+                                  flag = false;
+                            }
+                        }else if ("region".equals(roleKey)) {
+                            String cityId = czrk.getCityId();
+                            if (StringUtils.isNotBlank(cityId) && cityId.equals(areaId)){
+                                  flag = false;
+                            }
+                        }else if ("villageTowns".equals(roleKey)) {
+                            String villageTownsId = czrk.getVillageTownsId();
+                            if (StringUtils.isNotBlank(villageTownsId) && villageTownsId.equals(areaId)){
+                                 flag = false;
+                            }
+                        }else if ("village".equals(roleKey)) {
+                            String village = czrk.getVillage();
+                            if (StringUtils.isNotBlank(village) && village.equals(areaId)){
+                                 flag = false;
+                            }
+                        }else if ("admin".equals(roleKey)) {
+                            flag = false;
                         }
                     }
                 }

boman-web-core/src/main/resources/mapper/CzrkChangeMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
 
-    <insert id="insertCzrkChange"  useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCzrkChange">
         insert into czrk_change
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userName != null">user_name,</if>

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -789,19 +789,22 @@
             <if test="nowIn != null">now_in = #{nowIn},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="gridId != null">grid_id = #{gridId},</if>
+            <if test="changUser != null">chang_user = #{changUser},</if>
+            <if test="changNikeUser != null">chang_nike_user = #{changNikeUser},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="isConfirm != null and isConfirm != ''">is_confirm = #{isConfirm},</if>
-            <if test="confirmInfoUser != null and confirmInfoUser != ''">confirm_info_user = #{confirmInfoUser},</if>
-            <if test="confirmInfoNikeUser != null and confirmInfoNikeUser != ''">confirm_info_nike_user =
+            <if test="isConfirm != null">is_confirm = #{isConfirm},</if>
+            <if test="confirmInfoUser != null ">confirm_info_user = #{confirmInfoUser},</if>
+            <if test="confirmInfoNikeUser != null">confirm_info_nike_user =
                 #{confirmInfoNikeUser},
             </if>
             <if test="confirmInfoUserTime != null ">confirm_info_user_time = #{confirmInfoUserTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = sysdate(),</if>
             <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
             <if test="deleteReason != null">delete_reason = #{deleteReason},</if>
+            update_time = sysdate(),
+            chang_user_time = #{changUserTime}
         </trim>
         where id = #{id}
     </update>
@@ -1063,7 +1066,7 @@
             chang_user = #{changUser},
             chang_nike_user = #{changNikeUser},
             chang_user_time = sysdate()
-        where is_del = 'N' and id_card = #{idCard};
+        where  id = #{id};
     </update>
 
     <select id="selectCzrkByIdCard" resultType="java.lang.String" resultMap="CzrkResult">
@@ -1083,13 +1086,13 @@
         now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time
         from czrk
         <where>
-            status not in ('1','2')
             <if test="userName != null  and userName != ''">
                 and user_name like concat(#{userName}, '%')
             </if>
             <if test="params.startAge != null  and params.startAge != ''">and age &gt;= #{params.startAge}</if>
             <if test="params.endAge != null  and params.endAge != ''">and age &lt;= #{params.endAge}</if>
             <if test="gender != null  and gender != ''">and gender = #{gender}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
             <if test="age != null ">and age = #{age}</if>
             <if test="birthday != null ">and birthday = #{birthday}</if>
             <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>