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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-10-26 16:01:20 +08:00
parent 7044bebf95
commit d90ea0b15a
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/flow/dao/FlowMapper.java
View File

@ -33,5 +33,5 @@ public interface FlowMapper extends BaseMapper<Flow> {
int deleteFlowById(@Param("id")Long id); int deleteFlowById(@Param("id")Long id);
List<Flow> selectByFlowId(@Param("flowId") Long flowId); List<Flow> selectByFlowId(@Param("flowId") Long flowId, @Param("startId") Long startId);
} }

2
src/main/java/com/lz/modules/flow/service/FlowService.java
View File

@ -33,7 +33,7 @@ public interface FlowService extends IService<Flow> {
int deleteFlowById(Long id); int deleteFlowById(Long id);
List<Flow> selectByFlowId(Long flowId); List<Flow> selectByFlowId(Long flowId,Long startId);
FlowChart selectFlowChartByChartId(Long flowId); FlowChart selectFlowChartByChartId(Long flowId);
} }

4
src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java
View File

@ -66,8 +66,8 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements Fl
} }
@Override @Override
public List<Flow> selectByFlowId(Long flowId) { public List<Flow> selectByFlowId(Long flowId,Long startId) {
return flowMapper.selectByFlowId(flowId); return flowMapper.selectByFlowId(flowId,startId);
} }
@Override @Override

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

@ -245,7 +245,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
Map<String, FlowDepartment> staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p)); Map<String, FlowDepartment> staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p));
Long flowId = flowInfo.getFirst(); Long flowId = flowInfo.getFirst();
List<Flow> flows = flowService.selectByFlowId(flowId); List<Flow> flows = flowService.selectByFlowId(flowId,0l);
int flowIndex = lastFlowRecord != null ? lastFlowRecord.getFlowIndex() + 1 : 1; int flowIndex = lastFlowRecord != null ? lastFlowRecord.getFlowIndex() + 1 : 1;
log.info("flowIndex = " + flowIndex); log.info("flowIndex = " + flowIndex);

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

@ -465,7 +465,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} }
} }
log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) ); log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) );
List<Flow> flows = flowService.selectByFlowId(flowId); List<Flow> flows = flowService.selectByFlowId(flowId,0l);
FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(resultRecordId); FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(resultRecordId);
FlowRecord notFlowRecord = flowRecordService.selectNotApprovalStaffIdFlowRecords(resultRecord.getId()); FlowRecord notFlowRecord = flowRecordService.selectNotApprovalStaffIdFlowRecords(resultRecord.getId());
if (notFlowRecord != null) { if (notFlowRecord != null) {
@ -757,7 +757,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Override @Override
public R initFlowRecord(Long resultRecordId) { public R initFlowRecord(Long resultRecordId) {
ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(resultRecordId); ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(resultRecordId);
List<Flow> flows = flowService.selectByFlowId(resultRecord.getEvaluationId()); List<Flow> flows = flowService.selectByFlowId(resultRecord.getEvaluationId(),resultRecord.getStartId());
List<Long> flowIds = new ArrayList<>(); List<Long> flowIds = new ArrayList<>();
for(Flow flow:flows){ for(Flow flow:flows){
flowIds.add(flow.getId()); flowIds.add(flow.getId());
@ -786,7 +786,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){ }else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){
staffEntity = getDepartmentStaff(map,5); staffEntity = getDepartmentStaff(map,5);
} }
flowRecord.setApprovalStaffName(staffEntity.getName()); flowRecord.setApprovalStaffName(staffEntity.getName());
flowRecord.setApprovalStaffId(staffEntity.getId()); flowRecord.setApprovalStaffId(staffEntity.getId());
flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc()); flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc());

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

@ -100,7 +100,7 @@
</update> </update>
<select id="selectByFlowId" resultType="com.lz.modules.flow.entity.Flow"> <select id="selectByFlowId" resultType="com.lz.modules.flow.entity.Flow">
select * from lz_flow where flow_id = #{flowId} and is_delete = 0 select * from lz_flow where flow_id = #{flowId} and is_delete = 0 and start_id = #{startId}
</select> </select>
</mapper> </mapper>