xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chen 2024-07-24 09:43:06 +08:00
commit e82ae3818a
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
View File

@ -44,17 +44,9 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>(); EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_", userId); userLoginEntityWrapper.eq("id_", userId);
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper); SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
//判断当前执行人是谁，项目负责人/分管领导/主要领导
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>(); EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
evaluationEntityWrapper.eq("is_deleted", "0"); evaluationEntityWrapper.eq("is_deleted", "0");
// evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'");
evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'"); evaluationEntityWrapper.and("ext_->> 'executor' like " + "'%" + userId + "%'");
//根据当前执行人查询
// evaluationEntityWrapper.andNew()
// .eq("created_by", String.valueOf(systemUserLogin.getUserinfoId()))
// .or("ext_->> 'projectAdmin'= " + "'" + userId + "'")
// .or("ext_->> 'branchLeaders'= " + "'" + userId + "'")
// .or("ext_->> 'MainLeader'= " + "'" + userId + "'");
evaluationEntityWrapper.setSqlSelect("project_id"); evaluationEntityWrapper.setSqlSelect("project_id");
List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper); List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize()); Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());