部门周报填报第二版(除权限都已完成)

src/main/java/com/xqopen/kehui/mapper/ProjectWeeklyDao.java

@@ -16,5 +16,6 @@ public interface ProjectWeeklyDao extends BaseMapper<ProjectWeekly> {
 
     List<ProjectWeeklyDto> getListByDeptId(@Param("page") Page<ProjectWeekly> page, @Param("projectWeekly") ProjectWeekly projectWeekly);
 
-    List<Object> showById(@Param("id") String id);
+    List<ProjectWeeklyDto> showById(@Param("week") String week, @Param("proId") String proId);
+
 }

src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml

@@ -63,16 +63,17 @@
 
     </select>
     <select id="getDeptId" resultType="java.lang.String" parameterType="java.lang.String">
-        select dept_id
+        select distinct dept_id
         from project_weekly
         where user_id = #{userId}
     </select>
-    <select id="showById" resultType="java.util.Map" parameterType="java.lang.String">
+
-        select pm.person_name , pw.workload
+    <select id="showById" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
+        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'
     </select>
 
 </mapper>

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获取员工信息
+            //根据项目id获取proId和week
-            List<Object> list = projectDepartmentService.showById(id.toString());
+        EntityWrapper<ProjectWeekly> Wrapper = new EntityWrapper<>();
-        System.out.println("list = " + list);
+        Wrapper.eq("id_",id.toString());
-            return ApiResponse.fillSuccess(list);
+        ProjectWeekly project = projectWeeklyService.selectOne(Wrapper);
+        // 根据 week proId 查询 该实例信息
+       List<ProjectWeeklyDto> list = projectDepartmentService.showById(project.getWeek(),project.getProjectId());
+       return ApiResponse.fillSuccess(list);
     }
 
     @Override

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("你输入的项目编号/名称不存在！");

src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java

@@ -14,5 +14,6 @@ public interface IProjectDepartmentService extends IService<ProjectWeekly> {
 
     List<ProjectWeeklyDto> getListByDeptId(Page<ProjectWeekly> page, ProjectWeekly projectWeekly);
 
-    List<Object> showById(String id);
+    List<ProjectWeeklyDto> showById(String week,String proId);
+
 }

src/main/java/com/xqopen/kehui/project/service/impl/IProjectDepartmentServiceImpl.java

@@ -34,7 +34,8 @@ public class IProjectDepartmentServiceImpl extends ServiceImpl<ProjectWeeklyDao,
     }
 
     @Override
-    public List<Object> showById(String id) {
+    public List<ProjectWeeklyDto> showById(String week,String proId) {
-        return projectWeeklyDao.showById(id);
+        return projectWeeklyDao.showById(week,proId);
     }
+
 }