From 96f061bd308bcb397f584f14b20b2e2a7890d6cd Mon Sep 17 00:00:00 2001 From: chen <2280784283@qq.com> Date: Thu, 11 Jul 2024 16:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=91=A8=E6=8A=A5=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E7=AC=AC=E4=BA=8C=E7=89=88(=E9=99=A4=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=83=BD=E5=B7=B2=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xqopen/kehui/mapper/ProjectWeeklyDao.java | 3 ++- .../com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml | 9 +++++---- .../project/action/ProjectDepartmentController.java | 11 +++++++---- .../kehui/project/action/ProjectWeeklyController.java | 8 +++++++- .../project/service/IProjectDepartmentService.java | 3 ++- .../service/impl/IProjectDepartmentServiceImpl.java | 5 +++-- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/mapper/ProjectWeeklyDao.java b/src/main/java/com/xqopen/kehui/mapper/ProjectWeeklyDao.java index 413182d..72b56cf 100644 --- a/src/main/java/com/xqopen/kehui/mapper/ProjectWeeklyDao.java +++ b/src/main/java/com/xqopen/kehui/mapper/ProjectWeeklyDao.java @@ -16,5 +16,6 @@ public interface ProjectWeeklyDao extends BaseMapper { List getListByDeptId(@Param("page") Page page, @Param("projectWeekly") ProjectWeekly projectWeekly); - List showById(@Param("id") String id); + List showById(@Param("week") String week, @Param("proId") String proId); + } diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml index 8a17ab1..07f3224 100644 --- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml +++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml @@ -63,16 +63,17 @@ - + select pm.person_name , pw.* from project_weekly pw left join system_user_login sl on cast(pw.user_id as BIGINT)=sl.id_ left join personal_member pm on pm.id_ =sl.userinfo_id - where pw.id_=#{id} + where pw.week=#{week} and pw.project_id = #{proId} and pw.weekly_type = '0' diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java index 449893c..ccea55a 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java @@ -43,10 +43,13 @@ public class ProjectDepartmentController implements ProjectDepartmentApi { @Override @GetMapping(Api.PROJECT_DEPARTMENT_UPDATE) public String showById(@PathVariable Long id) throws XQException { - //根据项目id获取员工信息 - List list = projectDepartmentService.showById(id.toString()); - System.out.println("list = " + list); - return ApiResponse.fillSuccess(list); + //根据项目id获取proId和week + EntityWrapper Wrapper = new EntityWrapper<>(); + Wrapper.eq("id_",id.toString()); + ProjectWeekly project = projectWeeklyService.selectOne(Wrapper); + // 根据 week proId 查询 该实例信息 + List list = projectDepartmentService.showById(project.getWeek(),project.getProjectId()); + return ApiResponse.fillSuccess(list); } @Override diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java index bd07051..6b39846 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -55,8 +55,14 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { try { if (!ObjectUtils.isEmpty(projectWeeklyAddReq)) { ProjectWeekly projectWeekly = projectWeeklyAddReq.getProjectWeekly(); + // 给父项目周报加一个工作量跳过判断 + if (ObjectUtils.isEmpty(projectWeekly.getWorkload())){ + projectWeekly.setWorkload("1000"); + } if (!ObjectUtils.isEmpty(projectWeekly)) verification(projectWeekly); //校验 - + if (projectWeekly.getWorkload().equals("1000")){ + projectWeekly.setWorkload(null); + } //先通过编号、名称查到向目标id ProjectInfo project = getProject(projectWeeklyAddReq, projectWeekly); if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目编号/名称不存在！"); diff --git a/src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java b/src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java index b70b626..f5c5a19 100644 --- a/src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java +++ b/src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java @@ -14,5 +14,6 @@ public interface IProjectDepartmentService extends IService { List getListByDeptId(Page page, ProjectWeekly projectWeekly); - List showById(String id); + List showById(String week,String proId); + } diff --git a/src/main/java/com/xqopen/kehui/project/service/impl/IProjectDepartmentServiceImpl.java b/src/main/java/com/xqopen/kehui/project/service/impl/IProjectDepartmentServiceImpl.java index 8b4b15f..bdb4626 100644 --- a/src/main/java/com/xqopen/kehui/project/service/impl/IProjectDepartmentServiceImpl.java +++ b/src/main/java/com/xqopen/kehui/project/service/impl/IProjectDepartmentServiceImpl.java @@ -34,7 +34,8 @@ public class IProjectDepartmentServiceImpl extends ServiceImpl showById(String id) { - return projectWeeklyDao.showById(id); + public List showById(String week,String proId) { + return projectWeeklyDao.showById(week,proId); } + }