From 8b336a178786a97e19b5c088d3a8e45612e6736a Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Tue, 30 Jul 2024 16:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8+=E5=85=A8=E6=89=80=E5=91=A8?=
=?UTF-8?q?=E6=8A=A5=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml | 3 +++
.../kehui/project/action/ProjectDepartmentController.java | 8 +++++++-
.../kehui/project/action/ProjectWeeklyController.java | 7 +++----
.../kehui/project/action/ProjectWholeFirmController.java | 8 +++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml
index fff16c9..76dbdcf 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml
+++ b/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'
+
+ and pw.is_deleted=#{projectWeekly.isDeleted}
+
and pw.id_=#{projectWeekly.id}
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 887c62c..e0500a1 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
@@ -104,6 +104,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
// 根据该项目的成员本周进展和下周计划,添加到部门中
List newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人
+ Page page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
EntityWrapper 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 list1 = projectDepartmentService.getList(page2, projectWeekly1);
+ if(!ObjectUtils.isEmpty(list1)){
+ list.addAll(list1);
+ page.setTotal(page.getTotal()+page2.getTotal());
+ page.setSize(page.getSize()+page2.getSize());
+ }
}
//组装结果集
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 bb87fc0..509c700 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/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 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");
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
index 49b53df..0139053 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
@@ -69,6 +69,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
List list = projectWholeFirmService.getList(page, projectWeekly);
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
+ Page page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
EntityWrapper 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 list1 = projectWholeFirmService.getList(page2, projectWeekly1);
+ if(!ObjectUtils.isEmpty(list1)){
+ list.addAll(list1);
+ page.setTotal(page.getTotal()+page2.getTotal());
+ page.setSize(page.getSize()+page2.getSize());
+ }
}
//组装结果集