feat: There is no way the,
This commit is contained in:
@@ -37,6 +37,15 @@ public interface workFlowFeignClient {
|
|||||||
@RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET)
|
@RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET)
|
||||||
BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId);
|
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)
|
@RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET)
|
||||||
List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
|
List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,21 @@ public class workFlowFeignClientImpl {
|
|||||||
return stringWrapper;
|
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){
|
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
||||||
List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
|
List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
|
||||||
return stringWrapper;
|
return stringWrapper;
|
||||||
|
|||||||
@@ -170,6 +170,24 @@ public class WorkFlowController {
|
|||||||
return workFlowFeignClient.processModelHisOne(pid,taskId);
|
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 = "查询流程父节点所有评分")
|
@ApiOperation(value = "查询流程父节点所有评分")
|
||||||
@GetMapping("/evaluationHisList")
|
@GetMapping("/evaluationHisList")
|
||||||
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
||||||
|
|||||||
+3
-1
@@ -86,5 +86,7 @@ public class BusProcessEvaluationHis implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String downLoadUrl;
|
private String downLoadUrl;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "处理人姓名")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String userName;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -290,7 +290,7 @@ public class ActSarItemsBussEOService {
|
|||||||
|
|
||||||
// 按 相同数据分组
|
// 按 相同数据分组
|
||||||
listMap = evaluationHisFilter.stream().collect(
|
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<>();
|
List<QualityEvaluation> evaluations = new ArrayList<>();
|
||||||
if(!listMap.isEmpty()){
|
if(!listMap.isEmpty()){
|
||||||
|
|||||||
Reference in New Issue
Block a user