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 a894bc68..4e936326 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,9 @@ 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..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,9 +9,12 @@ 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; import com.lz.modules.flow.service.FlowStartService; import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.req.AssessDetailReq; @@ -54,6 +57,8 @@ public class ChartResultServiceImpl implements ChartResultService { private FlowStartMapper flowStartMapper; @Autowired private DepartmentsService departmentsService; + @Autowired + private FlowChartService flowChartService; @Override @@ -190,19 +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()); } - for(ResultFlowProcessEnum flowProcessEnum:ResultFlowProcessEnum.values()){ + List charts = flowChartService.selectFlowChartByFlowManagerId(1L); + + for(FlowChart chart:charts){ ChartStatistical statistical = new ChartStatistical(); - statistical.setDesc(flowProcessEnum.getDesc()); + statistical.setDesc(chart.getName()); statistical.setNum(0); - statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus())); - Object o = map.get(flowProcessEnum.getDesc()); + 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); } + return data; } 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);