Skip to content

D
device-back
提交 70a0af5d authored 作者: ozoz's avatar ozoz
浏览文件
操作

revert(check): 回退核查过滤退役、维修中功能

上级 174ce433
显示空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 44 行删除
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ 70a0af5d
......@@ -156,7 +156,6 @@ public class DeviceCheckController {
@Autowired
private HistoryCheckDeviceService historyCheckDeviceService;
@GetMapping("/escow/taskLog")
@ApiOperation(value = "添加阅知信息：终止检查/核查任务")
public ResponseEntity fixEscowTaskLog(@RequestParam Integer detailId) {
......@@ -491,25 +490,26 @@ public class DeviceCheckController {
List<DeviceLibrary> devInLib = devLib.get(true);
List<DeviceLibrary> devNotInLib = devLib.get(false);
Integer filter = detail.getFilter();
if (filter == null) {
filter = 0;
}
switch (filter) {
case 1:
devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 4).collect(toList());
devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).collect(toList());
break;
case 2:
devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 16).collect(toList());
devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 16).collect(toList());
break;
case 3:
devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 4).filter(o -> o.getLifeStatus() != 16).collect(toList());
devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).filter(o -> o.getLifeStatus() != 16).collect(toList());
break;
default:
}
// TODO: 2022/11/15
// Integer filter = detail.getFilter();
// if (filter == null) {
// filter = 0;
// }
// switch (filter) {
// case 1:
// devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 4).collect(toList());
// devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).collect(toList());
// break;
// case 2:
// devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 16).collect(toList());
// devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 16).collect(toList());
// break;
// case 3:
// devInLib = devInLib.stream().filter(o -> o.getLifeStatus() != 4).filter(o -> o.getLifeStatus() != 16).collect(toList());
// devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).filter(o -> o.getLifeStatus() != 16).collect(toList());
// break;
// default:
// }
// 特殊单位处理 if DetailId = x , 则补充添加 name=[],[]单位的装备进来
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/ExamController.java
浏览文件 @ 70a0af5d
......@@ -184,7 +184,9 @@ public class ExamController {
0, list
);
startExam(checkExamVo, false, filter);
// TODO: 2022/11/15
// startExam(checkExamVo, false, filter);
startExam(checkExamVo, false);
return ResponseEntity.ok("发起核查成功");
}
......@@ -200,8 +202,9 @@ public class ExamController {
@ApiOperation(value = "发起检查", notes = "手动发起核查，需要指定参数")
@PostMapping("/confirm/startExam")
public ResponseEntity<ResultObj> startExam(@RequestBody CheckExamVo ceVo,
@RequestParam(defaultValue = "true", required = false) boolean isExam,
@RequestParam(defaultValue = "0", required = false) Integer filter) {
@RequestParam(defaultValue = "true", required = false) boolean isExam
// @RequestParam(defaultValue = "0", required = false) Integer filter
) {
// 获取需要处理的代管单位集合
List<Integer> esIds = checkUnitService.findAllEscrow().stream().map(Units::getUnitId).collect(toList());
......@@ -274,20 +277,21 @@ public class ExamController {
.filter(d -> d.getLifeStatus() != 2 && d.getLifeStatus() != 14);
Map<String, List<DeviceLibrary>> devNotInLib = new HashMap<>();
switch (filter) {
case 1:
// 维修状态 4
devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
break;
case 2:
// 过滤退役中 16
devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).collect(groupingBy(DeviceLibrary::getOwnUnit));
break;
case 3:
devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
break;
default:
}
// TODO: 2022/11/15
// switch (filter) {
// case 1:
// // 维修状态 4
// devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
// break;
// case 2:
// // 过滤退役中 16
// devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).collect(groupingBy(DeviceLibrary::getOwnUnit));
// break;
// case 3:
// devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
// break;
// default:
// }
// 3 如果是省级账户发起的检查，需要构建省局、省直属、市级的统计任务
// 3-1 核查/检查，创建省局单位的账单及详情
......@@ -344,7 +348,8 @@ public class ExamController {
devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
unitDetailDoc.setFilter(filter);
// TODO: 2022/11/15
// unitDetailDoc.setFilter(filter);
DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
detailIds.add(detail.getId());
// 将id放入统计中去 model -> areaName -> detailId
......@@ -408,7 +413,8 @@ public class ExamController {
devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
unitDetailDoc.setFilter(filter);
// TODO: 2022/11/15
// unitDetailDoc.setFilter(filter);
DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
detailIds.add(detail.getId());
......@@ -475,7 +481,8 @@ public class ExamController {
devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
unitDetailDoc.setFilter(filter);
// TODO: 2022/11/15
// unitDetailDoc.setFilter(filter);
DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
detailIds.add(detail.getId());
......@@ -551,7 +558,8 @@ public class ExamController {
devNotInLib.getOrDefault(qu.getName(), new ArrayList<>()));
unitDetailDoc.setVar2(qu.getLevel() == 2 ? String.valueOf(CHECK_DETAIL_CITY_0.id) : String.valueOf(CHECK_DETAIL_REGION_0.id));
unitDetailDoc.setFilter(filter);
// TODO: 2022/11/15
// unitDetailDoc.setFilter(filter);
DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
detailIds.add(detail.getId());
......@@ -603,7 +611,8 @@ public class ExamController {
devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_REGION_0.id));
unitDetailDoc.setFilter(filter);
// TODO: 2022/11/15
// unitDetailDoc.setFilter(filter);
DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
detailIds.add(detail.getId());
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java
浏览文件 @ 70a0af5d
......@@ -175,8 +175,8 @@ public class DeviceCheckDetail extends BaseEntity {
@Column(name = "checkE_name")
private String checkEName = "";
@ApiModelProperty(value = "非在库装备过滤条件;1_过滤维修;2_过滤退役中;3_过滤维修和退役")
private Integer filter;
// @ApiModelProperty(value = "非在库装备过滤条件;1_过滤维修;2_过滤退役中;3_过滤维修和退役")
// private Integer filter;
/**
* 用于生成市级的核查详情账单的构造函数
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论