[核查模块] 修复了统计数据覆盖的Bug

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

@@ -6,7 +6,6 @@ import com.tykj.dev.config.GlobalMap;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.confirmcheck.common.CheckType;
 import com.tykj.dev.device.confirmcheck.common.TaskPeriod;
-import com.tykj.dev.device.user.cache.AreaCache;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckDetail;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
 import com.tykj.dev.device.confirmcheck.entity.vo.*;
@@ -24,6 +23,7 @@ import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.base.enums.AuExample;
+import com.tykj.dev.device.user.cache.AreaCache;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.entity.Area;
@@ -175,6 +175,17 @@ public class DeviceCheckController {
         return ImmutableMap.of("currentTaskPeriod", periodName);
     }
 
+    @GetMapping("/title/{examJobId}")
+    public ResponseEntity getNames(@PathVariable Integer examJobId){
+        // 根据检查的主键id 查询到prov city Stat的title
+        Integer provId = taskService.get(examJobId).getParentTaskId();
+        // 检查的job id 找到 father 进而找到 father的billid 进而找到title Id
+        Integer statId = taskService.get(provId).getBillId();
+        String title = statRepo.getOne(statId).getTitle();
+
+        return ResponseEntity.ok(title);
+    }
+
     @ApiOperation(value = "发起自动核查", notes = "发起自动核查")
     @PostMapping("/auto")
     public ResultObj<Map<String, List<Integer>>> startAutoCheck() {
@@ -254,8 +265,8 @@ public class DeviceCheckController {
         log.info("[核查模块]发起手动核查，发起单位为{},被查单位为{}", startUnit.getName(), checkedUnitNames);
         // 2-1 构建发起单位的 统计账单
         DeviceCheckStat provinceCheckStat;
-        //根据examStatId来判断是update还是create
-        DeviceCheckStat initCheckStat = initStatData(ceVo.getTitle(), groupUserString, 0, 0, startUnit.getName(), checkedUnits, ceVo.getEndTime().atStartOfDay());
+        //根据examStatId来判断是update还是create 此时初始化的为指定检查区域的数据
+        DeviceCheckStat initCheckStat = initStatData(checkedUnitNames, ceVo.getTitle(), groupUserString, 0, 0, startUnit.getName(), checkedUnits, ceVo.getEndTime().atStartOfDay());
         if (ceVo.getExamStatId() != 0) {
             DeviceCheckStat oriCheckStat = statRepo.findById(ceVo.getExamStatId()).get();
             oriCheckStat.setRemark(initCheckStat.getRemark());
@@ -426,7 +437,7 @@ public class DeviceCheckController {
     public ResponseEntity<ResultObj> checkUserB(@PathVariable Integer id,
                                                 @RequestParam int checkStatus,
                                                 @RequestParam(required = false, defaultValue = "0") int checkUserAId,
-                                                @RequestParam(required = false, defaultValue = "0") int checkUserBId,@RequestBody List<FileRet> checkFiles) {
+                                                @RequestParam(required = false, defaultValue = "0") int checkUserBId, @RequestBody List<FileRet> checkFiles) {
         log.info("[核查模块] 专管员B正在进行核查操作，核查账单id为 {} ,且审核状态为 : {}", id, checkStatus == 1 ? "通过" : "不通过");
         if (checkStatus == 0) {
             return ResponseEntity.status(400).body(new ResultObj<>("checkStatus不应该为0!"));
@@ -453,7 +464,7 @@ public class DeviceCheckController {
             // 如果是4流程的，则需要指定核查组成员A接任务
             detailRepo.updateCheckStatus(id, checkStatus);
             //是否上传检查单
-            if (checkFiles!=null&&checkFiles.size()>0){
+            if (checkFiles != null && checkFiles.size() > 0) {
                 DeviceCheckDetail deviceCheckDetail = detailRepo.findById(id).get();
                 deviceCheckDetail.setCheckFiles(FilesUtil.stringFileToList(checkFiles));
                 detailRepo.save(deviceCheckDetail);
@@ -554,11 +565,11 @@ public class DeviceCheckController {
                     .map(vo -> vo.combine(cityName, cityStat.getId()))
                     .collect(toList());
             // 如果是第一个市，则替换，否则累加
-            boolean firstCity = taskService.TaskTreeIsStart(cityTask.getParentTaskId(),true);
-            if (firstCity){
+            boolean firstCity = taskService.TaskTreeIsStart(cityTask.getParentTaskId(), true);
+            if (firstCity) {
                 provinceStat.setDeviceStatVoList(mergedVo);
                 log.info("[核查模块] 检测到该任务的合并状态为第一个市统计任务，因此直接替换省级统计数据");
-            }else {
+            } else {
                 provinceStat.cleanReduce(mergedVo);
                 log.info("[核查模块] 数据累加成功");
             }
@@ -613,7 +624,7 @@ public class DeviceCheckController {
         int statId = taskRepo.findBillId(fatherTaskId, CONFIRM_CHECK_STAT.id);
 
         // 如果是第一个区域(通过判断所有的child节点没有结束)，替换掉父级的统计，如果不是第一个区域，则累加
-        boolean firstArea = taskService.TaskTreeIsStart(fatherTaskId,false);
+        boolean firstArea = taskService.TaskTreeIsStart(fatherTaskId, false);
         List<CheckDeviceStatVo> addVos = parseStatString2Vo(currentTask, currentDetail.getCheckDetail());
         CheckStatVo cityStatVo = transUtil.checkStatDo2Vo(statRepo.findById(statId).get());
         //addVos在内部reduce一次
@@ -623,13 +634,16 @@ public class DeviceCheckController {
                 .stream()
                 .map(v -> v.stream().reduce(CheckDeviceStatVo::reduce).get())
                 .collect(toList());
+        //直接替换
+        cityStatVo = cityStatVo.cleanReduce(addVos);
+
         // 第一个区域替换,否则累加
-        if (firstArea) {
-            cityStatVo.setDeviceStatVoList(addVos);
-        } else {
-            // 获得当前城市的统计信息 以及 要汇总的地区信息 并累加保存
-            cityStatVo = cityStatVo.cleanReduce(addVos);
-        }
+//        if (firstArea) {
+//            cityStatVo.setDeviceStatVoList(addVos);
+//        } else {
+//            // 获得当前城市的统计信息 以及 要汇总的地区信息 并累加保存
+//            cityStatVo = cityStatVo.cleanReduce(addVos);
+//        }
         statRepo.save(cityStatVo.toDo());
 
         // 判断地区数据是否均汇总完毕
@@ -696,6 +710,41 @@ public class DeviceCheckController {
         return statVoList;
     }
 
+
+    /**
+     * @param initUnitNames 初始化指定单位的数据
+     * @return
+     */
+    private DeviceCheckStat initStatData(List<String> initUnitNames, String title, String remark, Integer checkAId, Integer checkBId, String startUnitName, List<Units> unitsList, LocalDateTime endTime) {
+        //获得要被统计的单位名列表
+        List<String> unitNameList = unitsList.stream()
+                .map(Units::getName)
+                .collect(toList());
+
+        List<AreaUnit> auList = unitsList.stream()
+                .map(units -> auService.findOne(AuExample.UnitId, units.getUnitId()))
+                .collect(toList());
+
+        Collection<CheckDeviceStatVo> statVos = deviceRepo.findAll()
+                .stream()
+                .filter(dev -> unitNameList.contains(dev.getOwnUnit()))
+                .filter(dev -> initUnitNames.contains(dev.getOwnUnit()))
+                .map(transUtil::device2InitStatVo)
+                .collect(toMap(d -> d.getDeviceModel() + d.getDeviceName(), Function.identity(), CheckDeviceStatVo::reduce))
+                .values();
+
+        return new DeviceCheckStat(
+                CheckType.MANUAL_CHECK,
+                title,
+                startUnitName + "待核查装备统计单",
+                JacksonUtil.toJSon(new ArrayList<>(statVos)),
+                checkAId,
+                checkBId,
+                remark,
+                endTime);
+    }
+
+
     /**
      * 构建初始化核查统计数据
      * 依据不同地区装备的在库情况构造出舒适化的统计数据出来