统计

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

@@ -73,8 +73,8 @@ public class RyrlController extends BaseController {
      * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/sts")
-    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType) {
-        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName, queryType));
+    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType) {
+        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName, queryType, houseType));
     }
 
 

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

@@ -97,9 +97,9 @@ public class TestController {
     public AjaxResult setCzrk() {
         //587731
         for (int i = 0; i < 59; i++) {
-            int startPage = i*10000;
+            int startPage = i * 10000;
             int endPage = 10000;
-            List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage,endPage);
+            List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage, endPage);
             if (vaccineInfoOperations.size() > 0) {
                 for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
                     if (vaccineInfoOperation != null) {
@@ -288,34 +288,34 @@ public class TestController {
      */
     @PostMapping("/setCzrkTown")
     public AjaxResult setCzrkTown() {
-        for (int i = 0; i < 59; i++) {
-            int startPage = i*10000;
+        for (int i = 0; i < 46; i++) {
+            int startPage = i * 10000;
             int endPage = 10000;
             List<Czrk> czrks = czrkMapper.selectCzrkListByPage(startPage, endPage);
-            if (czrks.size() > 0){
+            if (czrks.size() > 0) {
                 for (Czrk czrk : czrks) {
-                    if (czrk != null){
+                    if (czrk != null) {
                         String nowIn = czrk.getNowIn();
                         Long deptId = czrk.getDeptId();
                         //有居住地址
-                        if (StringUtils.isNotBlank(nowIn)){
+                        if (StringUtils.isNotBlank(nowIn)) {
                             //提取出村的名称
                             String village = addressResolution(nowIn);
-                            if (StringUtils.isNotBlank(village)){
+                            if (StringUtils.isNotBlank(village)) {
                                 //去china_area表中查询对应数据
                                 List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(village);
-                                if (sysRegions.size() == 1){
+                                if (sysRegions.size() == 1) {
                                     SysRegion sysRegion = sysRegions.get(0);
-                                    if (sysRegion != null){
+                                    if (sysRegion != null) {
                                         czrk.setVillage(sysRegion.getName());
                                         czrk.setVillageId(sysRegion.getAreaId());
                                     }
-                                }else if (sysRegions.size() > 1){
+                                } else if (sysRegions.size() > 1) {
                                     for (SysRegion sysRegion : sysRegions) {
-                                        if (sysRegion != null){
+                                        if (sysRegion != null) {
                                             Long pid = sysRegion.getPid();
                                             Long villageTownsId = czrk.getVillageTownsId();
-                                            if (villageTownsId != null && villageTownsId.equals(pid)){
+                                            if (villageTownsId != null && villageTownsId.equals(pid)) {
                                                 //说明是这个镇下面的村
                                                 czrk.setVillage(sysRegion.getName());
                                                 czrk.setVillageId(sysRegion.getAreaId());
@@ -324,38 +324,38 @@ public class TestController {
                                     }
                                 }
                             }
-                        }else {
+                        } else {
                             //没有居住地址看看有没有deptId
-                            if (deptId != null){
+                            if (deptId != null) {
                                 //去sys_dept表中找到对应的数据
                                 SysDept sysDept = czrkMapper.selectDeptNameById(deptId);
-                                if (sysDept != null){
+                                if (sysDept != null) {
                                     String ancestors = sysDept.getAncestors();
                                     String[] split = ancestors.split(",");
-                                    if (split.length == 3){
+                                    if (split.length == 3) {
                                         //说明是组,则找上级村id
                                         Long parentId = sysDept.getParentId();
-                                        if (parentId != null){
+                                        if (parentId != null) {
                                             //获取到村名称
                                             SysDept sysDeptParent = czrkMapper.selectDeptNameById(parentId);
-                                            if (sysDeptParent != null){
+                                            if (sysDeptParent != null) {
                                                 //村名称
                                                 String deptName = sysDeptParent.getDeptName();
-                                                if (StringUtils.isNotBlank(deptName)){
+                                                if (StringUtils.isNotBlank(deptName)) {
                                                     //去china_area表中查询对应数据
                                                     List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
-                                                    if (sysRegions.size() == 1){
+                                                    if (sysRegions.size() == 1) {
                                                         SysRegion sysRegion = sysRegions.get(0);
-                                                        if (sysRegion != null){
+                                                        if (sysRegion != null) {
                                                             czrk.setVillage(sysRegion.getName());
                                                             czrk.setVillageId(sysRegion.getAreaId());
                                                         }
-                                                    }else if (sysRegions.size() > 1){
+                                                    } else if (sysRegions.size() > 1) {
                                                         for (SysRegion sysRegion : sysRegions) {
-                                                            if (sysRegion != null){
+                                                            if (sysRegion != null) {
                                                                 Long pid = sysRegion.getPid();
                                                                 Long villageTownsId = czrk.getVillageTownsId();
-                                                                if (villageTownsId != null && villageTownsId.equals(pid)){
+                                                                if (villageTownsId != null && villageTownsId.equals(pid)) {
                                                                     //说明是这个镇下面的村
                                                                     czrk.setVillage(sysRegion.getName());
                                                                     czrk.setVillageId(sysRegion.getAreaId());
@@ -367,33 +367,33 @@ public class TestController {
                                             }
                                         }
                                     }
-                                    if (split.length == 2){
+                                    if (split.length == 2) {
                                         //说明是村
-                                         String deptName = sysDept.getDeptName();
-                                            //村名称
-                                            if (StringUtils.isNotBlank(deptName)){
-                                                //去china_area表中查询对应数据
-                                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
-                                                if (sysRegions.size() == 1){
-                                                    SysRegion sysRegion = sysRegions.get(0);
-                                                    if (sysRegion != null){
-                                                        czrk.setVillage(sysRegion.getName());
-                                                        czrk.setVillageId(sysRegion.getAreaId());
-                                                    }
-                                                }else if (sysRegions.size() > 1){
-                                                    for (SysRegion sysRegion : sysRegions) {
-                                                        if (sysRegion != null){
-                                                            Long pid = sysRegion.getPid();
-                                                            Long villageTownsId = czrk.getVillageTownsId();
-                                                            if (villageTownsId != null && villageTownsId.equals(pid)){
-                                                                //说明是这个镇下面的村
-                                                                czrk.setVillage(sysRegion.getName());
-                                                                czrk.setVillageId(sysRegion.getAreaId());
-                                                            }
+                                        String deptName = sysDept.getDeptName();
+                                        //村名称
+                                        if (StringUtils.isNotBlank(deptName)) {
+                                            //去china_area表中查询对应数据
+                                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
+                                            if (sysRegions.size() == 1) {
+                                                SysRegion sysRegion = sysRegions.get(0);
+                                                if (sysRegion != null) {
+                                                    czrk.setVillage(sysRegion.getName());
+                                                    czrk.setVillageId(sysRegion.getAreaId());
+                                                }
+                                            } else if (sysRegions.size() > 1) {
+                                                for (SysRegion sysRegion : sysRegions) {
+                                                    if (sysRegion != null) {
+                                                        Long pid = sysRegion.getPid();
+                                                        Long villageTownsId = czrk.getVillageTownsId();
+                                                        if (villageTownsId != null && villageTownsId.equals(pid)) {
+                                                            //说明是这个镇下面的村
+                                                            czrk.setVillage(sysRegion.getName());
+                                                            czrk.setVillageId(sysRegion.getAreaId());
                                                         }
                                                     }
                                                 }
                                             }
+                                        }
 
 
                                     }
@@ -405,23 +405,28 @@ public class TestController {
                         String village = czrk.getVillage();
                         Long villageId = czrk.getVillageId();
                         String idCard = czrk.getIdCard();
-                        if (StringUtils.isNotBlank(village)){
+                        if (StringUtils.isNotBlank(village)) {
                             Czrk czrkNew = new Czrk();
                             czrkNew.setId(czrk.getId());
                             czrkNew.setVillageId(villageId);
                             czrkNew.setVillage(village);
                             czrkMapper.updateCzrk(czrkNew);
-                            System.out.println("更新编号"+czrk.getId()+village);
+                            System.out.println("更新编号" + czrk.getId() + village);
                         }
-                        if (StringUtils.isNotBlank(village) && StringUtils.isNotBlank(idCard)){
+                        CzrkJzdz czrkJzdz = new CzrkJzdz();
+
+                        if (StringUtils.isNotBlank(village) && StringUtils.isNotBlank(idCard)) {
                             //更新czrk_jzdz
-                            CzrkJzdz czrkJzdz = new CzrkJzdz();
                             czrkJzdz.setVillage(village);
                             czrkJzdz.setVillageId(villageId);
+                        } else {
+                            System.out.println(czrk.getId() + "村名称或者身份证号码不存在,没有更新czrk_jzdz");
+                        }
+                        if (StringUtils.isNotBlank(idCard)) {
+                            czrkJzdz.setTownId(czrk.getVillageTownsId());
+                            czrkJzdz.setTown(czrk.getVillageTowns());
                             czrkJzdz.setIdCard(idCard);
                             czrkJzdzMapper.updateByIdCard(czrkJzdz);
-                        }else {
-                            System.out.println(czrk.getId()+"村名称或者身份证号码不存在,没有更新czrk_jzdz");
                         }
                     }
                 }
@@ -433,26 +438,27 @@ public class TestController {
 
     /**
      * 解析地址
-     * @author lin
+     *
      * @param address
      * @return
+     * @author lin
      */
-    public static String addressResolution(String address){
-        String regex="(?<town>[^区]+区|.+镇|.+乡)?(?<village>.[^村]+村|.+居委会|.+乡)";
-        Matcher m= Pattern.compile(regex).matcher(address);
-        String province=null,city=null,county=null,town=null,village=null;
-        List<Map<String,String>> table=new ArrayList<Map<String,String>>();
-        Map<String,String> row=null;
+    public static String addressResolution(String address) {
+        String regex = "(?<town>[^区]+区|.+镇|.+乡)?(?<village>.[^村]+村|.+居委会|.+乡)";
+        Matcher m = Pattern.compile(regex).matcher(address);
+        String province = null, city = null, county = null, town = null, village = null;
+        List<Map<String, String>> table = new ArrayList<Map<String, String>>();
+        Map<String, String> row = null;
         String result = null;
-        while(m.find()){
+        while (m.find()) {
 /*            row=new LinkedHashMap<String,String>();
             town=m.group("town");
             row.put("town", town==null?"":town.trim());
             village=m.group("village");
             row.put("village", village==null?"":village.trim());
             table.add(row);*/
-            village=m.group("village");
-             result = village == null ? "" : village.trim();
+            village = m.group("village");
+            result = village == null ? "" : village.trim();
         }
         return result;
     }

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

@@ -81,8 +81,8 @@ public interface CzrkMapper {
     List<Czrk> listByCode(String code);
 
 
-    int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
-    int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
+    int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType);
+    int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType);
 
     List<Czrk> listIsRl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
 
@@ -95,7 +95,7 @@ public interface CzrkMapper {
      * @return
      */
    Czrk findHjInfo(Czrk czrk);
-    List<Czrk> stsByAppletCz(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
+    List<Czrk> stsByAppletCz(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType);
 
     List<Czrk> listByCzXz(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") int type, @Param("areaId") Long areaId);
     List<Czrk> listByCzJs(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") int type, @Param("areaId") Long areaId);

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

@@ -478,7 +478,7 @@ public class CzrkServiceImpl implements ICzrkService {
     }
 
     @Override
-    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType) {
+    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType) {
         Long areaId = null;
         int type = 0, yrl = 0, wrl = 0;
         if (ObjectUtils.isNotEmpty(provinceId)) {
@@ -500,11 +500,11 @@ public class CzrkServiceImpl implements ICzrkService {
 
         if (Czrk.HJ.equals(queryType)) {
             // 户籍
-            yrl = czrkMapper.stsByYrl(type, areaId, userName);
-            wrl = czrkMapper.stsByWrl(type, areaId, userName);
+            yrl = czrkMapper.stsByYrl(type, areaId, userName, houseType);
+            wrl = czrkMapper.stsByWrl(type, areaId, userName, houseType);
         } else {
             // 常住
-            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName);
+            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName, houseType);
             for (Czrk czrk : rls) {
                 if ("是".equals(czrk.getIsRl())) {
                     yrl++;

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

@@ -76,7 +76,7 @@ public interface ICzrkService {
     AjaxResult addRlry(Czrk czrk);
     AjaxResult editRlry(Czrk czrk);
 
-    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType);
+    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType);
     JSONObject stsByCzrk();
     JSONObject stsByCzrkHomePage();
 

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

@@ -511,6 +511,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userName != null  and userName != ''">
             and (vi.user_name like concat('%', #{userName}, '%') or vi.id_card like concat('%', #{userName}, '%'))
         </if>
+        <if test="houseType != null  and houseType != ''">
+            and vi.house_type = #{houseType}
+        </if>
         <choose>
             <when test="type == 1">and vi.province_id = #{areaId}</when>
             <when test="type == 2">and vi.city_id = #{areaId}</when>
@@ -551,6 +554,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userName != null  and userName != ''">
             and (vi.user_name like concat('%', #{userName}, '%') or vi.id_card like concat('%', #{userName}, '%'))
         </if>
+        <if test="houseType != null  and houseType != ''">
+            and vi.house_type = #{houseType}
+        </if>
         <choose>
             <when test="type == 1">and vi.province_id = #{areaId}</when>
             <when test="type == 2">and vi.city_id = #{areaId}</when>
@@ -736,7 +742,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userName != null  and userName != ''">
                 and (czrk.user_name like concat('%', #{userName}, '%') or czrk.id_card like concat('%', #{userName}, '%'))
             </if>
-
+            <if test="houseType != null  and houseType != ''">
+                and czrk.house_type = #{houseType}
+            </if>
             <choose>
                 <when test="type == 1">and jzdz.province_id = #{areaId}</when>
                 <when test="type == 2">and jzdz.city_id = #{areaId}</when>