feat:项目管理新增逻辑

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ProjectManageController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.ProjectManage;
 import com.ruoyi.system.domain.ProjectRepayment;
 import com.ruoyi.system.mapper.ProjectAnnexMapper;
@@ -65,6 +66,7 @@ public class ProjectManageController extends BaseController
             projectRepayment.setProjectId(projectManage1.getId());
             // 设置项目的回款详情
             projectManage1.setRepaymentDetails(projectRepaymentService.selectProjectRepaymentList(projectRepayment));
+            projectManage1.setProjectMemberNames(projectManage1.getProjectMemberNames());
             //  设置项目附件
             projectManage1.setProjectAnnexList(projectAnnexMapper.selectProjectAnnexListByProjectId(projectManage1.getId()));
         }
@@ -103,7 +105,8 @@ public class ProjectManageController extends BaseController
     public AjaxResult add(@RequestBody ProjectManage projectManage)
     {
         // 项目是否重复
-        if (!projectManageService.selectProjectManageByProjectName(projectManage.getProjectName()).isEmpty())
+        if (!StringUtils.isEmpty(projectManageService
+                .selectProjectManageByProjectName(projectManage.getProjectName())))
         {
             return AjaxResult.error("项目已存在或已存在草稿箱");
         }
@@ -149,6 +152,7 @@ public class ProjectManageController extends BaseController
             projectRepayment.setProjectId(projectManage1.getId());
             projectManage1.setRepaymentDetails(projectRepaymentService.selectProjectRepaymentList(projectRepayment));
             //  设置项目附件
+            projectManage1.setProjectAnnexList(projectAnnexMapper.selectProjectAnnexListByProjectId(projectManage1.getId()));
         }
         return getDataTable(list);
     }
@@ -164,7 +168,7 @@ public class ProjectManageController extends BaseController
         // 项目是否重复
         ProjectManage projectManageQuery = new ProjectManage();
         projectManageQuery.setProjectName(projectManage.getProjectName());
-        if (!projectManageService.selectProjectManageList(projectManageQuery).isEmpty())
+        if (!StringUtils.isEmpty(projectManageService.selectProjectManageList(projectManageQuery)))
         {
             return AjaxResult.error("项目已存在或已存在草稿箱");
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectManageServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ProjectNumberGenerator;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.ProjectManage;
 import com.ruoyi.system.domain.ProjectMember;
 import com.ruoyi.system.domain.ProjectRepayment;
@@ -56,9 +57,9 @@ public class ProjectManageServiceImpl implements IProjectManageService {
     @Override
     public ProjectManage selectProjectManageById(Long id) {
         ProjectManage projectManage = projectManageMapper.selectProjectManageById(id);
-        if (projectManage.getProjectMemberNames() != null ){
+        if (!StringUtils.isEmpty(projectManage.getProjectMemberNames())){
             String projectMemberIdsStr = projectManage.getProjectMemberNames().trim();
-            if (projectMemberIdsStr.isEmpty()) {
+            if (StringUtils.isEmpty(projectMemberIdsStr)) {
                 // 设置为空列表
                 projectManage.setProjectMemberIds(new ArrayList<>());
             } else {
@@ -115,7 +116,7 @@ public class ProjectManageServiceImpl implements IProjectManageService {
         // 判断项目编号是否重复
         ProjectManage projectManageQuery = new ProjectManage();
         projectManageQuery.setProjectNumber(projectManage.getProjectNumber());
-        if (!selectProjectManageList(projectManageQuery).isEmpty()) {
+        if (!StringUtils.isEmpty(selectProjectManageList(projectManageQuery))) {
             return 0;
         }
         // 立项时间
@@ -128,7 +129,7 @@ public class ProjectManageServiceImpl implements IProjectManageService {
         // 新增项目信息
         int result= projectManageMapper.insertProjectManage(projectManage);
         if (result > 0){
-            if (projectManage.getProjectMemberIds() != null){
+            if (!StringUtils.isEmpty(projectManage.getProjectMemberIds())){
                 // 新增项目成员
                 projectManage.getProjectMemberIds().forEach(memberId -> {
                     ProjectMember projectMember = new ProjectMember();
@@ -139,14 +140,14 @@ public class ProjectManageServiceImpl implements IProjectManageService {
                 //projectMemberService.batchInsertProjectMembers(projectManage.getId(), projectManage.getProjectMemberIds());
             }
 
-            if (projectManage.getRepaymentDetails() != null){
+            if ( !StringUtils.isEmpty(projectManage.getRepaymentDetails())){
                 // 新增项目回款
                 projectManage.getRepaymentDetails().forEach(projectRepayment -> {
                     projectRepayment.setProjectId(projectManage.getId());
                     projectRepaymentService.insertProjectRepayment(projectRepayment);
                 });
             }
-            if (projectManage.getProjectAnnexList() != null){
+            if (!StringUtils.isEmpty(projectManage.getProjectAnnexList())){
                 // 新增项目附件
                 projectManage.getProjectAnnexList().forEach(projectAnnex -> {
                     projectAnnex.setProjectId(projectManage.getId());
@@ -165,7 +166,7 @@ public class ProjectManageServiceImpl implements IProjectManageService {
      */
     @Override
     public int updateProjectManage(ProjectManage projectManage) {
-        if (projectManage.getProjectMemberIds() != null && !projectManage.getProjectMemberIds().isEmpty()){
+        if (!StringUtils.isEmpty(projectManage.getProjectMemberIds())){
             // 项目成员
             projectManage.getProjectMemberIds().forEach(memberId -> {
                 // 同一项目下成员是否重复
@@ -176,8 +177,12 @@ public class ProjectManageServiceImpl implements IProjectManageService {
                 projectMemberService.insertProjectMember(projectMember);
 
             });
+        }else {
+            // 删除项目成员
+            projectMemberMapper.deleteProjectMemberByProjectId(projectManage.getId());
         }
-        if (projectManage.getRepaymentDetails() != null && !projectManage.getRepaymentDetails().isEmpty()){
+
+        if (!StringUtils.isEmpty(projectManage.getRepaymentDetails())){
             // 项目回款
             projectRepaymentMapper.deleteProjectRepaymentByProjectId(projectManage.getId());
             projectManage.getRepaymentDetails().forEach(projectRepayment -> {
@@ -185,14 +190,21 @@ public class ProjectManageServiceImpl implements IProjectManageService {
                 projectRepaymentService.insertProjectRepayment(projectRepayment);
 
             });
+        }else {
+            // 删除项目回款
+            projectRepaymentMapper.deleteProjectRepaymentByProjectId(projectManage.getId());
         }
+
         // 更新附件
-        if (projectManage.getProjectAnnexList() != null && !projectManage.getProjectAnnexList().isEmpty()){
+        if (!StringUtils.isEmpty(projectManage.getProjectAnnexList())){
             projectAnnexMapper.deleteProjectAnnexesByProjectId(projectManage.getId());
             projectManage.getProjectAnnexList().forEach(projectAnnex -> {
                 projectAnnex.setProjectId(projectManage.getId());
                 projectAnnexMapper.insertProjectAnnex(projectAnnex);
             });
+        }else{
+            // 删除项目附件
+            projectAnnexMapper.deleteProjectAnnexesByProjectId(projectManage.getId());
         }
         projectManage.setUpdateDate(DateUtils.getNowDate());
         return projectManageMapper.updateProjectManage(projectManage);