Explorar el Código

只导出到潜山市数据

LIVE_YE hace 3 años
padre
commit
1923c9e20c

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

@@ -248,7 +248,7 @@ public class CzrkController extends BaseController {
      */
     @Log(title = "人员信息", businessType = BusinessType.EXPORT)
     @PreAuthorize(hasPermi = "system:czrk:exportQianShan")
-    @PostMapping("/exportQianShan")
+    @PostMapping("/exportQianShanHj")
     public void exportQianShan(HttpServletResponse response) throws IOException
     {
         List<Czrk> czrkList = czrkService.exportQianShan();

+ 17 - 0
boman-web-core/src/main/java/com/boman/web/core/controller/CzrkJzdzController.java

@@ -4,6 +4,7 @@ import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
+import com.boman.common.security.annotation.PreAuthorize;
 import com.boman.domain.Czrk;
 import com.boman.domain.CzrkJzdz;
 import com.boman.domain.TableDataInfo;
@@ -51,6 +52,22 @@ public class CzrkJzdzController extends BaseController {
         util.exportExcel(response, list, "常住人口对应的居住地址数据");
     }
 
+
+    /**
+     * 人员数据导出(只导出填写到潜山市的数据)
+     *
+     */
+    @Log(title = "人员信息", businessType = BusinessType.EXPORT)
+    @PreAuthorize(hasPermi = "system:czrk:exportQianShan")
+    @PostMapping("/exportQianShanCz")
+    public void exportQianShanCz(HttpServletResponse response) throws IOException
+    {
+        List<Czrk> czrkList = czrkJzdzService.exportQianShanCz();
+        ExcelUtil<Czrk> util = new ExcelUtil<>(Czrk.class);
+        util.exportExcel(response, czrkList, "人员数据");
+    }
+
+
     /**
      * 获取常住人口对应的居住地址详细信息
      */

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

@@ -244,4 +244,6 @@ public interface CzrkMapper {
     void updateCzrkHs(@Param("czrkList") List<Czrk> czrkList);
 
     List<Czrk> getAllCzrkNoTown();
+
+    List<Czrk> getAllCzrkNoTownCz();
 }

+ 13 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -1,6 +1,7 @@
 package com.boman.web.core.service.czrk;
 
 import com.alibaba.fastjson.JSON;
+import com.boman.common.core.exception.BaseException;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.sql.SqlUtil;
@@ -195,6 +196,18 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         return czrkJzdzMapper.getCzrkJzdzByTime(todayStartStr,todayEndStr,regionId,status);
     }
 
+    @Override
+    public List<Czrk> exportQianShanCz() {
+        List<Czrk> czrkList = czrkMapper.getAllCzrkNoTownCz();
+
+        CzrkUtils.packAddr(czrkList);
+        if (czrkList == null || czrkList.size() <= 0) {
+            throw new BaseException("请下载属于本乡镇数据");
+        }
+
+        return czrkList;
+    }
+
     /**
      * 根据czrdId查询对应的居住地址
      *

+ 2 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java

@@ -95,4 +95,6 @@ public interface ICzrkJzdzService {
     List<Czrk> listByCzrkJzdz(Czrk czrk);
 
     List<CzrkJzdz> getCzrkJzdzByTime(String todayStartStr, String todayEndStr, String regionId, String status);
+
+    List<Czrk> exportQianShanCz();
 }

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

@@ -1247,7 +1247,7 @@
     </select>
 
 
-    <select id="getAllCzrkNoTown" resultMap="CzrkResult">
+    <select id="getAllCzrkNoTownCz" resultMap="CzrkResult">
         select
         ANY_VALUE(c.user_name) as user_name,
         ANY_VALUE(c.is_nucleicAcid) as is_nucleicAcid,
@@ -1287,6 +1287,47 @@
     </select>
 
 
+    <select id="getAllCzrkNoTown" 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'
+            <!-- 已认领 -->
+            and c.region_id = '340882000000'
+            and (c.village_towns_id = '' or c.village_towns_id = '0')
+        </where>
+        order by c.code ,c.house_type desc,c.id_card;
+    </select>
+
+
+
 
     <select id="listByCzrkJzdz" resultMap="CzrkResult">
         select c.id, c.user_name, c.phone_num,c.dept_id, c.id_card,