From 7e4896db90c246b183807a5f5cb1298e06ecb8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 28 Oct 2020 11:38:19 +0800 Subject: [PATCH] fix --- .../com/lz/modules/flow/dao/FlowChartMapper.java | 1 + .../modules/performance/res/ChartStatistical.java | 3 +++ .../service/impl/ChartResultServiceImpl.java | 15 +++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java index 04a2f604..4dbb61ea 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java @@ -42,4 +42,5 @@ public interface FlowChartMapper extends BaseMapper { List selectFlowChartDtoByFlowManagerId(Long id); List selectFlowChartsByGroupId(Long groupId); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java index 32bfc0d6..4e936326 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java @@ -18,5 +18,8 @@ public class ChartStatistical { @ApiModelProperty(value = "状态",name = "flowProcess") private Long flowProcess; + @ApiModelProperty(value = "提示",name = "tip") + private String tip; + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 3beeeca5..294470b1 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -12,6 +12,7 @@ import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.service.EvaluationGroupService; +import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowStartService; import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.req.AssessDetailReq; @@ -192,11 +193,25 @@ public class ChartResultServiceImpl implements ChartResultService { for(ChartStatistical statistical:process){ map.put(ResultFlowProcessEnum.getDesc(Integer.valueOf(statistical.getDesc())),statistical.getNum()); } + List starts = flowStartMapper.selectList(new QueryWrapper().eq("is_delete", 0)); + for(FlowStart start:starts){ + ChartStatistical statistical = new ChartStatistical(); + statistical.setDesc(start.getName()); + statistical.setNum(0); + statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus())); + + Object o = map.get(flowProcessEnum.getDesc()); + if(o!=null){ + statistical.setNum(Integer.valueOf(o.toString())); + } + data.add(statistical); + } for(ResultFlowProcessEnum flowProcessEnum:ResultFlowProcessEnum.values()){ ChartStatistical statistical = new ChartStatistical(); statistical.setDesc(flowProcessEnum.getDesc()); statistical.setNum(0); statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus())); + Object o = map.get(flowProcessEnum.getDesc()); if(o!=null){ statistical.setNum(Integer.valueOf(o.toString()));