wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-10-28 11:38:19 +08:00
parent 3c3b3707d5
commit 7e4896db90
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java
View File

@ -42,4 +42,5 @@ public interface FlowChartMapper extends BaseMapper<FlowChart> {
List<FlowChartDto> selectFlowChartDtoByFlowManagerId(Long id); List<FlowChartDto> selectFlowChartDtoByFlowManagerId(Long id);
List<FlowChart> selectFlowChartsByGroupId(Long groupId); List<FlowChart> selectFlowChartsByGroupId(Long groupId);
} }

3
src/main/java/com/lz/modules/performance/res/ChartStatistical.java
View File

@ -18,5 +18,8 @@ public class ChartStatistical {
@ApiModelProperty(value = "状态",name = "flowProcess") @ApiModelProperty(value = "状态",name = "flowProcess")
private Long flowProcess; private Long flowProcess;
@ApiModelProperty(value = "提示",name = "tip")
private String tip;
} }

15
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.lz.modules.app.service.StaffService;
import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.dao.FlowStartMapper;
import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.entity.FlowStart;
import com.lz.modules.flow.service.EvaluationGroupService; 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.flow.service.FlowStartService;
import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.enums.ResultFlowProcessEnum;
import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.AssessDetailReq;
@ -192,11 +193,25 @@ public class ChartResultServiceImpl implements ChartResultService {
for(ChartStatistical statistical:process){ for(ChartStatistical statistical:process){
map.put(ResultFlowProcessEnum.getDesc(Integer.valueOf(statistical.getDesc())),statistical.getNum()); map.put(ResultFlowProcessEnum.getDesc(Integer.valueOf(statistical.getDesc())),statistical.getNum());
} }
List<FlowStart> starts = flowStartMapper.selectList(new QueryWrapper<FlowStart>().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()){ for(ResultFlowProcessEnum flowProcessEnum:ResultFlowProcessEnum.values()){
ChartStatistical statistical = new ChartStatistical(); ChartStatistical statistical = new ChartStatistical();
statistical.setDesc(flowProcessEnum.getDesc()); statistical.setDesc(flowProcessEnum.getDesc());
statistical.setNum(0); statistical.setNum(0);
statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus())); statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus()));
Object o = map.get(flowProcessEnum.getDesc()); Object o = map.get(flowProcessEnum.getDesc());
if(o!=null){ if(o!=null){
statistical.setNum(Integer.valueOf(o.toString())); statistical.setNum(Integer.valueOf(o.toString()));