部门+全所周报分页修改

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

@@ -28,6 +28,9 @@
         left join personal_member pm on pm.id_ =sl.userinfo_id
         left join project_info pi on pi.id_=cast(pw.project_id as BIGINT)
         where pw.is_complete='0'
+        <if test="projectWeekly.isDeleted!=null">
+            and pw.is_deleted=#{projectWeekly.isDeleted}
+        </if>
         <if test="projectWeekly.Id!=null">
             and pw.id_=#{projectWeekly.id}
         </if>

src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java

@@ -104,6 +104,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                 // 根据该项目的成员本周进展和下周计划,添加到部门中
                 List<ProjectWeeklyDto> newList = getThisWeek(list);
                 //判断当前账号是否是项目专员/负责人
+                Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
                 EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
                 weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
                 weeklyEntityWrapper.eq("weekly_type","1");
@@ -119,7 +120,12 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                    // projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
                     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<ProjectWeeklyDto> list1 = projectDepartmentService.getList(page2, projectWeekly1);
+                    if(!ObjectUtils.isEmpty(list1)){
+                        list.addAll(list1);
+                        page.setTotal(page.getTotal()+page2.getTotal());
+                        page.setSize(page.getSize()+page2.getSize());
+                    }
                 }
 
                 //组装结果集

src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java

@@ -66,6 +66,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                 //先通过编号、名称查到向目标id
                 ProjectInfo project = getProject(projectWeeklyAddReq, projectWeekly);
                 if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目编号/名称不存在！");
+                JSONObject ext = updateExt(projectWeeklyAddReq,project);
                 projectWeekly.setProjectId(String.valueOf(project.getId()));
 
                 //用是否带id过来判断是编辑还是新增
@@ -132,7 +133,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
      * @return
      */
     private ProjectInfo getProject(ProjectWeeklyAddReq projectWeeklyAddReq, ProjectWeekly projectWeekly) {
-        JSONObject ext = updateExt(projectWeeklyAddReq);
+        JSONObject ext = projectWeeklyAddReq.getExt();
         if (!ObjectUtils.isEmpty(ext)) {
             projectWeekly.setExt(ext);
             EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
@@ -153,11 +154,9 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
      * @param projectWeeklyAddReq
      * @return
      */
-    private JSONObject updateExt(ProjectWeeklyAddReq projectWeeklyAddReq){
+    private JSONObject updateExt(ProjectWeeklyAddReq projectWeeklyAddReq,ProjectInfo projectInfo){
         // 根据项目名称获取项目专员和项目负责人id 存入ext中
         JSONObject ext = projectWeeklyAddReq.getExt();
-        String projectName = ext.get("projectName").toString();
-        ProjectInfo projectInfo = projectInfoService.getInfoByProName(projectName);
         JSONObject extInfo = projectInfo.getExt();
         //获取projectManagerData
         JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData");

src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java

@@ -69,6 +69,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
             List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
             //判断当前账号是否是项目专员/负责人
             //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
+            Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
             EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
             userLoginEntityWrapper.eq("id_",userId);
             SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
@@ -87,7 +88,12 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
                //projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
                 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<ProjectWeeklyDto> list1 = projectWholeFirmService.getList(page2, projectWeekly1);
+                if(!ObjectUtils.isEmpty(list1)){
+                    list.addAll(list1);
+                    page.setTotal(page.getTotal()+page2.getTotal());
+                    page.setSize(page.getSize()+page2.getSize());
+                }
             }
 
             //组装结果集