From a17ba44ad9321d9d2f338dafeac5f05cd62f6051 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:25:02 +0800 Subject: [PATCH 1/4] fix --- .../java/com/lz/modules/performance/res/ChartStatistical.java | 2 ++ 1 file changed, 2 insertions(+) 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 a894bc68..32bfc0d6 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java @@ -17,4 +17,6 @@ public class ChartStatistical { @ApiModelProperty(value = "状态",name = "flowProcess") private Long flowProcess; + + } \ No newline at end of file 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 2/4] 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())); From e0f0a3cc52ad0d2056e4f5c4f33efc00f3196e22 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 28 Oct 2020 14:39:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 680f395f..599b258e 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1100,7 +1100,7 @@ public class ResultRecordServiceImpl extends ServiceImpl flowDetailRespList = new ArrayList<>(); mySetFlowDetailRespList(flowDetailRespList,flowRecord); From a350640b396546a93281b9ef76f3edbf89127a0d 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 14:55:00 +0800 Subject: [PATCH 4/4] fix --- .../service/impl/ChartResultServiceImpl.java | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) 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 294470b1..78d819c5 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 @@ -9,7 +9,9 @@ import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.dao.FlowChartMapper; import com.lz.modules.flow.dao.FlowStartMapper; +import com.lz.modules.flow.entity.FlowChart; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowChartService; @@ -55,6 +57,8 @@ public class ChartResultServiceImpl implements ChartResultService { private FlowStartMapper flowStartMapper; @Autowired private DepartmentsService departmentsService; + @Autowired + private FlowChartService flowChartService; @Override @@ -191,33 +195,23 @@ public class ChartResultServiceImpl implements ChartResultService { data.add(all); for(ChartStatistical statistical:process){ - map.put(ResultFlowProcessEnum.getDesc(Integer.valueOf(statistical.getDesc())),statistical.getNum()); + map.put(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())); + List charts = flowChartService.selectFlowChartByFlowManagerId(1L); - Object o = map.get(flowProcessEnum.getDesc()); + for(FlowChart chart:charts){ + ChartStatistical statistical = new ChartStatistical(); + statistical.setDesc(chart.getName()); + statistical.setNum(0); + statistical.setFlowProcess(Long.valueOf(chart.getFlowProcess())); + statistical.setTip(chart.getDesc()); + Object o = map.get(chart.getFlowProcess() + StringUtil.EMPTY); 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())); - } - data.add(statistical); - } return data; }