From fdd30039160569d587de55045e9fffebacb7aa2e Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 27 Jan 2022 15:06:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 46aec11b..ee7bbaf9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -233,7 +233,7 @@ public class ScheduledJob { .eq("VALID_FLAG","0") .ne("DTBJH",""); //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 - List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH).subList(0,100); + List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); HashMap replaceIdCountMap = new HashMap<>(); From 90e2d27706247657d2802c12ee213d750ef9e8f1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 27 Jan 2022 16:22:02 +0800 Subject: [PATCH 2/3] containsKey --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index ee7bbaf9..48604a19 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -270,9 +270,9 @@ public class ScheduledJob { List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); if (standId.size() > 0) { - + boolean b = replaceIdCountMap.containsKey(standId.get(0)); //如果代替标准id已存在则映射为2不存在则添加并映射为1 - if (replaceIdCountMap.containsKey(standId)) { + if (b) { replaceIdCountMap.replace(standId.get(0), 2); } else { replaceIdCountMap.put(standId.get(0), 1); From b985a9933b8235e25a4a4e917b97a34986da6f7a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 7 Feb 2022 15:15:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 3 + .../workFlowFeignClientImpl.java | 5 + .../java/com/adc/da/common/BusMesSpecial.java | 142 ++++++++++++++++++ .../controller/WorkFlowController.java | 10 ++ 4 files changed, 160 insertions(+) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/common/BusMesSpecial.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 8ee5f7f2..458df83d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -85,6 +85,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); + @RequestMapping(value = "/bat-wkflow/completeTaskNew",method = RequestMethod.POST) + Wrapper completeTaskByUserIdNew(@RequestBody BusMesSpecial busMes); + @RequestMapping(value = "/bat-wkflow/saveTask",method = RequestMethod.POST) public Wrapper saveTask(@RequestBody BusMes busMes); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index e8dbc35d..833bd23d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -174,6 +174,11 @@ public class workFlowFeignClientImpl { return stringWrapper; } + public Wrapper completeTaskByUserIdNew( BusMesSpecial busMes){ + Wrapper stringWrapper = workFlowFeignClient.completeTaskByUserIdNew(busMes); + return stringWrapper; + } + public Wrapper saveTask(@RequestBody BusMes busMes){ Wrapper stringWrapper = workFlowFeignClient.saveTask(busMes); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusMesSpecial.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusMesSpecial.java new file mode 100644 index 00000000..252f46d5 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusMesSpecial.java @@ -0,0 +1,142 @@ +package com.adc.da.common; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BusMesSpecial { + + @ApiModelProperty(value = "用户id") + private String userId; + + @ApiModelProperty(value = "任务id") + private String taskId; + + @ApiModelProperty(value = "json") + private String json; + + @ApiModelProperty(value = "json") + private String specialJson; + + @ApiModelProperty(value = "任务ids") + private String taskIds; + + private String pId; + + private String prcType; + + private String createUser; + + private String createUserName; + + private String userName; + + private int size; + + private int current; + + private String id; + + private String nowStateType; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getJson() { + return json; + } + + public void setJson(String json) { + this.json = json; + } + + public String getTaskIds() { + return taskIds; + } + + public void setTaskIds(String taskIds) { + this.taskIds = taskIds; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getPrcType() { + return prcType; + } + + public void setPrcType(String prcType) { + this.prcType = prcType; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public int getCurrent() { + return current; + } + + public void setCurrent(int current) { + this.current = current; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNowStateType() { return nowStateType; } + + public void setNowStateType(String nowStateType) { this.nowStateType = nowStateType; } +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index becda6d0..0b534744 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -473,6 +473,16 @@ public class WorkFlowController { return str; } + @ApiOperation(value = "特殊完成任务节点 会更改草稿") + @PostMapping("/completeTaskNew") + public Wrapper completeTaskByUserIdNew( BusMesSpecial busMes){ + Wrapper str = workFlowFeignClient.completeTaskByUserIdNew(busMes); + if(str.getCode() == 500){ + str.setSuccess(false); + } + return str; + } + @ApiOperation(value = "保存标准入库流程") @PostMapping("/saveinboundTask") public Wrapper saveinboundTask(BusMes busMes){