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

1.项目立项根据部门获取分管领导，增加默认值副所长

Browse Source 
2.项目结项增加管理员查看所有
3.季度审核增加管理员获取所有
4.修复个人周报修改报错的bug
5.个人周报查询user时增加条件user!=0(管理员)
This commit is contained in:
zty 2024-09-25 19:10:05 +08:00
parent 4d6124c547
commit df079b2796
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
View File

@ -558,6 +558,7 @@ public class MyTaskListener implements TaskListener {
case "办公室":
case "人财中心":
case "财务中心":
default:
return "depDirector";
}
}

3
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
View File

@ -32,9 +32,10 @@
<if test="projectWeekly.isDeleted!=null">
and pw.is_deleted=#{projectWeekly.isDeleted}
</if>
<if test="projectWeekly.userId!=null">
<if test="projectWeekly.userId!=null and projectWeekly.userId!=0">
and pw.user_id=#{projectWeekly.userId}
</if>
<if test="projectWeekly.Id!=null">
and pw.id_=#{projectWeekly.id}
</if>

3
src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
View File

@ -1,6 +1,5 @@
package com.xqopen.kehui.project.action;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.support.spring.FastJsonJsonView;
@ -536,7 +535,9 @@ public class ProjectInitComtroller implements ProjectInitApi {
try {
Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
Map map = pageNoUtil.getMap();
if(!"0".equals(userId.toString())){
map.put("userId", userId);
}
List<ProjectInfoListItemResp> list = infoService.conclusionList(page, map);
return ApiResponse.fillSuccess(new ResultListReqUtil<ProjectInfoListItemResp>(list, page.getTotal(), page.getPages()));
} catch (Exception e) {

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

@ -43,7 +43,10 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
if (!ObjectUtils.isEmpty(pageNoUtil)) {
//先拿到季度审核表数据
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
//管理员查看所有
if(!"0".equals(userId.toString())){
userLoginEntityWrapper.eq("id_", userId);
}
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
evaluationEntityWrapper.eq("is_deleted", "0");

2
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -163,7 +163,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
// 将projectAdmin改为人事id
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_", projectAdmin.getString(projectAdmin.toArray().length -1 ));
userLoginEntityWrapper.eq("id_", Long.parseLong(projectAdmin.getString(projectAdmin.toArray().length -1 )));
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));