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

周报填报增加部门查询

Browse Source 
根据项目id查询补上条件
This commit is contained in:
zty 2024-07-08 16:37:24 +08:00
parent 01ba956270
commit f229e8120c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,9 +41,11 @@
<if test="projectWeekly.weeklyType!=null"> <if test="projectWeekly.weeklyType!=null">
and pw.weekly_type=#{projectWeekly.weeklyType} and pw.weekly_type=#{projectWeekly.weeklyType}
</if> </if>
<if test="projectWeekly.projectId"> <if test="projectWeekly.projectId!=null">
and pw.project_id=#{projectWeekly.projectId} and pw.project_id=#{projectWeekly.projectId}
</if> </if>
<if test="projectWeekly.deptId!=null">
and pw.dept_id=#{projectWeekly.deptId}
</if>
</select> </select>
</mapper> </mapper>

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

@ -124,6 +124,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
projectWeekly.setUserId(String.valueOf(userId)); projectWeekly.setUserId(String.valueOf(userId));
projectWeekly.setWeeklyType("0"); projectWeekly.setWeeklyType("0");
if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly.setId(projectWeeklyFindReq.getId()); if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly.setId(projectWeeklyFindReq.getId());
if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly); List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly);
//判断当前账号是否是项目专员/负责人 //判断当前账号是否是项目专员/负责人
@ -143,6 +144,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
projectWeekly1.setWeeklyType("0"); projectWeekly1.setWeeklyType("0");
projectWeekly1.setProjectId(weekly.getProjectId()); projectWeekly1.setProjectId(weekly.getProjectId());
if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId()); if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId());
if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
list.addAll(projectWeeklyService.getList(page, projectWeekly1)); list.addAll(projectWeeklyService.getList(page, projectWeekly1));
} }