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-12-28 11:47:42 +08:00
commit 2838301bda
6 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,4 +109,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
List<FlowRecord> selectFlowRecordByRecordIdsFlowProcess(@Param("recordIds") List<Long> recordIds, @Param("flowProcess") Long flowProcess);
List<FlowRecord> selectFlowRecordByRecordIdsStatus(@Param("recordIds") List<Long> recordIds, @Param("status") int status);
List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status);
}

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

@ -105,4 +105,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
List<FlowRecord> selectFlowRecordByRecordIdsFlowProcess(List<Long> recordIds, Long flowProcess);
List<FlowRecord> selectFlowRecordByRecordIdsStatus(List<Long> recordIds, int status);
List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status);
}

5
src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
View File

@ -276,4 +276,9 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
return flowRecordMapper.selectFlowRecordByRecordIdsStatus(recordIds,status);
}
@Override
public List<FlowRecord> selectFlowRecordByRecordIdsFlowProcessAndStatus(List<Long> recordIds, Long flowProcess, int status){
return flowRecordMapper.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, status);
}
}

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

@ -301,7 +301,7 @@ public class AssessManagerController extends AbstractController{
log.info("催当前节点的人员，数量{}", flowRecords.size());
}else{
flowRecords =
flowRecordService.selectFlowRecordByRecordIdsFlowProcess(recordIds, flowProcess);
flowRecordService.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, 2);
log.info("催指定节点的人员，数量{}", flowRecords.size());
}

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

@ -377,7 +377,9 @@ public class ChartResultServiceImpl implements ChartResultService {
return Collections.EMPTY_LIST;
}
log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds));
mandepartmentIds.retainAll(allDeparmentIds);
if(CollectionUtils.isNotEmpty(allDeparmentIds)){
mandepartmentIds.retainAll(allDeparmentIds);
}
if(mandepartmentIds.size()==0){
return Collections.EMPTY_LIST;
}

10
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -384,5 +384,15 @@
</select>
<select id="selectFlowRecordByRecordIdsFlowProcessAndStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0
and record_id in
<foreach item="recordId" collection="recordIds" open="(" separator="," close=")">
#{recordId}
</foreach>
and flow_process = #{flowProcess} and status=#{status}
</select>
</mapper>