From 686bd303ddc68db338fe352c38392194217168a5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Tue, 11 Mar 2025 15:27:59 +0800
Subject: [PATCH] 修改业务逻辑增加项目编码

---
 expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
index e5f0a8b..0cc440c 100644
--- a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
+++ b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
@@ -8,6 +8,7 @@
 import com.gkhy.common.utils.DateUtils;
 import com.gkhy.common.utils.SecurityUtils;
 import com.gkhy.common.utils.StringUtils;
+import com.gkhy.common.utils.uuid.RandomStringGenerator;
 import com.gkhy.system.domain.*;
 import com.gkhy.system.domain.vo.request.*;
 import com.gkhy.system.domain.vo.response.*;
@@ -65,7 +66,7 @@
      */
     @Override
     public List<ProjectManagement> selectProjectManagementList(ProjectManagement projectManagement) {
-        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) && SecurityUtils.getUserId() != 130L){
            projectManagement.setDeptId(SecurityUtils.getDeptId());
         }
         return projectManagementMapper.selectProjectManagementList(projectManagement);
@@ -93,6 +94,7 @@
            // projectManagementMapper.updateProjectManagement(projectManagementSave);
             updateById(projectManagementSave);
         }else {
+            projectManagementSave.setProjectCode(RandomStringGenerator.generateRandomString(10));
             projectManagementSave.setStep(1L);
             projectManagementSave.setCreateBy(SecurityUtils.getUsername());
             projectManagementSave.setCreateTime(DateUtils.getNowDate());
@@ -239,8 +241,11 @@
     public int deleteProjectManagementByIds(Long[] ids) {
         // 校验
         for (Long id : ids) {
-            checkDataPer(id);
+            checkDelData(id);
         }
+//        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) ){
+//            throw new ServiceException("无权操作！");
+//        }
         return projectManagementMapper.deleteProjectManagementByIds(ids);
     }
 
@@ -317,7 +322,7 @@
         projectManagementUp.setId(req.getId());
         projectManagementUp.setState(4L);
         projectManagementUp.setStep(4L);
-        projectManagementUp.setDesc(req.getDesc());
+//        projectManagementUp.setDesc(req.getDesc());
         projectManagementUp.setProjectEndTime(req.getProjectEndTime());
         projectManagementUp.setUpdateBy(SecurityUtils.getUsername());
         int i = projectManagementMapper.updateProjectManagement(projectManagementUp);
@@ -485,11 +490,17 @@
             projectDetailResp.setDeptId(projectManagement.getDeptId());
             projectDetailResp.setDeptName(projectDetailResp.getDeptName());
             projectDetailResp.setProjectName(projectManagement.getProjectName());
+            projectDetailResp.setProjectDateStart(projectManagement.getProjectDateStart());
+            projectDetailResp.setProjectDateEnd(projectManagement.getProjectDateEnd());
+            if (StringUtils.isNotEmpty(projectManagement.getJobCategory())){
+                projectDetailResp.setJobCategory(projectManagement.getJobCategory());
+            }
             SysExpertInfo sysExpertInfo = sysExpertInfoMapper.selectById(projectDetailResp.getExpertId());
             if (sysExpertInfo != null){
                 projectDetailResp.setTitle(sysExpertInfo.getTitle());
                 projectDetailResp.setJob(sysExpertInfo.getJob());
             }
+
         }
         return projectDetailResp;
     }
@@ -545,11 +556,24 @@
         Long deptId = projectManagement.getDeptId();
         // 本部门审批？
         if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) && deptId.intValue() != SecurityUtils.getDeptId().intValue()){
-            throw new ServiceException("非本部门数据，无权操作！");
+            throw new ServiceException("非本处室数据，无权操作！");
         }
         if (projectManagement.getState() == 4){
             throw new ServiceException("已结项，无权操作！");
         }
         return projectManagement;
     }
+
+
+    private void checkDelData(Long id){
+        ProjectManagement projectManagement = checkData(id);
+        Long deptId = projectManagement.getDeptId();
+        // 本部门审批？
+        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) && deptId.intValue() != SecurityUtils.getDeptId().intValue()){
+            throw new ServiceException("非本处室数据，无权操作！");
+        }
+    }
+
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.2