实施前期、竣工阶段项目成员均可操作

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyPigeonholeController.java

@@ -12,6 +12,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -55,6 +56,8 @@ public class ProjectEarlyPigeonholeController extends BaseController {
     private ProjectTypeService projectTypeService;
     @Autowired
     private ProjectEarlyPigeonholeService projectEarlyPigeonholeService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
     /**
      * 项目列表页面
      */
@@ -121,6 +124,13 @@ public class ProjectEarlyPigeonholeController extends BaseController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -54,6 +55,8 @@ public class ProjectEarlyReviewController extends BaseController {
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private ProjectTypeService projectTypeService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
     /**
      * 项目列表页面
      */
@@ -121,6 +124,14 @@ public class ProjectEarlyReviewController extends BaseController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
+
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementCompletionController.java

@@ -8,6 +8,7 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
 import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -50,6 +51,8 @@ public class ProjectImplementCompletionController {
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private ProjectControlTableService projectControlTableService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
 
     @ModelAttribute
     public ProjectImplementEarly get(@RequestParam(required=false) String id) {
@@ -130,6 +133,13 @@ public class ProjectImplementCompletionController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementEarlyController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.modules.projectrecord.web;
 
 import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.projectType.service.ProjectTypeService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
@@ -10,6 +11,7 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
 import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -54,6 +56,8 @@ public class ProjectImplementEarlyController {
     private ProjectControlTableService projectControlTableService;
     @Autowired
     private ProjectTypeService projectTypeService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
 
     @ModelAttribute
     public ProjectImplementEarly get(@RequestParam(required=false) String id) {
@@ -134,6 +138,16 @@ public class ProjectImplementEarlyController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
+
+
+
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionPigeonholeController.java

@@ -12,6 +12,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -55,6 +56,8 @@ public class ProjectCompletionPigeonholeController extends BaseController {
     private ProjectTypeService projectTypeService;
     @Autowired
     private ProjectCompletionPigeonholeService projectCompletionPigeonholeService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
     /**
      * 项目列表页面
      */
@@ -121,6 +124,14 @@ public class ProjectCompletionPigeonholeController extends BaseController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
+
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -54,6 +55,8 @@ public class ProjectCompletionReviewController extends BaseController {
     private ProjectContentDataService projectContentDataService;
     @Autowired
     private ProjectTypeService projectTypeService;
+    @Autowired
+    private WorkProjectUserDao workProjectUserDao;
     /**
      * 项目列表页面
      */
@@ -121,6 +124,13 @@ public class ProjectCompletionReviewController extends BaseController {
                 masterList.add(masterUser.getName());
                 masterIdSet.add(masterUser.getId());
             }
+
+            //查询项目组成员信息
+            List<User> members = workProjectUserDao.isDelFalg(records1.getId(), "");
+            records1.setProjectMembers(members);
+            for (User masterUser:records1.getProjectMembers()) {
+                masterIdSet.add(masterUser.getId());
+            }
             //masterIdSet.add(records1.getCreateBy().getId());
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyPigeonholeList.jsp

@@ -175,7 +175,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="projectImplementEarly" action="${ctx}/project/projectCompletionPigeonhole/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="projectImplementEarly" action="${ctx}/project/projectEarlyPigeonhole/" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->