Skip to content

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

[日志]新增日志,[任务模块]修改部分代码

上级 253e80a2
隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 24 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ bb8245b1
...@@ -32,7 +32,7 @@ public enum LogType { ...@@ -32,7 +32,7 @@ public enum LogType {
ALLOT_1(7,ALLOT.id, ALLOT_DRAFT.id, ALLOTING.id, "对(%receiveUnit)发起配发"), ALLOT_1(7,ALLOT.id, ALLOT_DRAFT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
// ALLOT_2(8,ALLOT.id, ORIGIN_STATUS.id, ALLOT_DRAFT.id, "保存配发草稿"), // ALLOT_2(8,ALLOT.id, ORIGIN_STATUS.id, ALLOT_DRAFT.id, "保存配发草稿"),
ALLOT_2(8,ALLOT.id, ORIGIN_STATUS.id, ALLOT_DRAFT.id, "配发盖章申请"), ALLOT_2(8,ALLOT.id, ORIGIN_STATUS.id, ALLOT_DRAFT.id, "保存配发草稿"),
ALLOT_3(9,ALLOT.id, ALLOT_DRAFT.id, ARCHIVE.id, "删除配发草稿"), ALLOT_3(9,ALLOT.id, ALLOT_DRAFT.id, ARCHIVE.id, "删除配发草稿"),
...@@ -336,14 +336,16 @@ public enum LogType { ...@@ -336,14 +336,16 @@ public enum LogType {
ALLOT_25(149,ALLOT.id,ALLOT_DRAFT.id,ALLOT_DRAFT.id,"申请电子签章被拒绝"), ALLOT_25(149,ALLOT.id,ALLOT_DRAFT.id,ALLOT_DRAFT.id,"申请电子签章被拒绝"),
ALLOT_26(150,ALLOT.id,SIGN_WAIT_CONFIRM.id,ARCHIVE.id,"该业务已经被撤回"), ALLOT_26(150,ALLOT.id,SIGN_WAIT_CONFIRM.id,ARCHIVE.id,"该业务已经被撤回"),
ALLOT_27(151,REPAIR_BACK.id,ORIGIN_STATUS.id,WAIT_UPLOAD_BACK_SEND_FILE.id,"等待上传回执单"), ALLOT_27(151,REPAIR_BACK.id,ORIGIN_STATUS.id,WAIT_UPLOAD_BACK_SEND_FILE.id,"等待上传回执单"),
ALLOT_28(157,ALLOT.id,ALLOTING.id,REVOKEALLOTTASK.id,"该业务已经被撤回"),
REPAIR_BACK_24(152,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"同意签章审核"), REPAIR_BACK_24(152,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"同意签章审核"),
REPAIR_BACK_25(153,REPAIR_BACK.id,WAIT_BACK_RECEIVE.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,"等待签章审核"), REPAIR_BACK_25(153,REPAIR_BACK.id,WAIT_BACK_RECEIVE.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,"等待签章审核"),
REPAIR_BACK_26(154,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"等待签章审核"), REPAIR_BACK_26(154,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"等待签章审核"),
REPAIR_BACK_27(155,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_BACK_RECEIVE.id,"等待签章审核"), REPAIR_BACK_27(155,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_BACK_RECEIVE.id,"等待签章审核"),
REPAIR_BACK_28(156,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_UPLOAD_BACK_FILE.id,"等待上传相关单据"), REPAIR_BACK_28(156,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_UPLOAD_BACK_FILE.id,"等待上传相关单据"),
ALLOT_28(157,ALLOT.id,ALLOTING.id,REVOKEALLOTTASK.id,"该业务已经被撤回"),
; ALLOT_29(158,ALLOT.id,WAIT_UPLOAD_ALLOT_FILE.id,REVOKEALLOTTASK.id,"该业务已经被撤回"),
REPAIR_SEND_24(159,REPAIR.id, WAIT_RECEIVE.id, REPAIR_SEND_SIGN_WAIT_CONFIRM.id, "申请电子签章审核"),
REPAIR_SEND_25(160,REPAIR.id, ORIGIN_STATUS.id, REPAIR_SEND_DRAFT.id, "等待出库"),
REPAIR_BACK_30(161,REPAIR_BACK.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, REPAIR_BACK_DRAFT.id, "拒绝签章"),;
public Integer id; public Integer id;
......
dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java
浏览文件 @ bb8245b1
...@@ -363,11 +363,9 @@ public class TaskController { ...@@ -363,11 +363,9 @@ public class TaskController {
//语句 //语句
return ResponseEntity.ok(repair(taskLogUserVos,billStatus)); return ResponseEntity.ok(repair(taskLogUserVos,billStatus));
case 17: case 17:
return ResponseEntity.ok(destructionAndScrap(taskLogUserVos,billStatus));
case 14: case 14:
case 23:
return ResponseEntity.ok(destructionAndScrap(taskLogUserVos,billStatus)); return ResponseEntity.ok(destructionAndScrap(taskLogUserVos,billStatus));
case 23:
return ResponseEntity.ok(destructionAndScrap(taskLogUserVos,billStatus));
default : //可选 default : //可选
return ResponseEntity.ok(defaults(taskLogUserVos)); return ResponseEntity.ok(defaults(taskLogUserVos));
} }
...@@ -395,7 +393,12 @@ public class TaskController { ...@@ -395,7 +393,12 @@ public class TaskController {
if (taskLogUserVo.getOldStatus() == 340){ if (taskLogUserVo.getOldStatus() == 340){
if (map.containsKey("340")){ if (map.containsKey("340")){
map.put("340j",taskLogUserVo.getUser()); if (billStatus == 302 || billStatus == 340){
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
} else {
map.put("340j",taskLogUserVo.getUser());
}
}else { }else {
//存在 配发中 //存在 配发中
if (map.containsKey("302")){ if (map.containsKey("302")){
...@@ -407,10 +410,20 @@ public class TaskController { ...@@ -407,10 +410,20 @@ public class TaskController {
map.put("340",taskLogUserVo.getUser()); map.put("340",taskLogUserVo.getUser());
} }
} }
if (billStatus == 302 && map.containsKey("340j")){
map.remove("340j");
}
} }
} else { } else {
//0 333 //0 333
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
if (billStatus == 333 && map.containsKey("340")){
map.remove("340");
}
if (billStatus == 340 && map.containsKey("340") && !map.containsKey("302") && taskLogUserVo.getOldStatus()!=341){
map.remove("340");
}
} }
} }
...@@ -427,7 +440,11 @@ public class TaskController { ...@@ -427,7 +440,11 @@ public class TaskController {
if (taskLogUserVo.getOldStatus() == 930){ if (taskLogUserVo.getOldStatus() == 930){
if (map.containsKey("930")){ if (map.containsKey("930")){
map.put("930j",taskLogUserVo.getUser()); if (billStatus == 900 && billStatus == 930){
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}else {
map.put("930j",taskLogUserVo.getUser());
}
}else { }else {
//存在 //存在
if (map.containsKey("900")){ if (map.containsKey("900")){
...@@ -437,17 +454,21 @@ public class TaskController { ...@@ -437,17 +454,21 @@ public class TaskController {
map.clear(); map.clear();
}else { }else {
map.put("930",taskLogUserVo.getUser()); map.put("930",taskLogUserVo.getUser());
} }
} }
if (billStatus == 900 && map.containsKey("930j")){
map.remove("930j");
}
} }
}else { }else {
// if (billStatus == 922){ map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
// map.clear(); if (billStatus == 922 && map.containsKey("930")){
// }else{ map.remove("930");
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); }
// } if (billStatus == 930 && map.containsKey("930") && map.containsKey("900")){
map.remove("930");
}
} }
} }
...@@ -462,7 +483,11 @@ public class TaskController { ...@@ -462,7 +483,11 @@ public class TaskController {
if (taskLogUserVo.getOldStatus() == 790){ if (taskLogUserVo.getOldStatus() == 790){
if (map.containsKey("790")){ if (map.containsKey("790")){
map.put("790j",taskLogUserVo.getUser()); if (billStatus == 701 && map.containsKey("790"))
map.remove("790");
else {
map.put("790j",taskLogUserVo.getUser());
}
}else { }else {
//存在 //存在
if (map.containsKey("703")){ if (map.containsKey("703")){
...@@ -474,16 +499,25 @@ public class TaskController { ...@@ -474,16 +499,25 @@ public class TaskController {
map.put("790",taskLogUserVo.getUser()); map.put("790",taskLogUserVo.getUser());
} }
} }
if (billStatus == 701 && map.containsKey("790j")){
map.remove("790j");
}
} }
}else { }else {
if (taskLogUserVo.getOldStatus() == 791){ if (taskLogUserVo.getOldStatus() == 791){
if (map.containsKey("791") && map.containsKey("790j")){ if (map.containsKey("791") && billStatus == 701){
map.remove("791");
}else if (map.containsKey("791") && map.containsKey("790j")){
map.put("791j",taskLogUserVo.getUser()); map.put("791j",taskLogUserVo.getUser());
}else { }else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
} }
}else { }else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
if (billStatus == 790 && map.containsKey("790")){
map.remove("790");
}
} }
} }
} }
...@@ -493,36 +527,48 @@ public class TaskController { ...@@ -493,36 +527,48 @@ public class TaskController {
} }
private Map<String, String> repairBack(List<TaskLogUserVo> taskLogUserVos,Integer billStatus){ private Map<String, String> repairBack(List<TaskLogUserVo> taskLogUserVos,Integer billStatus){
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) { for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){ if (taskLogUserVo.getOldStatus()!=null){
if (taskLogUserVo.getOldStatus() == 820){ if (taskLogUserVo.getOldStatus() == 820){
if (map.containsKey("820")){ if (map.containsKey("820")){
map.put("820j",taskLogUserVo.getUser()); if (billStatus == 801 && map.containsKey("820"))
map.remove("820");
else {
map.put("820j",taskLogUserVo.getUser());
}
}else { }else {
//存在 //存在
if (map.containsKey("801")){ if (map.containsKey("801")){
map.put("820j",taskLogUserVo.getUser()); map.put("820",taskLogUserVo.getUser());
}else { }else {
if (billStatus == 888 && taskLogUserVo.getOldStatus() == 820){ if (billStatus == 888 && taskLogUserVo.getOldStatus() == 820){
map.clear(); map.clear();
}else { }else {
map.put("820",taskLogUserVo.getUser()); map.put("820",taskLogUserVo.getUser());
} }
} }
if (billStatus == 801 && map.containsKey("820j")){
map.remove("820j");
}
} }
}else { }else {
if (taskLogUserVo.getOldStatus() == 821){ if (taskLogUserVo.getOldStatus() == 821){
if (map.containsKey("821") && map.containsKey("820j")){ if (map.containsKey("821") && billStatus == 801){
map.remove("821");
}else if (map.containsKey("821") && map.containsKey("821j")){
map.put("821j",taskLogUserVo.getUser()); map.put("821j",taskLogUserVo.getUser());
}else { }else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
} }
}else { }else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
if (billStatus == 820 && map.containsKey("820")){
map.remove("820");
}
} }
} }
} }
...@@ -532,13 +578,61 @@ public class TaskController { ...@@ -532,13 +578,61 @@ public class TaskController {
} }
// private Map<String, String> repairBack(List<TaskLogUserVo> taskLogUserVos,Integer billStatus){
// Map<String, String> map = new HashMap<>();
// for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
// if (taskLogUserVo.getOldStatus()!=null){
//
// if (taskLogUserVo.getOldStatus() == 820){
// if (billStatus == 801 && map.containsKey("820")){
// map.remove("820");
// }else if (map.containsKey("820")){
// map.put("820j",taskLogUserVo.getUser());
// }else {
// //存在
// if (map.containsKey("801")){
// map.put("820j",taskLogUserVo.getUser());
// }else {
// if (billStatus == 888 && taskLogUserVo.getOldStatus() == 820){
// map.clear();
// }else {
// map.put("820",taskLogUserVo.getUser());
//
// }
// if (billStatus == 801 && map.containsKey("820j")){
// map.remove("820j");
// }
// }
// }
// }else {
// if (taskLogUserVo.getOldStatus() == 821){
// if (map.containsKey("821") && billStatus == 801){
// map.remove("821");
// }else if (map.containsKey("821") && map.containsKey("820j")){
// map.put("821j",taskLogUserVo.getUser());
// }else {
// map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
// }
// }else {
// map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
// if (billStatus == 820 && map.containsKey("820")){
// map.remove("820");
// }
// }
// }
// }
//
// }
// return map;
//
// }
private Map<String, String> defaults(List<TaskLogUserVo> taskLogUserVos){ private Map<String, String> defaults(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) { for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){ if (taskLogUserVo.getOldStatus()!=null){
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser()); map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
} }
} }
return map; return map;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论