[核查] 添加查询备注的接口

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

@@ -72,6 +72,8 @@ import static java.util.stream.Collectors.*;
 @Api(tags = "核查模块", description = "核查模块", position = 1)
 public class DeviceCheckController {
 
+    Map<Integer,String> desMap=new HashMap<>();
+
     @Autowired
     private DeviceCheckStatDao statRepo;
     @Autowired
@@ -351,7 +353,7 @@ public class DeviceCheckController {
         LinkCheckDetail lcd = new LinkCheckDetail();
         lcd.setId(task.getBillId());
         //核查情况 无误/有误/逾期
-        if (endTime.isBefore(LocalDateTime.now())) {
+        if (endTime.isBefore(LocalDateTime.now()) && task.getBillStatus() != 9999 && revAreaStat.getComProgress() != 2) {
             lcd.setCheckSituation("逾期");
         } else if (revAreaStat.getComSituation() == 1) {
             lcd.setCheckSituation("有误");
@@ -537,6 +539,7 @@ public class DeviceCheckController {
         provStatTask.setCustomInfo("check");
         provStatTask = taskService.start(provStatTask);
 
+        desMap.put(provStatTask.getId(),ccVO.getRemark());
         //构建市的检查任务(level=2)
         List<Units> examCheckUnits = checkedUnits.stream()
                 .filter(units -> Arrays.asList(2).contains(units.getLevel()))
@@ -623,6 +626,24 @@ public class DeviceCheckController {
         return ResponseEntity.ok(ImmutableMap.of("msg", "发起核查成功"));
     }
 
+
+    /**
+     * 根据taskId查询Remark
+     */
+    @ApiOperation(value = "根据taskId查询Remark", notes = "根据taskId查询Remark")
+    @GetMapping("/selectRemark/{taskId}")
+    public ResponseEntity selectRemark(@PathVariable Integer taskId){
+        TaskBto taskBto=selectProvTask(taskId);
+        return ResponseEntity.ok(desMap.get(taskBto.getId()));
+    }
+
+    private TaskBto selectProvTask(Integer taskId){
+      TaskBto taskBto=  taskService.get(taskId);
+      if (taskBto.getParentTaskId()==0){
+          return taskBto;
+      }
+       return selectProvTask(taskBto.getParentTaskId());
+    }
     /**
      * 发起检查
      * <li>1. 添加发起核查bill记录</>

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -157,8 +157,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             );
             //市区关系信息
             Map<Integer,List<SupervisorVo>> supervisorMap=new HashMap<>();
-            //省本级
-            SupervisorVo corresponding=null;
+
             //省直属 待考虑
             unitNameMap.forEach((k,v)->{
                 Units units1= unitsService.findbyName(k);
@@ -239,7 +238,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         strings.add(units.getName());
         deviceRepelDetail.setRepelType(3);
         count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),strings, seqNumbers,lifeStatus);
-        if (correspondingLevel.get()&&count!=0){
+        if (correspondingLevel.get()&& count!=0){
             TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle(),userId);
             list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",repelStatusJudgeCount(deviceRepel.getRepelStatus(),count),""));
         }