提交 9985d24c authored 作者: tykj's avatar tykj

feat:检查模块功能变更流程

上级 0ed8ee32
...@@ -124,7 +124,6 @@ public class ExamController { ...@@ -124,7 +124,6 @@ public class ExamController {
@Autowired @Autowired
private CheckUnitService checkUnitService; private CheckUnitService checkUnitService;
@GetMapping("/escrow/unit") @GetMapping("/escrow/unit")
@ApiOperation(value = "查询所有的代管单位,true_过滤无装备的单位,false_不过滤无装备的单位") @ApiOperation(value = "查询所有的代管单位,true_过滤无装备的单位,false_不过滤无装备的单位")
public ResponseEntity findEscrowUnit(@RequestParam(defaultValue = "false") boolean filter) { public ResponseEntity findEscrowUnit(@RequestParam(defaultValue = "false") boolean filter) {
...@@ -188,7 +187,6 @@ public class ExamController { ...@@ -188,7 +187,6 @@ public class ExamController {
List<Units> checkedUnits = unitsRepo.findAllById(unitIds); List<Units> checkedUnits = unitsRepo.findAllById(unitIds);
List<String> checkedUnitNames = checkedUnits.stream().map(Units::getName).collect(toList()); List<String> checkedUnitNames = checkedUnits.stream().map(Units::getName).collect(toList());
// 2-1 构建发起单位的 统计账单 // 2-1 构建发起单位的 统计账单
DeviceCheckStat provinceCheckStat; DeviceCheckStat provinceCheckStat;
//根据examStatId来判断是update还是create 此时初始化的为指定检查区域的数据 //根据examStatId来判断是update还是create 此时初始化的为指定检查区域的数据
...@@ -203,7 +201,6 @@ public class ExamController { ...@@ -203,7 +201,6 @@ public class ExamController {
provinceCheckStat = initCheckStat; provinceCheckStat = initCheckStat;
} }
log.info("[核查模块]发起手动检查,发起单位为{},被查单位为{}", startUnit.getName(), checkedUnitNames); log.info("[核查模块]发起手动检查,发起单位为{},被查单位为{}", startUnit.getName(), checkedUnitNames);
provinceCheckStat.setCheckType(CheckType.CT_EXAM); provinceCheckStat.setCheckType(CheckType.CT_EXAM);
...@@ -216,9 +213,6 @@ public class ExamController { ...@@ -216,9 +213,6 @@ public class ExamController {
Integer currentUserId = authenticationUtils.getAuthentication().getCurrentUserInfo().getUserId(); Integer currentUserId = authenticationUtils.getAuthentication().getCurrentUserInfo().getUserId();
TaskBto cityStatTask; TaskBto cityStatTask;
if (ceVo.getExamStatId() == 0) { if (ceVo.getExamStatId() == 0) {
cityStatTask = new Task(CHECK_EXAM_STAT_1.id, cityStatTask = new Task(CHECK_EXAM_STAT_1.id,
getUnitDateString(startUnit, ceVo.getTitle()), getUnitDateString(startUnit, ceVo.getTitle()),
...@@ -263,7 +257,6 @@ public class ExamController { ...@@ -263,7 +257,6 @@ public class ExamController {
for (CheckExamDetailVo ed : examDetailVos) { for (CheckExamDetailVo ed : examDetailVos) {
List<Integer> uid = ed.getUnitIds(); List<Integer> uid = ed.getUnitIds();
for (Integer u : uid) { for (Integer u : uid) {
Units unit = unitsRepo.findById(u).get(); Units unit = unitsRepo.findById(u).get();
String names = "默认名称"; String names = "默认名称";
...@@ -329,13 +322,13 @@ public class ExamController { ...@@ -329,13 +322,13 @@ public class ExamController {
ceVo.getEndTime().atStartOfDay() ceVo.getEndTime().atStartOfDay()
); );
escrowStat.setSubtitle("省直属单位待核查装备统计单"); escrowStat.setSubtitle("省直属单位待核查装备统计单");
DeviceCheckStat EsSaveStat = statRepo.save(escrowStat); DeviceCheckStat esSaveStat = statRepo.save(escrowStat);
TaskBto esTaskBto; TaskBto esTaskBto;
esTaskBto = new Task(CHECK_EXAM_STAT_0.id, esTaskBto = new Task(CHECK_EXAM_STAT_0.id,
"[省直属单位]" + ceVo.getTitle(), "[省直属单位]" + ceVo.getTitle(),
cityStatTask.getId(), ".0.", CONFIRM_CHECK_STAT.id, EsSaveStat.getId(), startUnitId) cityStatTask.getId(), ".0.", CONFIRM_CHECK_STAT.id, esSaveStat.getId(), startUnitId)
.parse2Bto(); .parse2Bto();
esTaskBto.setCustomInfo("exam"); esTaskBto.setCustomInfo("exam");
...@@ -351,15 +344,8 @@ public class ExamController { ...@@ -351,15 +344,8 @@ public class ExamController {
tasks.forEach(o -> o.setParentTaskId(start.getId())); tasks.forEach(o -> o.setParentTaskId(start.getId()));
taskRepo.saveAll(tasks); taskRepo.saveAll(tasks);
} }
}
// 构建
if (ceVo.getExamStatId() == 0 && startUnit.getType() == 1 && startUnit.getLevel() == 1) {
} }
// 5. 重新设置并保存统计账单 // 5. 重新设置并保存统计账单
statRepo.save(provinceCheckStat); statRepo.save(provinceCheckStat);
log.info("[核查模块] {}单位成功发起对 {} 单位的检查任务分发", startUnit.getName(), checkedUnitNames); log.info("[核查模块] {}单位成功发起对 {} 单位的检查任务分发", startUnit.getName(), checkedUnitNames);
...@@ -397,4 +383,48 @@ public class ExamController { ...@@ -397,4 +383,48 @@ public class ExamController {
} }
/**
* 用于判断是否生成stat统计任务
* @param unitIds 传入的单位id
* @return map
*/
private boolean checkTypeNum(List<Integer> unitIds,Integer tag) {
boolean rs = false;
// tag: 0_处理核查时的省局,1_处理检查时的省局 2_处理省直属 3_处理市
List<Units> units = unitsRepo.findAllById(unitIds);
switch (tag) {
case 0:
// 核查 判断是否有省自己和省局单位
if (units.stream().filter(o -> o.getType() == 1).filter(o -> o.getLevel() == 1).count() == 1) {
rs = true;
}
if (units.stream().filter(o -> o.getType() == 2).anyMatch(o -> o.getLevel() == 1)) {
rs = true;
}
break;
case 1:
// 检查不可能有省自己,因此只需要检查省局单位
if (units.stream().filter(o -> o.getType() == 2).anyMatch(o -> o.getLevel() == 1)) {
rs = true;
}
break;
case 2:
if(units.stream().anyMatch(o -> o.getEscrow() == 1)) {
rs = true;
}
break;
case 3:
if(units.stream().anyMatch(o -> o.getLevel() == 2)) {
rs = true;
}
break;
default:
return false;
}
return rs;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论