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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-10-28 17:32:22 +08:00
commit 79a83dfa9e
4 changed files with 21 additions and 6 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<FlowChart> selectFlowChartsByGroupId(Long groupId);
}

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

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

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

@ -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<FlowChart> 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;
}

2
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -1100,7 +1100,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
FlowRecordResp resp = new FlowRecordResp();
resp.setFlowName(flowRecord.getFlowName());
resp.setStaffName(flowRecord.getApprovalStaffName());
resp.setStatus(flowRecord.getStatus());
resp.setStatus(flowRecord.getStatus() == 2 ? 1 : flowRecord.getStatus());
List<FlowDetailResp> flowDetailRespList = new ArrayList<>();
mySetFlowDetailRespList(flowDetailRespList,flowRecord);