Skip to content

D
device-back
提交 f1931037 authored 作者: Matrix's avatar Matrix
浏览文件
操作

[核查模块] 重构了日志表相关的代码，使得日志的上传是隐式的

上级 701979ad
隐藏空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 68 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ f1931037
package com.tykj.dev.config;
import com.tykj.dev.misc.base.StatusEnum;
import lombok.AllArgsConstructor;
import lombok.Data;
import static com.tykj.dev.misc.base.StatusEnum.*;
/**
* Type
......@@ -16,103 +16,122 @@ public enum LogType {
/**
* 发起列装
*/
PACKING_1(1, StatusEnum.ORIGIN_STATUS.id, StatusEnum.PACKING_CONFIRM.id,"发起列装"),
PACKING_1(1, ORIGIN_STATUS.id, PACKING_CONFIRM.id, "发起列装"),
/**
* 列装审核成功
*/
PACKING_2(2,StatusEnum.PACKING_CONFIRM.id, StatusEnum.END.id,"列装审核成功"),
PACKING_2(2, PACKING_CONFIRM.id, END.id, "列装审核成功"),
/**
* 列装审核失败
*/
PACKING_3(3,StatusEnum.PACKING_CONFIRM.id, StatusEnum.ARCHIVE.id,"列装审核失败"),
PACKING_3(3, PACKING_CONFIRM.id, ARCHIVE.id, "列装审核失败"),
STORAGE_1(4, ORIGIN_STATUS.id, STORAGE_CONFIRM.id, "发起入库"),
STORAGE_2(5, STORAGE_CONFIRM.id, END.id, "入库审核成功"),
STORAGE_3(6, STORAGE_CONFIRM.id, ARCHIVE.id, "入库审核失败"),
ALLOT_1(7, ORIGIN_STATUS.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_2(8, WAIT_ALLOT.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_3(9, ALLOT_SEND_CONFIRM.id, ARCHIVE.id, "配发出库审核失败"),
ALLOT_4(10, ALLOT_SEND_CONFIRM.id, ALLOTING.id, "审核成功并出库"),
ALLOT_5(11, ALLOTING.id, ALLOT_RECEIVE_CONFIRM.id, "接收并发起入库"),
STORAGE_1(4,StatusEnum.ORIGIN_STATUS.id,StatusEnum.STORAGE_CONFIRM.id,"发起入库"),
ALLOT_6(12, ALLOT_RECEIVE_CONFIRM.id, END.id, "审核成功并入库"),
STORAGE_2(5,StatusEnum.STORAGE_CONFIRM.id,StatusEnum.END.id,"入库审核成功"),
ALLOT_7(13, ALLOT_RECEIVE_CONFIRM.id, ARCHIVE.id, "配发入库审核失败"),
STORAGE_3(6,StatusEnum.STORAGE_CONFIRM.id,StatusEnum.ARCHIVE.id,"入库审核失败"),
RFID_1(14, ORIGIN_STATUS.id, RFID_BUSINESS_NEED_CONFIRM.id, "发起标签替换"),
ALLOT_1(7,StatusEnum.ORIGIN_STATUS.id,StatusEnum.ALLOT_SEND_CONFIRM.id,"对(%receiveUnit)发起配发"),
RFID_2(15, RFID_BUSINESS_NEED_CONFIRM.id, END.id, "标签替换审核成功"),
ALLOT_2(8,StatusEnum.WAIT_ALLOT.id,StatusEnum.ALLOT_SEND_CONFIRM.id,"对(%receiveUnit)发起配发"),
RFID_3(16, RFID_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "标签替换审核失败"),
ALLOT_3(9,StatusEnum.ALLOT_SEND_CONFIRM.id,StatusEnum.ARCHIVE.id,"配发出库审核失败"),
SELF_CHECK_1(17, ORIGIN_STATUS.id, SELF_CHECK_CONFIRM.id, "手动发起自查"),
ALLOT_4(10,StatusEnum.ALLOT_SEND_CONFIRM.id,StatusEnum.ALLOTING.id,"审核成功并出库"),
SELF_CHECK_2(18, WAIT_SELF_CHECK.id, SELF_CHECK_CONFIRM.id, "周期发起自查"),
ALLOT_5(11,StatusEnum.ALLOTING.id,StatusEnum.ALLOT_RECEIVE_CONFIRM.id,"接收并发起入库"),
SELF_CHECK_3(19, SELF_CHECK_CONFIRM.id, END.id, "自查审核成功"),
ALLOT_6(12,StatusEnum.ALLOT_RECEIVE_CONFIRM.id,StatusEnum.END.id,"审核成功并入库"),
SELF_CHECK_4(20, SELF_CHECK_CONFIRM.id, ARCHIVE.id, "自查审核失败"),
ALLOT_7(13,StatusEnum.ALLOT_RECEIVE_CONFIRM.id,StatusEnum.ARCHIVE.id,"配发入库审核失败"),
APPLY_1(21, ORIGIN_STATUS.id, DEVICE_APPLY_CONFIRM.id, "发起装备申请"),
RFID_1(14,StatusEnum.ORIGIN_STATUS.id,StatusEnum.RFID_BUSINESS_NEED_CONFIRM.id,"发起标签替换"),
APPLY_2(22, DEVICE_APPLY_CONFIRM.id, END.id, "装备申请批复通过"),
RFID_2(15,StatusEnum.RFID_BUSINESS_NEED_CONFIRM.id,StatusEnum.END.id,"标签替换审核成功"),
APPLY_3(23, DEVICE_APPLY_CONFIRM.id, ARCHIVE.id, "装备申请批复驳回"),
RFID_3(16,StatusEnum.RFID_BUSINESS_NEED_CONFIRM.id,StatusEnum.ARCHIVE.id,"标签替换审核失败"),
DESTROY_1(24, ORIGIN_STATUS.id, DESTROY_BUSINESS_NEED_CONFIRM.id, "发起销毁"),
SELF_CHECK_1(17,StatusEnum.ORIGIN_STATUS.id,StatusEnum.SELF_CHECK_CONFIRM.id,"手动发起自查"),
DESTROY_2(25, DESTROY_BUSINESS_NEED_CONFIRM.id, END.id, "销毁出库审核成功"),
SELF_CHECK_2(18,StatusEnum.WAIT_SELF_CHECK.id,StatusEnum.SELF_CHECK_CONFIRM.id,"周期发起自查"),
DESTROY_3(26, DESTROY_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "销毁出库审核失败"),
SELF_CHECK_3(19,StatusEnum.SELF_CHECK_CONFIRM.id,StatusEnum.END.id,"自查审核成功"),
MATCHING_1(27, ORIGIN_STATUS.id, ADD_MATCHING_DEVICE_CONFIRM.id, "发起新增配套设备"),
SELF_CHECK_4(20,StatusEnum.SELF_CHECK_CONFIRM.id,StatusEnum.ARCHIVE.id,"自查审核失败"),
MATCHING_2(28, ADD_MATCHING_DEVICE_CONFIRM.id, END.id, "添加配套设备审核成功"),
APPLY_1(21,StatusEnum.ORIGIN_STATUS.id,StatusEnum.DEVICE_APPLY_CONFIRM.id,"发起装备申请"),
MATCHING_3(29, ADD_MATCHING_DEVICE_CONFIRM.id, ARCHIVE.id, "添加配套设备审核失败"),
APPLY_2(22,StatusEnum.DEVICE_APPLY_CONFIRM.id,StatusEnum.END.id,"装备申请批复通过"),
REPAIR_SEND_1(30, ORIGIN_STATUS.id, REPAIR_SEND_CONFIRM.id, "向(%receiveUnit)发起装备维修"),
APPLY_3(23,StatusEnum.DEVICE_APPLY_CONFIRM.id,StatusEnum.ARCHIVE.id,"装备申请批复驳回"),
REPAIR_SEND_2(31, REPAIR_SEND_CONFIRM.id, WAIT_RECEIVE.id, "审核成功并出库"),
DESTROY_1(24,StatusEnum.ORIGIN_STATUS.id,StatusEnum.DESTROY_BUSINESS_NEED_CONFIRM.id,"发起销毁"),
REPAIR_SEND_3(32, REPAIR_SEND_CONFIRM.id, ARCHIVE.id, "维修出库审核失败"),
DESTROY_2(25,StatusEnum.DESTROY_BUSINESS_NEED_CONFIRM.id,StatusEnum.END.id,"销毁出库审核成功"),
REPAIR_SEND_4(33, WAIT_RECEIVE.id, REPAIR_RECEIVE_CONFIRM.id, "接收维修装备并发起入库"),
DESTROY_3(26,StatusEnum.DESTROY_BUSINESS_NEED_CONFIRM.id,StatusEnum.ARCHIVE.id,"销毁出库审核失败"),
REPAIR_SEND_5(34, REPAIR_RECEIVE_CONFIRM.id, REPAIRING.id, "审核成功并入库维修"),
MATCHING_1(27,StatusEnum.ORIGIN_STATUS.id,StatusEnum.ADD_MATCHING_DEVICE_CONFIRM.id,"发起新增配套设备"),
REPAIR_SEND_6(35, REPAIR_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修装备入库审核失败"),
MATCHING_2(28,StatusEnum.ADD_MATCHING_DEVICE_CONFIRM.id,StatusEnum.END.id,"添加配套设备审核成功"),
REPAIR_SEND_7(36, REPAIR_SEND_CONFIRM.id, COUNTRY_REPAIRING.id, "审核成功并出库"),
MATCHING_3(29,StatusEnum.ADD_MATCHING_DEVICE_CONFIRM.id,StatusEnum.ARCHIVE.id,"添加配套设备审核失败"),
REPAIR_BACK_1(37, ORIGIN_STATUS.id, REPAIR_BACK_CONFIRM.id, "向(%receiveUnit)退还维修装备"),
REPAIR_SEND_1(30,StatusEnum.ORIGIN_STATUS.id,StatusEnum.REPAIR_SEND_CONFIRM.id,"向(%receiveUnit)发起装备维修"),
REPAIR_BACK_2(38, REPAIR_BACK_CONFIRM.id, WAIT_BACK_RECEIVE.id, "维修退回审核成功并出库"),
REPAIR_SEND_2(31,StatusEnum.REPAIR_SEND_CONFIRM.id,StatusEnum.WAIT_RECEIVE.id,"审核成功并出库"),
REPAIR_BACK_3(39, REPAIR_BACK_CONFIRM.id, ARCHIVE.id, "维修退回出库审核失败"),
REPAIR_SEND_3(32,StatusEnum.REPAIR_SEND_CONFIRM.id,StatusEnum.ARCHIVE.id,"维修出库审核失败"),
REPAIR_BACK_4(40, WAIT_BACK_RECEIVE.id, REPAIR_BACK_RECEIVE_CONFIRM.id, "维修退回装备接收并发起入库"),
REPAIR_SEND_4(33,StatusEnum.WAIT_RECEIVE.id,StatusEnum.REPAIR_RECEIVE_CONFIRM.id,"接收维修装备并发起入库"),
REPAIR_BACK_5(41, REPAIR_BACK_RECEIVE_CONFIRM.id, END.id, "维修退回装备入库审核成功"),
REPAIR_SEND_5(34,StatusEnum.REPAIR_RECEIVE_CONFIRM.id,StatusEnum.REPAIRING.id,"审核成功并入库维修"),
REPAIR_BACK_6(42, REPAIR_BACK_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修退回装备入库审核失败"),
REPAIR_SEND_6(35,StatusEnum.REPAIR_RECEIVE_CONFIRM.id,StatusEnum.ARCHIVE.id,"维修装备入库审核失败"),
RETIRED_1(43, ORIGIN_STATUS.id, RETIRED_BUSINESS_NEED_CONFIRM.id, "发起退装"),
REPAIR_SEND_7(36,StatusEnum.REPAIR_SEND_CONFIRM.id,StatusEnum.COUNTRY_REPAIRING.id,"审核成功并出库"),
RETIRED_2(44, RETIRED_BUSINESS_NEED_CONFIRM.id, END.id, "退装审核成功"),
REPAIR_BACK_1(37,StatusEnum.ORIGIN_STATUS.id,StatusEnum.REPAIR_BACK_CONFIRM.id,"向(%receiveUnit)退还维修装备"),
RETIRED_3(45, RETIRED_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "退装审核失败"),
REPAIR_BACK_2(38,StatusEnum.REPAIR_BACK_CONFIRM.id,StatusEnum.WAIT_BACK_RECEIVE.id,"维修退回审核成功并出库"),
TRAIN_1(46, ORIGIN_STATUS.id, TRAIN1000.id, "发起培训"),
REPAIR_BACK_3(39,StatusEnum.REPAIR_BACK_CONFIRM.id,StatusEnum.ARCHIVE.id,"维修退回出库审核失败"),
CONFIRM_CHECK_DETAIL_NORMAL_1(47, CHECK_DETAIL_0.id, CHECK_DETAIL_1.id, "A岗核查成功,等待专管员B操作"),
REPAIR_BACK_4(40,StatusEnum.WAIT_BACK_RECEIVE.id,StatusEnum.REPAIR_BACK_RECEIVE_CONFIRM.id,"维修退回装备接收并发起入库"),
CONFIRM_CHECK_DETAIL_NORMAL_2(48, CHECK_DETAIL_1.id, CHECK_DETAIL_2.id, "B岗核查成功,等待核查组成员A审核"),
REPAIR_BACK_5(41,StatusEnum.REPAIR_BACK_RECEIVE_CONFIRM.id,StatusEnum.END.id,"维修退回装备入库审核成功"),
CONFIRM_CHECK_DETAIL_NORMAL_3(49, CHECK_DETAIL_2.id, CHECK_DETAIL_3.id, "核查组成员A核查成功,等待核查组成员B审核"),
REPAIR_BACK_6(42,StatusEnum.REPAIR_BACK_RECEIVE_CONFIRM.id,StatusEnum.ARCHIVE.id,"维修退回装备入库审核失败"),
CONFIRM_CHECK_DETAIL_NORMAL_4(50, CHECK_DETAIL_3.id, END.id, "核查组成员B核查成功,任务结束,上传数据到统计信息"),
RETIRED_1(43,StatusEnum.ORIGIN_STATUS.id,StatusEnum.RETIRED_BUSINESS_NEED_CONFIRM.id,"发起退装"),
CONFIRM_CHECK_DETAIL_OTHER_1(51, CHECK_DETAIL_1.id, END.id, "B岗核查成功,该任务没有核查组成员,任务结束,上传数据到统计信息"),
RETIRED_2(44,StatusEnum.RETIRED_BUSINESS_NEED_CONFIRM.id,StatusEnum.END.id,"退装审核成功"),
CONFIRM_CHECK_DETAIL_OTHER_2(52, CHECK_DETAIL_1.id, CHECK_DETAIL_0.id, "B岗审核失败,跳回A岗人员操作"),
RETIRED_3(45,StatusEnum.RETIRED_BUSINESS_NEED_CONFIRM.id,StatusEnum.ARCHIVE.id,"退装审核失败"),
CONFIRM_CHECK_DETAIL_OTHER_3(53, CHECK_DETAIL_2.id, CHECK_DETAIL_0.id, "核查组成员A审核失败,跳回A岗人员操作"),
TRAIN_1(46,StatusEnum.ORIGIN_STATUS.id,StatusEnum.TRAIN1000.id,"发起培训")
CONFIRM_CHECK_DETAIL_OTHER_4(54, CHECK_DETAIL_3.id, CHECK_DETAIL_0.id, "核查组成员B审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_STAT_1(55, CHECK_STAT_0.id, CHECK_STAT_1.id, "地区数据已统计完毕,等待确认"),
CONFIRM_CHECK_DETAIL_STAT_2(56, CHECK_STAT_1.id, END.id, "地区数据已确认完毕,将统计上传,任务完结");
;
public Integer id;
/**
......@@ -130,5 +149,7 @@ public enum LogType {
*/
public String operation;
public String getOperation() { return this.operation; }
public String getOperation() {
return this.operation;
}
}
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ f1931037
package com.tykj.dev.device.confirmcheck.controller;
import com.google.common.collect.Lists;
import com.tykj.dev.config.GlobalMap;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.confirmcheck.entity.cache.AreaCache;
import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckBillEntity;
......@@ -25,7 +26,6 @@ import com.tykj.dev.device.user.subject.entity.Area;
import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.util.AuthenticationUtils;
import com.tykj.dev.misc.base.GlobalMap;
import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.JacksonUtil;
......@@ -79,8 +79,6 @@ public class DeviceCheckController {
@Autowired
private TaskService taskService;
@Autowired
private TaskLogService logService;
@Autowired
private AuthenticationUtils AuthenticationUtils;
@Autowired
......@@ -146,7 +144,7 @@ public class DeviceCheckController {
TaskBto provStatTask = new Task(CHECK_STAT_0.id, "省自动核查", 0, ".0.", CONFIRM_CHECK_STAT.id, provStat.getId(), provUnit.getUnitId())
.parse2Bto();
provStatTask.setInvolveUserIdList(Lists.newArrayList(-1));
provStatTask = taskService.start(provStatTask).parse2Bto();
provStatTask = taskService.start(provStatTask);
resultIds.get("taskId").add(provStatTask.getId());
List<CheckDeviceStatVo> statVoList = new ArrayList<>();
......@@ -172,7 +170,7 @@ public class DeviceCheckController {
TaskBto cityStatTask = new Task(CHECK_STAT_0.id, cityUnit.getName() + "自动核查统计", provStatTask.getId(), addNode(provStatTask.getNodeIdDetail(), provinceStatDo.getId()), CONFIRM_CHECK_STAT.id, cityStat.getId(), cityUnit.getUnitId())
.parse2Bto();
cityStatTask.setInvolveUserIdList(Lists.newArrayList(-1));
cityStatTask = taskService.start(cityStatTask).parse2Bto();
cityStatTask = taskService.start(cityStatTask);
resultIds.get("taskId").add(cityStatTask.getId());
// 构建市自查账单
......@@ -194,7 +192,7 @@ public class DeviceCheckController {
statVoList.addAll(cityStatVoList);
// 构建市自查TASK
TaskBto cityDetailTask = new TaskBto(CHECK_DETAIL_0.id, cityUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, cityDetail.getId(), cityUnit.getUnitId(), 0);
cityDetailTask = taskService.start(cityDetailTask).parse2Bto();
cityDetailTask = taskService.start(cityDetailTask);
resultIds.get("taskId").add(cityDetailTask.getId());
// 构建县任务
......@@ -219,7 +217,7 @@ public class DeviceCheckController {
//构建县自查TASK
TaskBto countyDetailTask = new TaskBto(CHECK_DETAIL_0.id, countyUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, countyDetail.getId(), countyUnit.getUnitId(), 0);
countyDetailTask = taskService.start(countyDetailTask).parse2Bto();
countyDetailTask = taskService.start(countyDetailTask);
resultIds.get("taskId").add(countyDetailTask.getId());
}
......@@ -324,7 +322,7 @@ public class DeviceCheckController {
provStatTask.getInvolveUserIdList().add(AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
provStatTask.getInvolveUserIdList().add(-1);
provStatTask.setCurrentPoint(1);
provStatTask = taskService.start(provStatTask).parse2Bto();
provStatTask = taskService.start(provStatTask);
// 3 构建被查单位的 自查账单 与 自查任务
// 获取所有在库装备与不在库装备
......@@ -378,7 +376,6 @@ public class DeviceCheckController {
TaskBto currentTask = taskService.get(id, CONFIRM_CHECK_DETAIL.id);
currentTask.getInvolveUserIdList().set(0, AuthenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
taskService.moveToNext(currentTask, assignUserId);
logService.addLog(new TaskLogBto(currentTask.getId(), "A岗核查成功"));
log.info("[核查模块] A岗核查操作成功");
return ResponseEntity.ok(new ResultObj("专管员A操作成功"));
}
......@@ -418,17 +415,14 @@ public class DeviceCheckController {
detailRepo.updateCheckStatus(id, checkStatus);
if (userAId > 0 && userBId > 0) {
currentTask = taskService.moveToNext(currentTask, checkUserAId);
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核成功,等待核查组确认"));
} else {
// 如果是2流程的，则直接结束该任务
taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核成功"));
}
} else {
//不通过则回到第一阶段
StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus());
taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId());
logService.addLog(new TaskLogBto(currentTask.getId(), "B岗审核失败，跳回A岗人员操作"));
}
log.info("[核查模块] 专管员B操作成功");
......@@ -450,7 +444,6 @@ public class DeviceCheckController {
return ResponseEntity.status(400).body(new ResultObj(String.format("当前任务的状态异常！当前任务状态为 %s , 任务状态应该为 %s", GlobalMap.getStatusEnumMap().get(currentTask.getBillStatus()), CHECK_DETAIL_2.name)));
}
currentTask = taskService.moveToNext(currentTask, currentDetail.getCheckUserBId());
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组A审核成功"));
log.info("[核查模块] C 操作完毕");
} else if (currentTask.getBillStatus() % 10 == 3) {
if (!currentTask.getBillStatus().equals(CHECK_DETAIL_3.id)) {
......@@ -460,7 +453,6 @@ public class DeviceCheckController {
// 如果当前是第4步，则直接结束任务,并且进行结果汇总
log.info("[核查模块] D 检查组成员A正在进行核查操作，核查详情账单id为 : {}", id);
currentTask = taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组B审核成功"));
// 任务结束后需要将当前城市的统计信息汇总上去
Units units = unitsRepo.findById(currentTask.getOwnUnit()).get();
int level = units.getLevel();
......@@ -485,7 +477,6 @@ public class DeviceCheckController {
//如果上一个id是-1 则证明是所有人的跟踪统计，即自动核查，那么下一步推进到所有人的待办
Integer lastUserId = fatherTask.getLastUserId() == -1 ? 0 : fatherTask.getLastUserId();
TaskBto statTask = taskService.moveToNext(fatherTask, lastUserId);
logService.addLog(new TaskLogBto(statTask.getId(), "地区数据已统计完毕，等待确认", new ArrayList<>(), fatherTask.getFirstUserId()));
}
log.info("[核查模块] D 操作完毕");
}
......@@ -494,7 +485,6 @@ public class DeviceCheckController {
// 如果没通过则返回第1步
StatusEnum firstStatus = getFirstStatus(currentTask.getBillStatus());
currentTask = taskService.moveToSpecial(currentTask, firstStatus, currentTask.getFirstUserId());
logService.addLog(new TaskLogBto(currentTask.getId(), "核查组B审核未过，返回到初始状态"));
}
return ResponseEntity.ok(new ResultObj("操作成功"));
......@@ -511,7 +501,6 @@ public class DeviceCheckController {
//将当前的统计task完结
TaskBto currentTask = taskService.get(statId, CONFIRM_CHECK_STAT.id);
currentTask = taskService.moveToEnd(currentTask);
logService.addLog(new TaskLogBto(currentTask.getId(), "地区数据已统计完毕，等待确认"));
//如果有上级统计任务 则累加当前地区数据
Integer parentTaskId = currentTask.getParentTaskId();
......@@ -528,7 +517,6 @@ public class DeviceCheckController {
if (allOver) {
log.info("[核查任务] 所有市的核查统计任务已经完毕，推进省级的核查统计任务");
TaskBto statTask = taskService.moveToNext(parentTask, 0);
logService.addLog(new TaskLogBto(statTask.getId(), "省级统计任务状态推进"));
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论