导出没有填写村级的数据

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

@@ -263,6 +263,19 @@ public class Czrk extends BaseEntity{
     @Excel(name = "核酸时间")
     private String nucleicAcidTime;
 
+
+    /**
+     * 来宜号码
+     */
+    private String toAppropriatePhone;
+    /**
+     * 来宜时间
+     */
+    private String toAppropriateTime;
+
+
+
+
     /**
      * 是否删除 默认为 "N"
      */

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -256,6 +256,20 @@ public class CzrkController extends BaseController {
         util.exportExcel(response, czrkList, "人员数据");
     }
 
+    /**
+     * 人员数据导出(只导出填写镇没有填写村的数据)
+     *
+     */
+    @Log(title = "人员信息", businessType = BusinessType.EXPORT)
+    @PreAuthorize(hasPermi = "system:czrk:exportTownHj")
+    @PostMapping("/exportTownHj")
+    public void exportTown(HttpServletResponse response, @RequestBody Czrk czrk) throws IOException
+    {
+        List<Czrk> czrkList = czrkService.getAllCzrkHjVillage(czrk);
+        ExcelUtil<Czrk> util = new ExcelUtil<>(Czrk.class);
+        util.exportExcel(response, czrkList, "人员数据");
+    }
+
 
     @Log(title = "人员信息", businessType = BusinessType.IMPORT)
     @PreAuthorize(hasPermi = "system:czrk:importData")

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -246,4 +246,6 @@ public interface CzrkMapper {
     List<Czrk> getAllCzrkNoTown();
 
     List<Czrk> getAllCzrkNoTownCz();
+
+    List<Czrk> getAllCzrkHjVillage(Czrk czrk);
 }

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

@@ -1529,7 +1529,6 @@ public class CzrkServiceImpl implements ICzrkService {
 
     @Override
     public List<Czrk> exportQianShan() {
-        SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         List<Czrk> czrkList = czrkMapper.getAllCzrkNoTown();
 
         CzrkUtils.packAddr(czrkList);
@@ -1540,6 +1539,20 @@ public class CzrkServiceImpl implements ICzrkService {
         return czrkList;
     }
 
+    @Override
+    public List<Czrk> getAllCzrkHjVillage(Czrk czrk) {
+
+        SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
+        setQueryRole(czrk, sysUser, Czrk.HJ);
+
+        if(StringUtils.isEmpty(czrk.getVillageTownsId())){
+            throw new BaseException("请选择要导出的镇户籍地址");
+        }
+        List<Czrk> czrkList = czrkMapper.getAllCzrkHjVillage(czrk);
+
+        return null;
+    }
+
 
     private void townStsvaccine(JSONObject result, SysDept sysDept, List<Czrk> czrkList) {
         String deptName = sysDept.getDeptName();

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

@@ -157,4 +157,6 @@ public interface ICzrkService {
     AjaxResult vaccineStatistics(String code,String lenth);
 
     List<Czrk> exportQianShan();
+
+    List<Czrk> getAllCzrkHjVillage(Czrk czrk);
 }

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

@@ -55,6 +55,9 @@
         <result property="isNucleicAcid" column="is_nucleicAcid"/>
         <result property="nucleicAcidTime" column="nucleicAcid_time"/>
 
+        <result property="toAppropriatePhone" column="to_appropriate_phone"/>
+        <result property="toAppropriateTime" column="to_appropriate_time"/>
+
 
         <result property="provinceXjd" column="provinceXjd"/>
         <result property="cityXjd" column="cityXjd"/>
@@ -114,7 +117,7 @@
     <select id="listByCzrk" resultMap="CzrkResult">
         select id, user_name, phone_num, id_card, gender, province, city, region, village_towns, village,
         villager_group, grid_id, house_type, code,is_rl,
-        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time,is_nucleicAcid,nucleicAcid_time
+        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time,is_nucleicAcid,nucleicAcid_time,to_appropriate_phone
         from czrk
         <where>
             is_del = 'N'
@@ -1247,6 +1250,51 @@
     </select>
 
 
+
+
+    <select id="getAllCzrkHjVillage" resultMap="CzrkResult">
+        select
+        ANY_VALUE(c.user_name) as user_name,
+        ANY_VALUE(c.is_nucleicAcid) as is_nucleicAcid,
+        ANY_VALUE(c.nucleicAcid_time) as nucleicAcid_time,
+        ANY_VALUE(c.age) as age,
+        <!--ANY_VALUE(STUFF (c.id_card, 7, 8, '********')) AS id_card,-->
+        ANY_VALUE(c.id_card) AS id_card,
+        ANY_VALUE(c.province) as province,
+        ANY_VALUE(c.city) as city,
+        ANY_VALUE(c.region) as region,
+        ANY_VALUE(c.village_towns) as village_towns,
+        ANY_VALUE(c.village) as village,
+        ANY_VALUE(c.villager_group) as villager_group,
+        ANY_VALUE(REPLACE (c.now_in, '/', '')) AS now_in,
+        ANY_VALUE(c.key_industries) as key_industries,
+        ANY_VALUE(c.gender) as gender,
+        ANY_VALUE(c.phone_num) as phone_num,
+        ANY_VALUE(c.CODE) as CODE,
+        ANY_VALUE(c.house_type) as house_type,
+        ANY_VALUE(c.yhzgx) as yhzgx,
+        ANY_VALUE(cj.province) AS provinceXjd,
+        ANY_VALUE(cj.city) AS cityXjd,
+        ANY_VALUE(cj.region) AS regionXjd,
+        ANY_VALUE(cj.town) AS villageTownsXjd,
+        ANY_VALUE(cj.village) AS villageXjd,
+        ANY_VALUE(REPLACE (cj.now_in, '/', '')) AS nowXjd
+        from czrk c
+        left join czrk_jzdz cj on c.id =cj.czrk_id
+        <where>
+            c.is_del = 'N'
+            and c.status = '1'
+            <!-- 已认领 -->
+            <if test="provinceId != null  and provinceId != ''">and c.province_id = #{provinceId}</if>
+            <if test="cityId != null  and cityId != ''">and c.city_id = #{cityId}</if>
+            <if test="regionId != null  and regionId != ''">and c.region_id = #{regionId}</if>
+            <if test="villageTownsId != null  and villageTownsId != ''">and c.village_towns_id = #{villageTownsId}</if>
+            and (c.village_id = '' or c.village_id = '0')
+        </where>
+        order by c.code ,c.house_type desc,c.id_card;
+    </select>
+
+
     <select id="getAllCzrkNoTownCz" resultMap="CzrkResult">
         select
         ANY_VALUE(c.user_name) as user_name,
@@ -1334,7 +1382,7 @@
         z.province as provinceXjd, z.city as cityXjd,z.region as regionXjd, z.town as villageTownsXjd, z.village as
         villageXjd,z.now_in,
         c.gender, c.grid_id, c.house_type, c.update_by, c.code, c.rlr,c.rlr_nike,
-        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.is_nucleicAcid,c.nucleicAcid_time
+        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.is_nucleicAcid,c.nucleicAcid_time,c.to_appropriate_phone
         from czrk c left join czrk_jzdz z on c.id =z.czrk_id
         <where>
             c.is_del = 'N'