fix 列表中新增了认领人姓名,确认人姓名

boman-api/boman-domain/src/main/java/com.boman.domain/BaseEntity.java

@@ -24,7 +24,7 @@ public class BaseEntity implements Serializable
     private String createBy;
 
     /** 创建时间 */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */

boman-api/boman-domain/src/main/java/com.boman.domain/SysUser.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -145,6 +146,7 @@ public class SysUser/* extends BaseEntity*/ {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**

boman-api/boman-domain/src/main/java/com.boman.domain/dto/AjaxResult.java

@@ -161,6 +161,10 @@ public class AjaxResult extends HashMap<String, Object>
         return new AjaxResult(HttpStatus.ERROR, "失败", data);
     }
 
+    public static AjaxResult error(int status,Object data) {
+        return new AjaxResult(status, "失败", data);
+    }
+
     /**
      * 返回错误消息
      * 

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -96,6 +96,10 @@ public class Czrk extends BaseEntity{
      */
     @Excel(name = "认领人")
     private String rlr;
+    /**
+     * 认领人姓名
+     */
+    private String rlrNike;
 
     /**
      * 认领时间
@@ -225,6 +229,10 @@ public class Czrk extends BaseEntity{
      * 最后一次确认人
      */
     private String confirmInfoUser;
+    /**
+     * 最后一次确认人姓名
+     */
+    private String confirmInfoNikeUser;
     /**
      * 最后一次确认时间
      */

boman-web-core/src/main/java/com/boman/web/core/domain/ConfirmInfoUser.java

