[核查模块] 修复了自动核查的地区统计数据异常的问题

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -129,7 +129,7 @@ public class DeviceCheckController {
         DeviceCheckStat provinceStatDo = initStatData("自动核查",
                 0,
                 0,
-                baseTitle + "浙江省自动核查",
+                "自动-" + baseTitle,
                 provUnit.getName(),
                 cityUnits);
         DeviceCheckStat provStat = statRepo.save(provinceStatDo);
@@ -162,7 +162,7 @@ public class DeviceCheckController {
             DeviceCheckStat cityStatDo = initStatData("系统发起的统计|" + cityUnit.getName() + "|" + cityUnit.getAreaId(),
                     0,
                     0,
-                    baseTitle + cityUnit.getName() + "自动核查统计",
+                    "自动-" + baseTitle,
                     cityUnit.getName(),
                     countyUnits);
 
@@ -179,9 +179,9 @@ public class DeviceCheckController {
             // 构建市自查账单
             DeviceCheckDetailEntity cityDetailDo = DeviceCheckDetailEntity.EmptyWithChecker(
                     "系统发起的自查|" + cityUnit.getName() + "|" + cityUnit.getAreaId(),
-                    baseTitle + cityUnit.getName() + "核查任务",
+                    "自动-" + baseTitle,
                     0, 0, 0, 0,
-                    provUnit.getName(),
+                    cityUnit.getName(),
                     devInLib.getOrDefault(cityUnit.getName(), new ArrayList<>()),
                     devNotInLib.getOrDefault(cityUnit.getName(), new ArrayList<>()));
             DeviceCheckDetailEntity cityDetail = detailRepo.save(cityDetailDo);
@@ -200,18 +200,18 @@ public class DeviceCheckController {
 
             // 构建县任务
             for (Units countyUnit : countyUnits) {
-                countyAreaNames.add(areaCache.findById(countyUnit.getAreaId()).getName());
+                String countyName = areaCache.findById(countyUnit.getAreaId()).getName();
+                countyAreaNames.add(countyName);
                 //构建县自查账单
                 DeviceCheckDetailEntity countyDetailDo = DeviceCheckDetailEntity.EmptyWithChecker(
                         "系统发起的自查|" + countyUnit.getName() + "|" + countyUnit.getAreaId(),
-                        baseTitle + countyUnit.getName() + "核查任务",
+                        "自动" + baseTitle,
                         0, 0, 0, 0,
-                        provUnit.getName(),
+                        countyUnit.getName(),
                         devInLib.getOrDefault(cityUnit.getName(), new ArrayList<>()),
                         devNotInLib.getOrDefault(cityUnit.getName(), new ArrayList<>()));
                 DeviceCheckDetailEntity countyDetail = detailRepo.save(countyDetailDo);
                 resultIds.get("detailId").add(countyDetail.getId());
-                String countyName = areaRepo.findNameById(countyUnit.getAreaId());
                 List<CheckDeviceStatVo> countyStatVoList = deviceList.stream()
                         .filter(d -> d.getOwnUnit().equals(countyUnit.getName()))
                         .map(d -> transUtil.device2InitStatVo(d, countyName, cityStat.getId(), countyDetail.getId()))
@@ -271,10 +271,11 @@ public class DeviceCheckController {
             if (csd.getRemark().split("\\|").length <= 1) {
                 continue;
             }
-            String areaName = csd.getRemark().split("\\|")[1];
+            String unitName = csd.getRemark().split("\\|")[1];
             Integer cityId = Integer.valueOf(csd.getRemark().split("\\|")[2]);
+            String cityName = areaCache.findById(cityId).getName();
             List<String> childNames = areaRepo.findByFatherId(cityId).stream().map(Area::getName).collect(toList());
-            cityNames.add(areaName);
+            cityNames.add(cityName);
             cityNames.addAll(childNames);
 
             //去除其他地区的数据