Merge branch 'develop_master' into FOTON

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<String> completeTaskByUserId(@RequestBody BusMes busMes);
 
+    @RequestMapping(value = "/bat-wkflow/completeTaskNew",method = RequestMethod.POST)
+    Wrapper<String> completeTaskByUserIdNew(@RequestBody BusMesSpecial busMes);
+
     @RequestMapping(value = "/bat-wkflow/saveTask",method = RequestMethod.POST)
     public Wrapper<String> saveTask(@RequestBody BusMes busMes);
 

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -174,6 +174,11 @@ public class workFlowFeignClientImpl {
         return  stringWrapper;
     }
 
+    public  Wrapper<String> completeTaskByUserIdNew( BusMesSpecial busMes){
+        Wrapper<String> stringWrapper = workFlowFeignClient.completeTaskByUserIdNew(busMes);
+        return  stringWrapper;
+    }
+
     public Wrapper<String> saveTask(@RequestBody BusMes busMes){
         Wrapper<String> stringWrapper = workFlowFeignClient.saveTask(busMes);
         return stringWrapper;

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; }
+}

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<String> completeTaskByUserIdNew( BusMesSpecial busMes){
+        Wrapper<String> str = workFlowFeignClient.completeTaskByUserIdNew(busMes);
+        if(str.getCode() == 500){
+            str.setSuccess(false);
+        }
+        return str;
+    }
+
     @ApiOperation(value = "保存标准入库流程")
     @PostMapping("/saveinboundTask")
     public  Wrapper<String> saveinboundTask(BusMes busMes){

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<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH).subList(0,100);
+        List<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH);
         HashMap<String, Integer> replaceIdCountMap = new HashMap<>();
 
 
@@ -270,9 +270,9 @@ public class ScheduledJob {
 
                             List<String> 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);