测试修改bug

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

@@ -9,6 +9,8 @@ import com.xqopen.kehui.common.entity.SystemUserLogin;
 import com.xqopen.kehui.common.service.ISystemUserLoginService;
 import com.xqopen.kehui.exception.ErrorCode;
 import com.xqopen.kehui.exception.XQException;
+import com.xqopen.kehui.personal.entity.PersonalMember;
+import com.xqopen.kehui.personal.service.IPersonalMemberService;
 import com.xqopen.kehui.project.api.ProjectDepartmentApi;
 import com.xqopen.kehui.project.api.ProjectWeeklyApi;
 import com.xqopen.kehui.project.dto.*;
@@ -38,18 +40,28 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
     IProjectInfoService projectInfoService;
     @Autowired
     ISystemUserLoginService systemUserLoginService;
+    @Autowired
+    IPersonalMemberService personalMemberService;
 
 
     // 获取用户名和工作量
     @Override
     @GetMapping(Api.PROJECT_DEPARTMENT_UPDATE)
-    public String showById(@PathVariable Long id) throws XQException {
+    public String showById(@RequestHeader("userId") Long userId,@PathVariable Long id) throws XQException {
+        //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
+        EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
+        userLoginEntityWrapper.eq("id_",userId);
+        SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
             //根据项目id获取proId和week
         EntityWrapper<ProjectWeekly> Wrapper = new EntityWrapper<>();
         Wrapper.eq("id_",id.toString());
         ProjectWeekly project = projectWeeklyService.selectOne(Wrapper);
         // 根据 week proId 查询 该实例信息
        List<ProjectWeeklyDto> list = projectDepartmentService.showById(project.getWeek(),project.getProjectId());
+       // 将list中的userid改为当前登录账号的userid
+        for (ProjectWeeklyDto projectWeeklyDto : list) {
+            projectWeeklyDto.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
+        }
        return ApiResponse.fillSuccess(list);
     }
 
@@ -65,11 +77,19 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                 if (projectWeeklyFindReq.getPageSize() == null || projectWeeklyFindReq.getPageSize() == 0) {
                     projectWeeklyFindReq.setPageSize(10);
                 }
+                //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
+                EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
+                userLoginEntityWrapper.eq("id_",userId);
+                SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
                 //根据用户id拿到部门信息
-                String deptId = projectDepartmentService.getDeptId(userId.toString());
+                EntityWrapper<PersonalMember> member = new EntityWrapper<>();
+                member.eq("id_",systemUserLogin.getUserinfoId());
+                PersonalMember personalMember = personalMemberService.selectOne(member);
+                Object deptId = personalMember.getExt().get("deptId");
+
                 Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
                 ProjectWeekly projectWeekly = new ProjectWeekly();
-                projectWeekly.setDeptId(deptId);
+                projectWeekly.setDeptId(deptId.toString());
                 projectWeekly.setIsDeleted("0");
                 projectWeekly.setUserId(String.valueOf(userId));
                 projectWeekly.setWeeklyType("0");
@@ -82,10 +102,6 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                     projectWeekly.setWeek(projectWeeklyFindReq.getWeek());
                 List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
                 //判断当前账号是否是项目专员/负责人
-                //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
-                EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
-                userLoginEntityWrapper.eq("id_",userId);
-                SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
                 EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
                 weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
                 weeklyEntityWrapper.eq("weekly_type","1");
@@ -133,7 +149,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
         EntityWrapper<ProjectWeekly> Wrapper = new EntityWrapper<>();
         Wrapper.eq("id_",id.toString());
         ProjectWeekly projectWeekly = projectWeeklyService.selectOne(Wrapper);
-        projectWeekly.getExt().put("isDisable","true");
+        projectWeekly.getExt().put("isDisable","1");
         projectWeeklyService.updateById(projectWeekly);
         // 根据部门周报项目id获取子项目
         EntityWrapper<ProjectWeekly> newWrapper = new EntityWrapper<>();
@@ -149,7 +165,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
     // 根据id获取list  用于当前用户与表中userid不同的情况
     @Override
     @PostMapping(Api.PROJECT_WEEKLYBYID)
-    public String listById(@RequestBody ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException {
+    public String listById(@RequestHeader("userId") Long userId,@RequestBody ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException {
         try {
             if (!ObjectUtils.isEmpty(projectWeeklyFindReq)) {
                 if (projectWeeklyFindReq.getPageNo() == null || projectWeeklyFindReq.getPageNo() == 0) {
@@ -167,14 +183,14 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                 if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null))
                     projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
                 List<ProjectWeeklyDto> list = projectDepartmentService.getList(page, projectWeekly);
-                for (ProjectWeeklyDto weeklyDto : list) {
+                //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
-                    Long userId = Long.parseLong(weeklyDto.getUserId());
                 EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
                 userLoginEntityWrapper.eq("id_",userId);
                 SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
-                    weeklyDto.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
+                // 将list中的userid改为当前登录账号的userid
+                for (ProjectWeeklyDto projectWeeklyDto : list) {
+                    projectWeeklyDto.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
                 }
-
                 //组装结果集
                 ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
                 listResp.setLs(list);

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

@@ -84,7 +84,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
                 projectWeekly1.setWeeklyType("0");
                 projectWeekly1.setProjectId(weekly.getProjectId());
                 JSONObject ext = projectWeekly1.getExt();
-                projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
+               //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));

src/main/java/com/xqopen/kehui/project/api/ProjectDepartmentApi.java

@@ -15,7 +15,7 @@ public interface ProjectDepartmentApi {
             @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
     })
-    String showById(Long id) throws XQException;
+    String showById(Long userId,Long id) throws XQException;
 
     @ApiOperation(value = "部门周报列表", notes = "部门周报列表", response = ApiResponse.class)
     @ApiImplicitParams({
@@ -43,5 +43,5 @@ public interface ProjectDepartmentApi {
             @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
     })
-    String listById(ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException;
+    String listById(Long userId,ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException;
 }