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:
杜建超 2020-10-26 11:03:52 +08:00
commit 2a18e0b3a8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/controller/FlowChartController.java
View File

@ -67,7 +67,7 @@ public class FlowChartController {
for (FlowChartDetailRecord record:flowChartDetailRecords for (FlowChartDetailRecord record:flowChartDetailRecords
) { ) {
flowChartDetailRecordListDto.setStatus(dto.getStatus()); flowChartDetailRecordListDto.setStatus(record.getStatus());
FlowChartDetailRecordSimpleDto detailRecordSimpleDto = new FlowChartDetailRecordSimpleDto(); FlowChartDetailRecordSimpleDto detailRecordSimpleDto = new FlowChartDetailRecordSimpleDto();
BeanUtils.copyProperties(record, detailRecordSimpleDto); BeanUtils.copyProperties(record, detailRecordSimpleDto);
@ -150,12 +150,14 @@ public class FlowChartController {
flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId()); flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId());
flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId());
flowChartDetailRecord.setStepIndex(index); flowChartDetailRecord.setStepIndex(index);
flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus());
if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){
updaes.add(flowChartDetailRecord); updaes.add(flowChartDetailRecord);
}else{ }else{
inserts.add(flowChartDetailRecord); inserts.add(flowChartDetailRecord);
} }
if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){
//本节点没有删除，那么顺序++
index++; index++;
} }

2
src/main/java/com/lz/modules/performance/controller/FlowStartController.java
View File

@ -269,8 +269,8 @@ public class FlowStartController {
flowApprovalRoles.add(flowApprovalRole); flowApprovalRoles.add(flowApprovalRole);
flowApprovalRole.setStepIndex(stepIndex); flowApprovalRole.setStepIndex(stepIndex);
} }
stepIndex++;
} }
stepIndex++;
}else{ }else{
String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); String[] roleIds = flowChartDetailRecord.getRoleIds().split(",");
for (String roleId:roleIds for (String roleId:roleIds

2
src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
View File

@ -110,7 +110,7 @@
</update> </update>
<select id="selectFlowChartDetailRecordByGroupIdAndChartId" resultType="FlowChartDetailRecord" > <select id="selectFlowChartDetailRecordByGroupIdAndChartId" resultType="FlowChartDetailRecord" >
select * from lz_flow_chart_detail_record where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index desc select * from lz_flow_chart_detail_record where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index asc
</select> </select>
<select id="selectFlowChartDetailRecordByGroupId" resultType="FlowChartDetailRecord" > <select id="selectFlowChartDetailRecordByGroupId" resultType="FlowChartDetailRecord" >