Merge remote-tracking branch 'origin/develop_master' into develop_master

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

@@ -37,6 +37,15 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET)
     BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId);
 
+    @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListByOne",method = RequestMethod.GET)
+    BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo);
+
+    @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListRepSum",method = RequestMethod.GET)
+    Map<String,Integer> evaluationHisListRepSum(@RequestParam("pid") String pid);
+
+    @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisListRep",method = RequestMethod.GET)
+    List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid);
+
     @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET)
     List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
 

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

@@ -55,6 +55,21 @@ public class workFlowFeignClientImpl {
         return stringWrapper;
     }
 
+    public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){
+        BusProcessEvaluationHis stringWrapper = workFlowFeignClient.evaluationHisListByOne(pid,taskInfo);
+        return stringWrapper;
+    }
+
+    public Map<String,Integer> evaluationHisListRepSum(@RequestParam("pid") String pid){
+        Map<String,Integer> stringWrapper = workFlowFeignClient.evaluationHisListRepSum(pid);
+        return stringWrapper;
+    }
+
+    public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid){
+        List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisListRep(pid);
+        return stringWrapper;
+    }
+
     public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
         List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
         return stringWrapper;

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

@@ -170,6 +170,24 @@ public class WorkFlowController {
         return  workFlowFeignClient.processModelHisOne(pid,taskId);
     }
 
+    @ApiOperation(value = "根据pid 节点信息查询")
+    @GetMapping("/evaluationHisListByOne")
+    public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){
+        return  workFlowFeignClient.evaluationHisListByOne(pid,taskInfo);
+    }
+
+    @ApiOperation(value = "查询流程父节点所有评分(去重)返回节点评分总数")
+    @GetMapping("/evaluationHisListRepSum")
+    public Map<String,Integer> evaluationHisListRepSum(@RequestParam("pid") String pid){
+        return  workFlowFeignClient.evaluationHisListRepSum(pid);
+    }
+
+    @ApiOperation(value = "查询流程父节点所有评分(去重)")
+    @GetMapping("/evaluationHisListRep")
+    public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid){
+        return  workFlowFeignClient.evaluationHisListRep(pid);
+    }
+
     @ApiOperation(value = "查询流程父节点所有评分")
     @GetMapping("/evaluationHisList")
     public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){

adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java

@@ -86,5 +86,7 @@ public class BusProcessEvaluationHis implements Serializable {
     @TableField(exist = false)
     private String downLoadUrl;
 
-
+    @ApiModelProperty(value = "处理人姓名")
+    @TableField(exist = false)
+    private String userName;
 }

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java

@@ -290,7 +290,7 @@ public class ActSarItemsBussEOService {
 
             // 按 相同数据分组
             listMap = evaluationHisFilter.stream().collect(
-                    Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo())));
+                    Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId())));
 
             List<QualityEvaluation> evaluations = new ArrayList<>();
             if(!listMap.isEmpty()){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -210,6 +210,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
 
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoProcessMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
+
     @TableField(exist = false)
     private String sarStandAttrEOStr; //新增修改时属性表信息
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -1105,6 +1105,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                             value = sysInfoEOService.getRoleNamesByIds(value);
                             newMap.put(name + "Name",value);
                         }
+                    }else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && !InitStandAttrUtil.fileFieldListBuss.isEmpty() && InitStandAttrUtil.fileFieldListBuss.contains(entry.getKey())) {
+                        String value = entry.getValue().toString();
+                        if (StringUtils.isNotBlank(value)) {
+                            List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
+                            if(!fileObj.isEmpty()){
+                                String oldFileName = fileObj.stream().map(AttFileEO::getOldFileName).collect(Collectors.joining(","));
+                                newMap.put(name + "Name", oldFileName);
+                            }
+                        }
                     }
                 }
                 getAttrMap.putAll(newMap);