合并分支 'dev_foton_DBQ' 到 'fix_foton'

Dev foton dbq

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!15

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -284,6 +284,13 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/queryTaskFirst",method = RequestMethod.GET)
     BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId);
 
+    /**
+     * 查询指定任务(此接口暂无调用)
+     * @param prcId
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/queryTaskIndex",method = RequestMethod.GET)
+    BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds);
     /**
      * 查询草稿
      * @param taskCommonQuery
@@ -355,6 +362,9 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET)
     List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu);
 
+    @RequestMapping(value = "/bat-wkflow/task/get_gather_by_instance",method = RequestMethod.GET)
+    List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu);
+
     /**
      * @Author yuzhong
      * 获取图片
@@ -441,6 +451,8 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/inboundLiaisonDetailForXZYQ",method = RequestMethod.GET)
     BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds);
 
+    @RequestMapping(value = "/bat-wkflow/decodeDetail",method = RequestMethod.GET)
+    BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId);
 
     @RequestMapping(value = "/bat-wkflow/queryBusProcessNameForEnd",method = RequestMethod.POST)
     List<BusProcessName> queryBusProcessNameForEnd(@RequestBody String taskId);

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

@@ -14,6 +14,8 @@ import com.adc.da.workFlow.entity.ProcessRollBackEO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
@@ -303,6 +305,9 @@ public class workFlowFeignClientImpl {
     public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId){
         return workFlowFeignClient.queryTaskFirst(bpnId);
     }
+    public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){
+        return workFlowFeignClient.queryTaskIndex(prcId,taskIds);
+    }
 
     public List<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){
         List<BusProcessName> busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery);
@@ -340,7 +345,9 @@ public class workFlowFeignClientImpl {
     public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
         return  workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
     }
-
+    public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
+        return  workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu);
+    }
     public byte[] getImg(@RequestParam("prcNum")String prcNum){
         return workFlowFeignClient.getImg(prcNum);
     }
@@ -393,6 +400,9 @@ public class workFlowFeignClientImpl {
     public  BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds){
         return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds);
     }
+    public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pId")String pId){
+        return workFlowFeignClient.decodeDetail(taskIds,pId);
+    }
     public List<BusProcessName> queryBusProcessNameForEnd(@RequestBody String prcNum){
         return workFlowFeignClient.queryBusProcessNameForEnd(prcNum);
     }

adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java

@@ -1,12 +1,15 @@
 package com.adc.da.common;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -46,6 +49,43 @@ public class BusProcessNew {
 
     private String finishFlag;
 
+    @ApiModelProperty(value = "审批意见")
+                                                                                                                                                                                                                                                                                                                                                    @TableField("COMMIT_FLAG")
+    private String commitFlag;
+
+    @ApiModelProperty(value = "审批意见")
+    @TableField("COMMIT_TEXT")
+    private String commitText;
+
+    @ApiModelProperty(value = "子流程ID")
+    @TableField("SUB_ID")
+    private String subId;
+
+    @ApiModelProperty(value = "流程名称")
+    @TableField("PRC_NAME")
+    private String prcName;
+
+    @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "OA link")
+    private String link;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "干活任务截止时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String endTime;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "任务状态 0 默认 1 审批任务 2 干活任务")
+    private int taskStatus;
+
     private long commitStatus;
 
     @TableField( exist = false)

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -619,6 +619,12 @@ public class WorkFlowController {
         return workFlowFeignClient.queryTaskFirst(bpnId);
     }
 
+    @ApiOperation(value = "查询taskid任务")
+    @GetMapping("/queryTaskIndex")
+    public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){
+        return workFlowFeignClient.queryTaskIndex(prcId,taskIds);
+    }
+
     @ApiOperation(value = "查询草稿")
     @PostMapping("/queryTaskDraft")
     public PageInfo<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){
@@ -734,6 +740,12 @@ public class WorkFlowController {
         return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
     }
 
+    @ApiOperation(value = "流程实例汇总列表")
+    @GetMapping("/get_gather_by_instance")
+    public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
+        return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu);
+    }
+
     @ApiOperation(value = "获取图片")
     @GetMapping("/getImg")
     public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException {
@@ -877,6 +889,12 @@ public class WorkFlowController {
         return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds);
     }
 
+    @ApiOperation(value = "标准解读流程汇总详情")
+    @GetMapping("/decodeDetail")
+    public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId){
+        return workFlowFeignClient.decodeDetail(taskIds,pId);
+    }
+
     @ApiOperation(value = "采购保存接口")
     @PostMapping("/saveCgSq")
     public Wrapper<String> saveCgSq(BusMes busMes) {