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

修改获取发起考评使用备份考评组

Browse Source
This commit is contained in:
wulin 2021-06-01 16:52:32 +08:00
parent eea50fdd4b
commit 77c59eafb9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
View File

@ -35,7 +35,10 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
int deleteEvaluationGroupById(@Param("id")Long id); int deleteEvaluationGroupById(@Param("id")Long id);
List<EvaluationGroup> seleteEvaluationGroupByReq(@Param("page") IPage page, @Param("req") EvaluationGroupReq req, @Param("list") List<Long> gIds); List<EvaluationGroup> seleteEvaluationGroupByReq(@Param("page") IPage page,
@Param("req") EvaluationGroupReq req,
@Param("list") List<Long> gIds,
@Param("isStart") Boolean isStart);
List<EvaluationGroup> selectEvaluationGroupByIds(@Param("ids") List<Long> ids); List<EvaluationGroup> selectEvaluationGroupByIds(@Param("ids") List<Long> ids);

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

@ -123,6 +123,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
@Override @Override
public PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req, SysUserEntity sysUserEntity){ public PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req, SysUserEntity sysUserEntity){
List<Long> gIds = null; List<Long> gIds = null;
Boolean isStart = false;
if(req.getStartId() != null){//发起评分时调用，传发起的id if(req.getStartId() != null){//发起评分时调用，传发起的id
FlowStart flowStart = flowStartService.selectFlowStartById(req.getStartId()); FlowStart flowStart = flowStartService.selectFlowStartById(req.getStartId());
if(flowStart == null){ if(flowStart == null){
@ -136,6 +137,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
} }
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
isStart = true;
}else{ }else{
//考评组管理 //考评组管理
List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());//一个人只会有一个 List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());//一个人只会有一个
@ -166,8 +168,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
} }
List<Long> finalGIds = gIds; List<Long> finalGIds = gIds;
Boolean isStart1 = isStart;
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()) PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize())
.doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds)); .doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds, isStart1));
//下面实时统计考核人数 //下面实时统计考核人数
List<EvaluationGroup> groups = pageUtils.getList(); List<EvaluationGroup> groups = pageUtils.getList();
for (EvaluationGroup group:groups for (EvaluationGroup group:groups

3
src/main/resources/mapper/flow/EvaluationGroupMapper.xml
View File

@ -100,7 +100,8 @@
</update> </update>
<select id="seleteEvaluationGroupByReq" resultType="EvaluationGroup" > <select id="seleteEvaluationGroupByReq" resultType="EvaluationGroup" >
select * from lz_evaluation_group where is_delete = 0 and copy_id = 0 select * from lz_evaluation_group where is_delete = 0
<if test="isStart != false">and copy_id = 0 </if>
<if test="req.startTime != null"><![CDATA[and gmt_create > #{req.startTime}]]></if> <if test="req.startTime != null"><![CDATA[and gmt_create > #{req.startTime}]]></if>
<if test="req.endTime != null"><![CDATA[and gmt_create < #{req.endTime}]]></if> <if test="req.endTime != null"><![CDATA[and gmt_create < #{req.endTime}]]></if>