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

fix

Browse Source
This commit is contained in:
杜建超 2020-11-04 16:19:32 +08:00
parent aeea27efbf
commit 518c23c82b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,6 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds); List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds);
EvaluationGroup selectEvaluationGroupByCopyId(@Param("copyId")String copyId); EvaluationGroup selectEvaluationGroupByCopyId(@Param("copyId")Long copyId,@Param("startId")Long startId);
} }

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

@ -135,11 +135,14 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
group.setCounts(ids.size()); group.setCounts(ids.size());
//是否通知评分 //是否通知评分
if(req.getStartId()!=null){ if(req.getStartId()!=null){
EvaluationGroup scoreGroup = evaluationGroupMapper.selectEvaluationGroupByCopyId(String.valueOf(group.getId())); EvaluationGroup scoreGroup = evaluationGroupMapper.selectEvaluationGroupByCopyId(group.getId(),req.getStartId());
int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),scoreGroup.getId()); if(scoreGroup!=null){
if(i>0){ int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),scoreGroup.getId());
group.setScore(1); if(i>0){
group.setScore(1);
}
} }
} }
} }
return pageUtils; return pageUtils;

2
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -259,7 +259,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
List<StaffSimpleInfo> toStaffids = new ArrayList<>(); List<StaffSimpleInfo> toStaffids = new ArrayList<>();
for(String s:split){ for(String s:split){
//更新评分 //更新评分
EvaluationGroup group = evaluationGroupMapper.selectEvaluationGroupByCopyId(s); EvaluationGroup group = evaluationGroupMapper.selectEvaluationGroupByCopyId(Long.valueOf(s),req.getStartId());
if(group==null){ if(group==null){
log.info("未找到主组信息，copyId: " + s); log.info("未找到主组信息，copyId: " + s);
continue; continue;

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

@ -158,7 +158,7 @@
</select> </select>
<select id="selectEvaluationGroupByCopyId" resultType="EvaluationGroup" > <select id="selectEvaluationGroupByCopyId" resultType="EvaluationGroup" >
select * from lz_evaluation_group where is_delete = 0 and copy_id = #{copyId} select * from lz_evaluation_group where is_delete = 0 and copy_id = #{copyId} and start_id = #{startId}
</select> </select>
</mapper> </mapper>