核酸统计定时任务

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

@@ -75,5 +75,10 @@ public class TaskController {
         taskService.pphshjNo();
     }
 
+    @GetMapping("/nucleicAcidStatistics")
+    private void nucleicAcidStatistics() {
+        taskService.nucleicAcidStatistics();
+    }
+
 
 }

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -13,10 +13,8 @@ import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.datasource.annotation.Master;
 import com.boman.common.redis.service.RedisService;
 import com.boman.common.security.service.TokenService;
-import com.boman.domain.Czrk;
-import com.boman.domain.CzrkJzdz;
-import com.boman.domain.SysDept;
-import com.boman.domain.SysUser;
+import com.boman.domain.*;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.system.api.RemoteUserService;
@@ -33,6 +31,7 @@ import com.boman.web.core.service.common.ICommonService;
 import com.boman.web.core.service.czrk.CzrkServiceImpl;
 import com.boman.web.core.service.czrk.ICzrkJzdzService;
 import com.boman.web.core.service.ip.IpTimesService;
+import com.boman.web.core.utils.AuthUtils;
 import com.boman.web.core.utils.HttpClientUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -569,7 +568,7 @@ public class TaskService {
         if (StringUtils.isNotBlank(token)) {
 
             String startTime = redisService.getCacheObject("startTimeNew");
-            if(StringUtils.isEmpty(startTime)){
+            if (StringUtils.isEmpty(startTime)) {
                 startTime = "2022-04-01 00:00:00.0";
             }
             String endTime = DateUtils.formatString(new Date());
@@ -676,23 +675,19 @@ public class TaskService {
         }
     }
 
-    //@Scheduled(cron = "0 0/10 * * * ? ")
-    public void thirdNucleicAcid(){
+    @Scheduled(cron = "0 0/10 * * * ? ")
+    public void thirdNucleicAcid() {
         String startTime = redisService.getCacheObject("startTime");
-        if(StringUtils.isEmpty(startTime)){
+        if (StringUtils.isEmpty(startTime)) {
             startTime = "2022-05-14 00:00:00";
         }
         //开始时间往后推10分钟
         String endTime = DateUtils.plusSeconds(startTime, 10);
 
-        accountingDataService.thirdNucleicAcid(startTime,endTime);
+        accountingDataService.thirdNucleicAcid(startTime, endTime);
 
         redisService.setCacheObject("startTime", endTime);
 
-        if(!startTime.equals("2022-05-18 18:00:00")){
-            this.thirdNucleicAcid();
-        }
-
     }
 
 
@@ -770,11 +765,157 @@ public class TaskService {
 
 
     /***
-     * 核酸统计
+     * 核酸统计(每一个小时跑一次)
      */
-    //@Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 * * * ? ")
     public void nucleicAcidStatistics() {
 
+        System.out.println("batchInsert 核酸统计开始开始========");
+        long start = System.currentTimeMillis();
+        //潜山市
+        JSONObject resultsS = new JSONObject(16);
+        //镇
+        JSONObject resultsZ = new JSONObject(16);
+        //村
+        JSONObject resultsC = new JSONObject(16);
+
+        //SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
+        //SysDept dept = sysUser.getDept();
+
+        List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
+        //查找户籍人口总数
+        List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
+
+        //所有乡镇集合
+        List<SysDept> townsDepts = new ArrayList<>(16);
+
+        for (SysDept allDept : allDepts) {
+            if (isEmpty(allDept.getParentId())) {
+                continue;
+            }
+            if (allDept.getParentId() == (1L)) {
+                townsDepts.add(allDept);
+            }
+        }
+
+        // 以各个镇为单位单独处理 townsDepts
+        ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+        for (SysDept townsDept : townsDepts) {
+            JSONObject townsResult = new JSONObject(16);
+            townStsvaccine(townsResult, townsDept, czrkList);
+            towsDataList.add(townsResult);
+        }
+
+        resultsS.put("townDatas", towsDataList);
+        resultsS.put("type", "1");
+
+        redisService.setCacheObject("1", resultsS);
+
+
+        //获取镇数据
+        for (SysDept townsDept : townsDepts) {
+
+            //所有乡镇集合
+            List<SysDept> cunDepts = new ArrayList<>(16);
+
+            for (SysDept allDept : allDepts) {
+                if (isEmpty(allDept.getParentId())) {
+                    continue;
+                }
+                if (allDept.getParentId() == Long.valueOf(townsDept.getId())) {
+                    cunDepts.add(allDept);
+                }
+            }
+
+            ArrayList<JSONObject> cunDataList = new ArrayList<>(20);
+
+            for (SysDept cunDept : cunDepts) {
+                JSONObject townsResult = new JSONObject(16);
+                townStsvaccineCun(townsResult, cunDept, czrkList);
+                cunDataList.add(townsResult);
+            }
+
+            resultsZ.put("townDatas", cunDataList);
+            resultsZ.put("type", "2");
+
+            redisService.setCacheObject(townsDept.getAreaId(), resultsZ);
+        }
+        long end = System.currentTimeMillis();
+        System.out.println("---------------核酸统计耗时" + (end - start) + "---------------");
+
+    }
+
+    private void townStsvaccine(JSONObject result, SysDept sysDept, List<Czrk> czrkList) {
+        String deptName = sysDept.getDeptName();
+        String areaId = sysDept.getAreaId();
+
+        if (czrkList == null) {
+            czrkList = new ArrayList<>();
+        }
+
+        //该镇户籍人口总数
+        int hjzrs = 0;
+
+        //该镇 接种人员数据
+        int hjymjz = 0;
+
+        //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
+        for (Czrk czrk : czrkList) {
+            if (StringUtils.isNotEmpty(czrk.getVillageTownsIdXjd()) && String.valueOf(czrk.getVillageTownsIdXjd()).equals(areaId)) {
+                if ("1".equals(czrk.getStatus())) {
+                    hjzrs++;
+                }
+
+                if ("Y".equals(czrk.getIsNucleicAcid())) {
+                    hjymjz++;
+                }
+            }
+        }
+        result.put("hjzrs", hjzrs);
+        result.put("hjymjz", hjymjz);
+        result.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
+        result.put("name", deptName);
+    }
+
+    private void townStsvaccineCun(JSONObject result, SysDept sysDept, List<Czrk> czrkList) {
+
+        ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+        JSONObject resultsC = new JSONObject(16);
+
+        String deptName = sysDept.getDeptName();
+        String areaId = sysDept.getAreaId();
+
+        if (czrkList == null) {
+            czrkList = new ArrayList<>();
+        }
+
+        //该村户籍人口总数
+        int hjzrs = 0;
+
+        //该村接种人员数据
+        int hjymjz = 0;
+
+        //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
+        for (Czrk czrk : czrkList) {
+            if (StringUtils.isNotEmpty(czrk.getVillageIdXjd()) && String.valueOf(czrk.getVillageIdXjd()).equals(areaId)) {
+                if ("1".equals(czrk.getStatus())) {
+                    hjzrs++;
+                }
+
+                if ("Y".equals(czrk.getIsNucleicAcid())) {
+                    hjymjz++;
+                }
+            }
+        }
+        result.put("hjzrs", hjzrs);
+        result.put("hjymjz", hjymjz);
+        result.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
+        result.put("name", deptName);
+
+        towsDataList.add(result);
+        resultsC.put("townDatas", towsDataList);
+        resultsC.put("type", "3");
+        redisService.setCacheObject(areaId, resultsC);
     }
 
     public void upStarTime(String starTim) {
@@ -821,4 +962,10 @@ public class TaskService {
         return 0;
     }
 
+
+    /***
+     * 来宜数据匹配
+     */
+
+
 }

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

@@ -1281,250 +1281,212 @@ public class CzrkServiceImpl implements ICzrkService {
             //判断账号权限
             List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
             if (roleKeySets.contains("province") || roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
-                List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
-                //查找户籍人口总数
-                List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
-
-               /* //潜山市户籍人口总数
-                int hjzrs = czrkList.size();
 
-                //潜山市 潜山市接种疫苗人数
-                int hjymjz = 0;
-
-                //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
-                for (Czrk czrk : czrkList) {
-                    if (!"1".equals(czrk.getStatus())) {
-                        hjzrs--;
-                    }
-                    if("Y".equals(czrk.getIsNucleicAcid())){
-                        hjymjz++;
-                    }
+                JSONObject jsonObject = redisService.getCacheObject("1");
+                if (isNotEmpty(jsonObject)) {
 
-                }
-                //潜山市总人数
-                results.put("hjzrs", hjzrs);
-                //潜山市接种疫苗人数
-                results.put("hjymjz", hjymjz);
-                //接种百分比
-                results.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));*/
+                    results = jsonObject;
 
+                }else{
+                    List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
+                    //查找户籍人口总数
+                    List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
 
-                //所有乡镇集合
-                List<SysDept> townsDepts = new ArrayList<>(16);
+                    //所有乡镇集合
+                    List<SysDept> townsDepts = new ArrayList<>(16);
 
-                for (SysDept allDept : allDepts) {
-                    if (isEmpty(allDept.getParentId())) {
-                        continue;
+                    for (SysDept allDept : allDepts) {
+                        if (isEmpty(allDept.getParentId())) {
+                            continue;
+                        }
+                        if (allDept.getParentId() == (1L)) {
+                            townsDepts.add(allDept);
+                        }
                     }
-                    if (allDept.getParentId() == (1L)) {
-                        townsDepts.add(allDept);
+
+                    // 以各个镇为单位单独处理 townsDepts
+                    ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+                    for (SysDept townsDept : townsDepts) {
+                        JSONObject townsResult = new JSONObject(16);
+                        townStsvaccine(townsResult, townsDept, czrkList);
+                        towsDataList.add(townsResult);
                     }
-                }
 
-                // 以各个镇为单位单独处理 townsDepts
-                ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
-                for (SysDept townsDept : townsDepts) {
-                    JSONObject townsResult = new JSONObject(16);
-                    townStsvaccine(townsResult, townsDept, czrkList);
-                    towsDataList.add(townsResult);
+                    results.put("townDatas", towsDataList);
+                    results.put("type", "1");
                 }
 
-                results.put("townDatas", towsDataList);
-                results.put("type", "1");
+
 
 
             } else if (roleKeySets.contains("villageTowns")) {
-                // 镇领导，只能查看本镇下人员
-                //获取本镇下所有乡村
-                List<SysDept> allDepts = remoteDeptService.listChildrenDepts(dept.getId());
-                List<SysDept> cunDepts = new ArrayList<>(16);
-                for (SysDept dep : allDepts) {
-                    if (isEmpty(dep.getParentId())) continue;
-                    if (dept.getId().equals(dep.getParentId())) {
-                        cunDepts.add(dep);
-                    }
-                }
-                //获取本镇所有人员
-                List<Czrk> czrkList = czrkMapper.getAllCzrkVillageTownsId(dept.getAreaId());
 
-                /*//潜山市户籍人口总数
-                int hjzrs = czrkList.size();
+                JSONObject jsonObject = redisService.getCacheObject(dept.getAreaId());
+                if (isNotEmpty(jsonObject)) {
 
-                //潜山市 潜山市接种疫苗人数
-                int hjymjz = 0;
+                    results = jsonObject;
 
-                //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
-                for (Czrk czrk : czrkList) {
-                    if (!"1".equals(czrk.getStatus())) {
-                        hjzrs--;
+                }else{
+
+                    // 镇领导，只能查看本镇下人员
+                    //获取本镇下所有乡村
+                    List<SysDept> allDepts = remoteDeptService.listChildrenDepts(dept.getId());
+                    List<SysDept> cunDepts = new ArrayList<>(16);
+                    for (SysDept dep : allDepts) {
+                        if (isEmpty(dep.getParentId())) continue;
+                        if (dept.getId().equals(dep.getParentId())) {
+                            cunDepts.add(dep);
+                        }
                     }
-                    if("Y".equals(czrk.getIsNucleicAcid())){
-                        hjymjz++;
+                    //获取本镇所有人员
+                    List<Czrk> czrkList = czrkMapper.getAllCzrkVillageTownsId(dept.getAreaId());
+
+
+                    // 以各个镇为单位单独处理 townsDepts
+                    ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+                    for (SysDept townsDept : cunDepts) {
+                        JSONObject townsResult = new JSONObject(16);
+                        townStsvaccineCun(townsResult, townsDept, czrkList);
+                        towsDataList.add(townsResult);
                     }
 
+                    results.put("townDatas", towsDataList);
+                    results.put("type", "2");
                 }
-                //镇总人数
-                results.put("hjzrs", hjzrs);
-                //镇接种疫苗人数
-                results.put("hjymjz", hjymjz);
-                //镇接种百分比
-                results.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));*/
 
-                // 以各个镇为单位单独处理 townsDepts
-                ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
-                for (SysDept townsDept : cunDepts) {
-                    JSONObject townsResult = new JSONObject(16);
-                    townStsvaccineCun(townsResult, townsDept, czrkList);
-                    towsDataList.add(townsResult);
-                }
 
-                results.put("townDatas", towsDataList);
-                results.put("type", "2");
+            } else if (roleKeySets.contains("village")) {
 
+                JSONObject jsonObject = redisService.getCacheObject(dept.getAreaId());
+                if (isNotEmpty(jsonObject)) {
 
-            } else if (roleKeySets.contains("village")) {
+                    results = jsonObject;
 
-                ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
-                JSONObject townsResult = new JSONObject(16);
-                // 村领导
-                //获取本村所有人员
-                List<Czrk> czrkList = czrkMapper.getAllCzrkVillageId(dept.getAreaId());
+                }else{
+                    ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+                    JSONObject townsResult = new JSONObject(16);
+                    // 村领导
+                    //获取本村所有人员
+                    List<Czrk> czrkList = czrkMapper.getAllCzrkVillageId(dept.getAreaId());
 
-                //潜山市户籍人口总数
-                int hjzrs = czrkList.size();
+                    //潜山市户籍人口总数
+                    int hjzrs = czrkList.size();
 
-                //潜山市 潜山市接种疫苗人数
-                int hjymjz = 0;
+                    //潜山市 潜山市接种疫苗人数
+                    int hjymjz = 0;
 
-                //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
-                for (Czrk czrk : czrkList) {
-                    if (!"1".equals(czrk.getStatus())) {
-                        hjzrs--;
-                    }
-                    if("Y".equals(czrk.getIsNucleicAcid())){
-                        hjymjz++;
-                    }
+                    //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
+                    for (Czrk czrk : czrkList) {
+                        if (!"1".equals(czrk.getStatus())) {
+                            hjzrs--;
+                        }
+                        if("Y".equals(czrk.getIsNucleicAcid())){
+                            hjymjz++;
+                        }
 
+                    }
+                    //镇总人数
+                    townsResult.put("hjzrs", hjzrs);
+                    //镇接种疫苗人数
+                    townsResult.put("hjymjz", hjymjz);
+                    //镇接种百分比
+                    townsResult.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
+
+                    townsResult.put("name", dept.getDeptName());
+                    towsDataList.add(townsResult);
+                    results.put("townDatas", towsDataList);
+                    results.put("type", "3");
                 }
-                //镇总人数
-                townsResult.put("hjzrs", hjzrs);
-                //镇接种疫苗人数
-                townsResult.put("hjymjz", hjymjz);
-                //镇接种百分比
-                townsResult.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
-
-                townsResult.put("name", dept.getDeptName());
-                towsDataList.add(townsResult);
-                results.put("townDatas", towsDataList);
-                results.put("type", "3");
-
             }
         }else{
-            if(lenth.equals("1")){
-                // 镇领导，只能查看本镇下人员
-                //获取本镇下所有乡村
-                List<SysDept> allDept = remoteDeptService.listChildrenDepts(1L);
-                Long deptId = null;
-                for (SysDept sysDept : allDept) {
-                    if(sysDept.getAreaId().equals(code)){
-                        deptId = sysDept.getId();
-                        break;
-                    }
-                }
 
-                List<SysDept> depts = remoteDeptService.listChildrenDepts(deptId);
+            JSONObject jsonObject = redisService.getCacheObject(code);
+            if (isNotEmpty(jsonObject)) {
 
-                List<SysDept> cunDepts = new ArrayList<>(16);
-                for (SysDept dep : depts) {
-                    if (isEmpty(dep.getParentId())) continue;
-                    if (deptId.equals(dep.getParentId())) {
-                        cunDepts.add(dep);
+                results = jsonObject;
+
+            }else{
+                if(lenth.equals("1")){
+                    // 镇领导，只能查看本镇下人员
+                    //获取本镇下所有乡村
+                    List<SysDept> allDept = remoteDeptService.listChildrenDepts(1L);
+                    Long deptId = null;
+                    for (SysDept sysDept : allDept) {
+                        if(sysDept.getAreaId().equals(code)){
+                            deptId = sysDept.getId();
+                            break;
+                        }
                     }
-                }
 
+                    List<SysDept> depts = remoteDeptService.listChildrenDepts(deptId);
 
-                //获取本镇所有人员
-                List<Czrk> czrkList = czrkMapper.getAllCzrkVillageTownsId(code);
+                    List<SysDept> cunDepts = new ArrayList<>(16);
+                    for (SysDept dep : depts) {
+                        if (isEmpty(dep.getParentId())) continue;
+                        if (deptId.equals(dep.getParentId())) {
+                            cunDepts.add(dep);
+                        }
+                    }
 
-               /* //潜山市户籍人口总数
-                int hjzrs = czrkList.size();
 
-                //潜山市 潜山市接种疫苗人数
-                int hjymjz = 0;
+                    //获取本镇所有人员
+                    List<Czrk> czrkList = czrkMapper.getAllCzrkVillageTownsId(code);
 
-                //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
-                for (Czrk czrk : czrkList) {
-                    if (!"1".equals(czrk.getStatus())) {
-                        hjzrs--;
-                    }
-                    if("Y".equals(czrk.getIsNucleicAcid())){
-                        hjymjz++;
+                    // 以各个镇为单位单独处理 townsDepts
+                    ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
+                    for (SysDept townsDept : cunDepts) {
+                        JSONObject townsResult = new JSONObject(16);
+                        townStsvaccineCun(townsResult, townsDept, czrkList);
+                        towsDataList.add(townsResult);
                     }
 
-                }
-                //镇总人数
-                results.put("hjzrs", hjzrs);
-                //镇接种疫苗人数
-                results.put("hjymjz", hjymjz);
-                //镇接种百分比
-                results.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));*/
-
-                // 以各个镇为单位单独处理 townsDepts
-                ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
-                for (SysDept townsDept : cunDepts) {
+                    results.put("townDatas", towsDataList);
+                    results.put("type", "2");
+                }else{
+                    ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
                     JSONObject townsResult = new JSONObject(16);
-                    townStsvaccineCun(townsResult, townsDept, czrkList);
-                    towsDataList.add(townsResult);
-                }
+                    String name = "";
+                    // 村领导
+                    //获取本村所有人员
+                    List<Czrk> czrkList = czrkMapper.getAllCzrkVillageId(code);
 
-                results.put("townDatas", towsDataList);
-                results.put("type", "2");
-            }else{
-                ArrayList<JSONObject> towsDataList = new ArrayList<>(20);
-                JSONObject townsResult = new JSONObject(16);
-                String name = "";
-                // 村领导
-                //获取本村所有人员
-                List<Czrk> czrkList = czrkMapper.getAllCzrkVillageId(code);
+                    //潜山市户籍人口总数
+                    int hjzrs = czrkList.size();
 
-                //潜山市户籍人口总数
-                int hjzrs = czrkList.size();
+                    //潜山市 潜山市接种疫苗人数
+                    int hjymjz = 0;
+
+                    //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
+                    for (Czrk czrk : czrkList) {
+                        if (!"1".equals(czrk.getStatus())) {
+                            hjzrs--;
+                        }
+                        if("Y".equals(czrk.getIsNucleicAcid())){
+                            hjymjz++;
+                        }
 
-                //潜山市 潜山市接种疫苗人数
-                int hjymjz = 0;
+                        if(StringUtils.isEmpty(name) && StringUtils.isEmpty(czrk.getVillage())){
+                            name = czrk.getVillage();
+                        }
 
-                //循环所有人判断当前总人数，该镇 户籍人口今日新增，该镇 户籍人口今日减少
-                for (Czrk czrk : czrkList) {
-                    if (!"1".equals(czrk.getStatus())) {
-                        hjzrs--;
-                    }
-                    if("Y".equals(czrk.getIsNucleicAcid())){
-                        hjymjz++;
                     }
+                    //镇总人数
+                    townsResult.put("hjzrs", hjzrs);
+                    //镇接种疫苗人数
+                    townsResult.put("hjymjz", hjymjz);
+                    //镇接种百分比
+                    townsResult.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
 
-                    if(StringUtils.isEmpty(name) && StringUtils.isEmpty(czrk.getVillage())){
-                        name = czrk.getVillage();
-                    }
+                    townsResult.put("name", name);
 
+                    towsDataList.add(townsResult);
+                    results.put("townDatas", towsDataList);
+                    results.put("type", "3");
                 }
-                //镇总人数
-                townsResult.put("hjzrs", hjzrs);
-                //镇接种疫苗人数
-                townsResult.put("hjymjz", hjymjz);
-                //镇接种百分比
-                townsResult.put("hjbfb", NumberUtils.percent(hjymjz, hjzrs));
-
-                townsResult.put("name", name);
-
-                towsDataList.add(townsResult);
-                results.put("townDatas", towsDataList);
-                results.put("type", "3");
             }
 
         }
 
-
-
         return AjaxResult.success("成功",results);
     }
 

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

@@ -191,9 +191,11 @@
         from accounting_data
         where id = #{id}
     </select>
+
     <select id="getExport" resultMap="AccountingDataResult">
 
     </select>
+
     <select id="getAccountingDataOne" resultMap="AccountingDataResult">
         select id, cjsj, lxdh, create_date, modify_date
         FROM accounting_data

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

@@ -59,6 +59,12 @@
         <result property="toAppropriateTime" column="to_appropriate_time"/>
 
 
+        <result property="provinceIdXjd" column="provinceIdXjd"/>
+        <result property="cityIdXjd" column="cityIdXjd"/>
+        <result property="regionIdXjd" column="regionIdXjd"/>
+        <result property="villageTownsIdXjd" column="villageTownsIdXjd"/>
+        <result property="villageIdXjd" column="villageIdXjd"/>
+
         <result property="provinceXjd" column="provinceXjd"/>
         <result property="cityXjd" column="cityXjd"/>
         <result property="regionXjd" column="regionXjd"/>
@@ -1141,16 +1147,20 @@
         </if>
     </select>
     <select id="getAllCzrkRegionId" resultMap="CzrkResult">
-        select id, dept_id, region_id, region, village_towns_id, village_towns
-                 , village_id, village, create_time, update_time, is_del,status, is_nucleicAcid from czrk
-        where region_id = #{regionId} and is_del = 'N';
+        select c.id, c.dept_id, cj.region_id as regionIdXjd, cj.region as regionXjd, cj.town_id as villageTownsIdXjd, cj.town as villageTownsXjd
+             , cj.village_id as villageIdXjd, cj.village as villageXjd, c.create_time, c.update_time, c.is_del,c.status, c.is_nucleicAcid
+        from czrk c
+        left join czrk_jzdz cj on c.id =cj.czrk_id
+        where cj.region_id = #{regionId} and c.is_del = 'N';
     </select>
 
 
     <select id="getAllCzrkVillageTownsId" resultMap="CzrkResult">
-        select id, dept_id, region_id, region, village_towns_id, village_towns
-             , village_id, village, create_time, update_time, is_del,status, is_nucleicAcid from czrk
-        where village_towns_id = #{areaId} and is_del = 'N';
+        select c.id, c.dept_id, c.region_id, c.region, c.village_towns_id, c.village_towns
+             , c.village_id, c.village, c.create_time, c.update_time, c.is_del,c.status, c.is_nucleicAcid
+        from czrk c
+        left join czrk_jzdz cj on c.id =cj.czrk_id
+        where cj.town_id = #{areaId} and c.is_del = 'N';
     </select>