提交 8ac2b96d authored 作者: tykj's avatar tykj

style(核查):去掉无用的代码和实体类

上级 fb81ece4
......@@ -730,7 +730,6 @@ public class DeviceCheckController {
// List<LinkExamDetail> leDetail = linkVo.getLeDetail();
// List<LinkExamDetail> newLeDetail = new ArrayList<>(14);
// newLeDetail.set(0, leDetail.get(0));
// newLeDetail.set(1, leDetail.get(12));
// newLeDetail.set(2, leDetail.get(13));
// newLeDetail.set(3, leDetail.get(7));
// newLeDetail.set(4, leDetail.get(4));
......@@ -1073,22 +1072,6 @@ public class DeviceCheckController {
currentDetail.setUserCId(0);
currentDetail = detailRepo.save(currentDetail);
// DeviceCheckDetail oldDeatil = detailRepo.findById(currentTask.getId()).get();
// // 更正撤销前负责人、校对结果、实查数量不显示问题
// oldDeatil.setUserAId(currentDetail.getUserAId());
// oldDeatil.setUserBId(currentDetail.getUserBId());
// oldDeatil.setCheckResult(currentDetail.getCheckResult());
// oldDeatil.setCheckedCount(currentDetail.getCheckedCount());
// detailRepo.save(oldDeatil);
//
// // 更正撤销前负责人、校对结果、实查数量显示出错问题
// currentDetail.setUserAId(null);
// currentDetail.setUserBId(null);
// currentDetail.setCheckResult("");
// currentDetail.setCheckedCount(0);
// currentDetail = detailRepo.save(currentDetail);
//该detail对应的stat数据里相应的数据剔除(写一个通用的剔除方法), 否则在第二次审核通过的时候会重复计算一次数据
TaskBto fatherTask = taskService.get(currentTask.getParentTaskId());
DeviceCheckStat dcs = statRepo.findById(fatherTask.getBillId()).get();
......
......@@ -76,76 +76,27 @@ public class ExamController {
private UnitsDao unitsRepo;
final String CHECK_RESULT_WAIT = "等待省查阅";
final String CHECK_RESULT_DONE = "已查阅";
Map<Integer, String> desMap = new HashMap<>();
Map<Integer, String> desBillMap = new HashMap<>();
private int specialDetailId = 0;
private List<String> specialUnits = new ArrayList<>();
@Autowired
private CheckUnitService checkUnitService;
@Autowired
private DeviceCheckLinkDao linkRepo;
@Autowired
private DeviceCheckStatDao statRepo;
@Autowired
private DeviceCheckBillDao billRepo;
@Autowired
private AreaDao areaRepo;
@Autowired
private DeviceLibraryDao deviceRepo;
@Autowired
private DeviceCheckDetailDao detailRepo;
@Autowired
private DeviceLibraryCacheService dcService;
@Autowired
private ObjTransUtil transUtil;
@Autowired
private TaskDao taskRepo;
@Autowired
private TaskService taskService;
@Autowired
private AuthenticationUtils authenticationUtils;
@Autowired
private AreaCache areaCache;
@Autowired
private AuService auService;
@Autowired
private ConfirmCheckService ccService;
@Autowired
private UserService userService;
@Autowired
private MyWebSocket myWebSocket;
@Autowired
private SelfCheckController selfCheckController;
@Autowired
private MessageService messageService;
@Autowired
private TaskLogService taskLogService;
@Autowired
private UnitsService unitsService;
@Autowired
AreaExhibitionCache areaExhibitionCache;
@GetMapping("/check/confirm/search/lib")
@ApiOperation(value = "根据序列号临时搜索")
public ResponseEntity searchForLibraries(@RequestBody CheckSearchVo checkSearchVo) {
List<Integer> rs = new ArrayList<>();
checkSearchVo.getLibs().forEach(
(k,v) -> {
boolean contains = v.contains(checkSearchVo.getContent());
if (contains) {
rs.add(k);
}
}
);
return ResponseEntity.ok(CheckResultVo.builder().ids(rs).build());
}
@GetMapping("/check/confirm/escrow")
@ApiOperation(value = "判断task是否为代管单位的详情任务")
public ResponseEntity judgeEscrowUnit(@RequestParam Integer billId, @RequestParam Integer type) {
......
package com.tykj.dev.device.confirmcheck.entity.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CheckSearchVo {
private Integer id;
private String content;
private Map<Integer,String> libs;
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论