@@ -12,9 +12,13 @@ public class ConfirmInfoUser extends BaseEntity {
     /** 编号 */
     private Long id;
     /**
-     * 确认人
+     * 确认人账号
      */
     private String confirmInfoUser;
+    /**
+     * 确认人姓名
+     */
+    private String confirmInfoNickUser;
     /**
      * 人口信息的主键id
      */
@@ -56,4 +60,12 @@ public class ConfirmInfoUser extends BaseEntity {
     public void setIsDel(String isDel) {
         this.isDel = isDel;
     }
+
+    public String getConfirmInfoNickUser() {
+        return confirmInfoNickUser;
+    }
+
+    public void setConfirmInfoNickUser(String confirmInfoNickUser) {
+        this.confirmInfoNickUser = confirmInfoNickUser;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
+import com.boman.common.core.utils.constant.HttpStatus;
 import com.boman.common.core.utils.ip.IpUtils;
 import com.boman.common.core.utils.number.NumberUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -42,6 +43,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Size;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -565,13 +567,16 @@ public class CzrkServiceImpl implements ICzrkService {
                 }
             }
             if (flag) {
-                return AjaxResult.error("当前填写的户籍地址和居住地址均不属于对应辖区");
+                return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED,"当前填写的户籍地址和居住地址均不属于对应辖区");
             }
         }
 
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         String username = sysUser.getUserName();
+        //用户姓名
+        String nickName = sysUser.getNickName();
         if (isNotEmpty(czrk.getVillageTowns())) {
+            czrk.setRlrNike(nickName);
             czrk.setRlr(username);
             czrk.setIsRl("是");
             czrk.setRlTime(new Date(System.currentTimeMillis()));
@@ -611,7 +616,7 @@ public class CzrkServiceImpl implements ICzrkService {
         if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
         //一开始就判断是否是户籍和所有居住地址都不在对应辖区
         String region = czrk.getRegion();
-        if (StringUtils.isNotBlank(region) && !"潜山市".equals(region)) {
+        if (StringUtils.isBlank(region) || !"潜山市".equals(region)) {
             boolean flag = true;
             for (CzrkJzdz czrkJzdz : czrkJzdzList) {
                 String regionJzdz = czrkJzdz.getRegion();
@@ -620,15 +625,18 @@ public class CzrkServiceImpl implements ICzrkService {
                 }
             }
             if (flag) {
-                return AjaxResult.error("当前填写的户籍地址和居住地址均不属于对应辖区");
+                return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED,"当前填写的户籍地址和居住地址均不属于对应辖区");
             }
         }
         LoginUser loginUser = tokenService.getLoginUser();
-        // 获取当前的用户名称
+        // 获取当前的用户账号
         String username = loginUser.getUsername();
+        //用户姓名
+        String nickName = loginUser.getSysUser().getNickName();
         String isRl = czrk.getIsRl();
         if ("否".equals(isRl)) {
             if (isNotEmpty(czrk.getVillageTowns())) {
+                czrk.setRlrNike(nickName);
                 czrk.setRlr(username);
                 czrk.setIsRl("是");
                 czrk.setRlTime(new Date(System.currentTimeMillis()));
@@ -644,6 +652,7 @@ public class CzrkServiceImpl implements ICzrkService {
         if (StringUtils.isNotBlank(isConfirm) && "Y".equals(isConfirm)) {
             czrk.setConfirmInfoUser(username);
             czrk.setConfirmInfoUserTime(DateUtils.getNowDate());
+            czrk.setConfirmInfoNikeUser(nickName);
         }
         int count = czrkMapper.updateCzrk(czrk);
         if (count <= 0) return AjaxResult.error();
@@ -651,6 +660,7 @@ public class CzrkServiceImpl implements ICzrkService {
         ConfirmInfoUser confirmInfoUser = new ConfirmInfoUser();
         confirmInfoUser.setCzrkId(czrk.getId());
         confirmInfoUser.setConfirmInfoUser(username);
+        confirmInfoUser.setConfirmInfoNickUser(nickName);
         czrkMapper.insertConfirmInfoUser(confirmInfoUser);
 
 
@@ -739,6 +749,7 @@ public class CzrkServiceImpl implements ICzrkService {
             }
 
             ThreadPoolService.execute(() -> {
+                System.out.println("我进来了");
                 //Long areaId = 340882000000L;
                 //todo 固定写了潜山市
                 List<SysDept> allDepts = remoteDeptService.listChildrenDepts(deptId);
@@ -775,7 +786,30 @@ public class CzrkServiceImpl implements ICzrkService {
                 result.put("zu", isEmpty(zuDept) ? 0 : zuDept.size()); // 组
 
                 List<Long> deptIdList = new ArrayList<>();
-                deptIdList.add(deptId);
+
+                // ======== 新增部门判断开始========
+                //todo  新增的部分
+                //判断是否是管理员
+                List<SysRole> roles = AuthUtils.getLoginUser().getSysUser().getRoles();
+                boolean flag = true;
+                if (isNotEmpty(roles)) {
+                    for (SysRole role : roles) {
+                        String roleKey = role.getRoleKey();
+                        if ("admin".equals(roleKey) || "city".equals(roleKey) || "yanshi".equals(roleKey)) {
+                            flag = false;
+                        }
+                    }
+                }
+                if (deptId != null && flag){
+                    //设置查询列表权限
+                    List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(deptId);
+                    if (isNotEmpty(sysDepts)) {
+                        deptIdList = map(sysDepts, SysDept::getId);
+                    }
+                }
+
+                // ======== 新增部门判断结束========
+
                 int zrs = czrkMapper.countAll(); // 总人数
                 int hjzrs = czrkMapper.countHj1(deptIdList); // 该镇户籍人口总数
                 result.put("hjzrs", hjzrs);
@@ -794,6 +828,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 result.put("czbfb", NumberUtils.percent(czzrs, zrs));
                 setIntoRedis(packRedisKey("single:" + deptId), result);
                 QIANSHANSHI_SINGEL = result;
+                System.out.println("我出去了");
             });
 
             return QIANSHANSHI_SINGEL;
@@ -808,6 +843,7 @@ public class CzrkServiceImpl implements ICzrkService {
             setIntoRedis(packRedisKey("town:" + deptId), result);
         }
 
+        System.out.println("我最后出去了");
         return result;
     }
 
@@ -1326,6 +1362,7 @@ public class CzrkServiceImpl implements ICzrkService {
         LoginUser loginUser = tokenService.getLoginUser();
         // 获取当前的用户名称
         String username = loginUser.getUsername();
+         String nickName = loginUser.getSysUser().getNickName();
         if (StringUtils.isBlank(username)) {
             return AjaxResult.error("未查询到确认人员名称");
         }
@@ -1333,6 +1370,7 @@ public class CzrkServiceImpl implements ICzrkService {
             ConfirmInfoUser confirmInfoUser = new ConfirmInfoUser();
             confirmInfoUser.setConfirmInfoUser(username);
             confirmInfoUser.setCzrkId(id);
+            confirmInfoUser.setConfirmInfoNickUser(nickName);
             czrkMapper.insertConfirmInfoUser(confirmInfoUser);
             Czrk czrk = new Czrk();
             czrk.setId(id);

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

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code"    column="code"    />
         <result property="houseType"    column="house_type"    />
         <result property="rlr"    column="rlr"    />
+        <result property="rlrNike"    column="rlr_nike"    />
         <result property="rlTime"    column="rl_time"    />
         <result property="keyIndustries"    column="key_industries"    />
         <result property="yhzgx"    column="yhzgx"    />
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="isConfirm"    column="is_confirm"    />
         <result property="confirmInfoUser"    column="confirm_info_user"    />
+        <result property="confirmInfoNikeUser"    column="confirm_info_nike_user"    />
         <result property="confirmInfoUserTime"    column="confirm_info_user_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -89,15 +91,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="czrkId"    column="czrk_id"    />
     </resultMap>
     <sql id="selectCzrkVo">
-        select id, user_name, gender, age, birthday,dept_id, id_card, phone_num, code, house_type, rlr, rl_time, yhzgx
+        select id, user_name, gender, age, birthday,dept_id, id_card, phone_num, code, house_type, rlr,rlr_nike, rl_time, yhzgx
              , work_unit, province_id, province, city_id, city, region_id, region, village_towns_id, village_towns
-             , village_id, village, villager_group_id, villager_group, now_in, remark,grid_id, status,is_confirm,confirm_info_user,confirm_info_user_time, create_by, create_time
+             , village_id, village, villager_group_id, villager_group, now_in, remark,grid_id, status,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time, create_by, create_time
              , update_by, update_time, is_del, delete_reason, dept_id, is_rl, key_industries from czrk
     </sql>
 
     <select id="listByRlry"  resultMap="CzrkResult">
         select id, user_name, phone_num,dept_id, id_card, gender, province, city, region, village_towns, village, villager_group, grid_id
-        , house_type, update_by, code, rlr, update_time, delete_reason, now_in,is_confirm,confirm_info_user,confirm_info_user_time
+        , house_type, update_by, code, rlr,rlr_nike, update_time, delete_reason, now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time
         from czrk
         <where>
             <!-- 已认领 -->
@@ -444,7 +446,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="countByCzJs1" resultType="int">
         SELECT count(DISTINCT(jzdz.id_card)) from czrk_jzdz jzdz
-        where jzdz.status = 'N' and jzdz.update_time &gt;= #{startTime} and jzdz.update_time &lt;= #{endTime}
+        where jzdz.status = 'N' and jzdz.create_time &gt;= #{startTime} and jzdz.create_time &lt;= #{endTime}
         <if test="deptIdList != null  and deptIdList.size() > 0">
             and jzdz.dept_id in
             <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
@@ -710,28 +712,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="keyIndustries != null">key_industries = #{keyIndustries},</if>
             <if test="houseType != null">house_type = #{houseType},</if>
             <if test="rlr != null">rlr = #{rlr},</if>
+            <if test="rlrNike != null">rlr_nike = #{rlrNike},</if>
             <if test="isRl != null">is_rl = #{isRl},</if>
             <if test="rlTime != null">rl_time = #{rlTime},</if>
             <if test="yhzgx != null">yhzgx = #{yhzgx},</if>
             <if test="workUnit != null">work_unit = #{workUnit},</if>
-            <if test="provinceId != null">province_id = #{provinceId},</if>
-            <if test="province != null">province = #{province},</if>
-            <if test="cityId != null">city_id = #{cityId},</if>
-            <if test="city != null">city = #{city},</if>
-            <if test="regionId != null">region_id = #{regionId},</if>
-            <if test="region != null">region = #{region},</if>
-            <if test="villageTownsId != null">village_towns_id = #{villageTownsId},</if>
-            <if test="villageTowns != null">village_towns = #{villageTowns},</if>
-            <if test="villageId != null">village_id = #{villageId},</if>
-            <if test="village != null">village = #{village},</if>
-            <if test="villagerGroupId != null">villager_group_id = #{villagerGroupId},</if>
-            <if test="villagerGroup != null">villager_group = #{villagerGroup},</if>
+            <if test="provinceId != ''">province_id = #{provinceId},</if>
+            <if test="province != ''">province = #{province},</if>
+            <if test="cityId != ''">city_id = #{cityId},</if>
+            <if test="city != ''">city = #{city},</if>
+            <if test="regionId != ''">region_id = #{regionId},</if>
+            <if test="region != ''">region = #{region},</if>
+            <if test="villageTownsId != ''">village_towns_id = #{villageTownsId},</if>
+            <if test="villageTowns != ''">village_towns = #{villageTowns},</if>
+            <if test="villageId != ''">village_id = #{villageId},</if>
+            <if test="village != ''">village = #{village},</if>
+            <if test="villagerGroupId != ''">villager_group_id = #{villagerGroupId},</if>
+            <if test="villagerGroup != ''">villager_group = #{villagerGroup},</if>
             <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="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 = #{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>
@@ -969,11 +973,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into confim_info_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="confirmInfoUser != null">confirm_info_user,</if>
+            <if test="confirmInfoNikeUser != null">confirm_info_nike_user,</if>
             <if test="czrkId != null">czrk_id,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="confirmInfoUser != null">#{confirmInfoUser},</if>
+            <if test="confirmInfoNikeUser != null">#{confirmInfoNikeUser},</if>
             <if test="czrkId != null">#{czrkId},</if>
             sysdate()
         </trim>
@@ -982,7 +988,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectCzrkList"  resultMap="CzrkResult">
-        select c.id,z.id as czrk_jzdz_id,c.user_name,c.id_card,z.province_id, z.province, z.city_id, z.city, z.region_id, z.region, z.town_id as village_towns_id, z.town as village_towns, z.village_id, z.village, z.now_in,c.phone_num,c.house_type,c.rlr,c.confirm_info_user,c.confirm_info_user_time
+        select c.id,z.id as czrk_jzdz_id,c.user_name,c.id_card,z.province_id, z.province, z.city_id, z.city, z.region_id, z.region, z.town_id as village_towns_id, z.town as village_towns, z.village_id, z.village, z.now_in,c.phone_num,c.house_type,c.rlr,c.rlr_nike,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time
         from czrk_jzdz z left join czrk c on c.id = z.czrk_id
         <where>
             <!-- 已认领 -->