常住人口导入

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

@@ -9,8 +9,10 @@ import com.boman.common.core.web.page.PageDomain;
 import com.boman.common.core.web.page.TableSupport;
 import com.boman.domain.Czrk;
 import com.boman.domain.CzrkJzdz;
+import com.boman.domain.SysDept;
 import com.boman.domain.SysUser;
 import com.boman.domain.dto.AjaxResult;
+import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.mapper.CzrkJzdzMapper;
 import com.boman.web.core.mapper.CzrkMapper;
 import com.boman.web.core.utils.AuthUtils;
@@ -42,6 +44,8 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
 
     @Resource
     private CzrkMapper czrkMapper;
+    @Resource
+    private RemoteDeptService remoteDeptService;
 
 
 
@@ -222,6 +226,9 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         if (czrkJzdzList == null || czrkJzdzList.size() < 1){
             return AjaxResult.error("当前表格数据为空");
         }
+
+        //获取区划信息
+        List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
         StringBuilder sb = new StringBuilder();
         for (CzrkJzdz czrkJzdz : czrkJzdzList) {
             czrkJzdz.setProvinceId("12");
@@ -233,20 +240,33 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
             String townId = czrkJzdz.getTownId();
             if (StringUtils.isNotEmpty(townId)){
                 //根据行政规划Id去查询行政规划的名称
-                String tow = czrkJzdzMapper.selectChinaArea(townId);
-                czrkJzdz.setTown(tow);
+                for (SysDept allDept : allDepts) {
+                    if(allDept.getAreaId().equals(townId)){
+                        czrkJzdz.setTown(allDept.getAreaName());
+                        break;
+                    }
+                }
             }
             String villageId = czrkJzdz.getVillageId();
             if (StringUtils.isNotEmpty(villageId)){
                 //根据行政规划Id去查询行政规划的名称
-                String village = czrkJzdzMapper.selectChinaArea(villageId);
-                czrkJzdz.setVillage(village);
+                for (SysDept allDept : allDepts) {
+                    if(allDept.getAreaId().equals(villageId)){
+                        czrkJzdz.setVillage(allDept.getAreaName());
+                        break;
+                    }
+                }
             }
             String villagerGroupId = czrkJzdz.getVillagerGroupId();
             if (StringUtils.isNotEmpty(villagerGroupId)){
                 //根据行政规划Id去查询行政规划的名称
-                String villagerGroup = czrkJzdzMapper.selectChinaArea(villagerGroupId);
-                czrkJzdz.setVillagerGroup(villagerGroup);
+
+                for (SysDept allDept : allDepts) {
+                    if(allDept.getAreaId().equals(villagerGroupId)){
+                        czrkJzdz.setVillagerGroup(allDept.getAreaName());
+                        break;
+                    }
+                }
             }
             czrkJzdz.setStatus("Y");
             czrkJzdz.setIdCard((czrkJzdz.getIdCard()).replaceAll("\\s*|\r|\n|\t",""));

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

@@ -231,7 +231,7 @@
             r.is_del = 'N'
             and r.status = '1'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
-            <if test="cjsj != null  and cjsj != ''">
+            <if test="cjsj != null  and cjsj != '' and cjsj != 'null'">
                 and d.cjsj = #{cjsj}
             </if>
         </where>