From b30f4c40c77a940a2a749a676e901787f55040b0 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 06 十一月 2026 11:48:25 +0800
Subject: [PATCH] 流程优化
---
src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java | 38 +++
sql/20261106_project_management_hardening.sql | 82 ++++++++
src/main/java/com/ruoyi/projectManagement/vo/SearchInfoVo.java | 3
src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java | 2
src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java | 276 ++++++++++++++++++++++-----
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 6
src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java | 9
src/test/java/com/ruoyi/projectManagement/service/ProjectWorkflowServiceTest.java | 107 ++++++++++
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 4
src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java | 1
src/main/resources/mapper/projectManagement/InfoMapper.xml | 14 +
src/main/java/com/ruoyi/projectManagement/pojo/Info.java | 4
src/main/java/com/ruoyi/projectManagement/controller/InfoController.java | 10 +
13 files changed, 500 insertions(+), 56 deletions(-)
diff --git a/sql/20261106_project_management_hardening.sql b/sql/20261106_project_management_hardening.sql
new file mode 100644
index 0000000..3828fe0
--- /dev/null
+++ b/sql/20261106_project_management_hardening.sql
@@ -0,0 +1,82 @@
+-- 椤圭洰绠$悊鏉冮檺銆佸垎绫讳富閿拰娴佺▼瀹夊叏鍗囩骇銆�
+-- 鎵ц鍓嶈澶囦唤鏁版嵁搴擄紱鏈剼鏈彧鍒涘缓鏉冮檺椤癸紝涓嶈嚜鍔ㄦ墿澶ф櫘閫氳鑹叉潈闄愩��
+SET NAMES utf8mb4;
+
+DROP PROCEDURE IF EXISTS `add_column_if_missing`;
+DELIMITER $$
+CREATE PROCEDURE `add_column_if_missing`(IN p_table varchar(64), IN p_column varchar(64), IN p_definition varchar(1000))
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME=p_table AND COLUMN_NAME=p_column) THEN
+ SET @ddl=CONCAT('ALTER TABLE `',p_table,'` ADD COLUMN `',p_column,'` ',p_definition);
+ PREPARE stmt FROM @ddl;
+ EXECUTE stmt;
+ DEALLOCATE PREPARE stmt;
+ END IF;
+END$$
+DELIMITER ;
+CALL add_column_if_missing('project_management_info','project_category_id',"bigint DEFAULT NULL COMMENT '椤圭洰鍒嗙被ID' AFTER project_classification");
+DROP PROCEDURE IF EXISTS `add_column_if_missing`;
+
+-- 鍚嶇О鍞竴鐨勫巻鍙查」鐩彲瀹夊叏鍥炲~锛涢噸鍚嶅垎绫荤暀缁欑敤鎴烽噸鏂伴�夋嫨銆�
+UPDATE project_management_info p
+JOIN (SELECT category_name,MIN(id) id FROM project_management_category WHERE is_deleted=0 GROUP BY category_name HAVING COUNT(*)=1) c
+ ON c.category_name=p.project_classification
+SET p.project_category_id=c.id
+WHERE p.project_category_id IS NULL AND p.is_delete=0;
+
+SET @project_list_menu=2285;
+UPDATE sys_menu SET perms='project:info:list',visible='0',status='0',update_time=NOW() WHERE menu_id=@project_list_menu;
+
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鏌ョ湅椤圭洰',@project_list_menu,11,'#',NULL,'',1,0,'F','0','0','project:info:query','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:info:query');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鏂板椤圭洰',@project_list_menu,12,'#',NULL,'',1,0,'F','0','0','project:info:add','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:info:add');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '淇敼椤圭洰',@project_list_menu,13,'#',NULL,'',1,0,'F','0','0','project:info:edit','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:info:edit');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鍒犻櫎椤圭洰',@project_list_menu,14,'#',NULL,'',1,0,'F','0','0','project:info:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:info:remove');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '寮�濮嬮」鐩�',@project_list_menu,15,'#',NULL,'',1,0,'F','0','0','project:start','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:start');
+
+
+-- Ensure the category menu exists even when this hardening script is applied independently.
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '椤圭洰鍒嗙被',2276,2,'projectCategory','projectManagement/projectCategory/index','ProjectCategory',1,0,'C','0','0','project:category:list','tree','admin',NOW(),'澶氬眰鏍戝舰椤圭洰鍒嗙被缁存姢'
+WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE parent_id=2276 AND path='projectCategory');
+
+-- Workflow and execution button permissions.
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '妯″潡缁存姢',@project_list_menu,21,'#',NULL,'',1,0,'F','0','0','project:module:edit','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:module:edit');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '妯″潡鍒犻櫎',@project_list_menu,22,'#',NULL,'',1,0,'F','0','0','project:module:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:module:remove');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鏂板鎴栦慨鏀硅窡杩�',@project_list_menu,23,'#',NULL,'',1,0,'F','0','0','project:follow:add','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:follow:add');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鍒犻櫎璺熻繘',@project_list_menu,24,'#',NULL,'',1,0,'F','0','0','project:follow:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:follow:remove');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鏂板鎴栦慨鏀规眹鎶�',@project_list_menu,25,'#',NULL,'',1,0,'F','0','0','project:report:add','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:report:add');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鍒犻櫎姹囨姤',@project_list_menu,26,'#',NULL,'',1,0,'F','0','0','project:report:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:report:remove');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鏂板鎴栦慨鏀硅祫鏂�',@project_list_menu,27,'#',NULL,'',1,0,'F','0','0','project:material:add','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:material:add');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鍒犻櫎璧勬枡',@project_list_menu,28,'#',NULL,'',1,0,'F','0','0','project:material:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:material:remove');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '缁存姢椤圭洰闃舵',@project_list_menu,29,'#',NULL,'',1,0,'F','0','0','project:phase:edit','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:phase:edit');
+
+SET @project_category_menu=(SELECT menu_id FROM sys_menu WHERE parent_id=2276 AND path='projectCategory' ORDER BY menu_id LIMIT 1);
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '缁存姢椤圭洰鍒嗙被',@project_category_menu,1,'#',NULL,'',1,0,'F','0','0','project:category:edit','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:category:edit');
+INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+SELECT '鍒犻櫎椤圭洰鍒嗙被',@project_category_menu,2,'#',NULL,'',1,0,'F','0','0','project:category:remove','#','admin',NOW(),'' WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms='project:category:remove');
+
+
+-- 瓒呯骇绠$悊鍛樿鑹茶ˉ榻愭寜閽紱鍏朵粬瑙掕壊鐢扁�滆鑹茬鐞嗏�濇寜宀椾綅鍕鹃�夈��
+INSERT IGNORE INTO sys_role_menu(role_id,menu_id)
+SELECT 1,menu_id FROM sys_menu
+WHERE status='0' AND perms IN (
+ 'project:info:list','project:info:query','project:info:add','project:info:edit','project:info:remove','project:start',
+ 'project:module:edit','project:module:remove','project:follow:add','project:follow:remove',
+ 'project:report:add','project:report:remove','project:material:add','project:material:remove',
+ 'project:phase:edit','project:category:list','project:category:edit','project:category:remove'
+);
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 56baf0f..ebdb98f 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -11,6 +11,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
@@ -30,6 +31,8 @@
private final InfoStageHandleService infoStageHandleService;
@PostMapping("/save")
+ @PreAuthorize("(#saveInfoVo.info.id == null && @ss.hasPermi('project:info:add')) || " +
+ "(#saveInfoVo.info.id != null && @ss.hasPermi('project:info:edit'))")
@Operation(summary = "淇濆瓨")
public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
infoService.save(saveInfoVo);
@@ -37,6 +40,7 @@
}
@PostMapping("/updateStatus")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "淇敼鐘舵��")
public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
infoService.updateStatus(updateStateInfo);
@@ -44,6 +48,7 @@
}
@PostMapping("/delete/{id}")
+ @PreAuthorize("@ss.hasPermi('project:info:remove')")
@Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable Long id) {
infoService.deleteInfo(id);
@@ -51,6 +56,7 @@
}
@PostMapping("/listPage")
+ @PreAuthorize("@ss.hasPermi('project:info:list')")
@Operation(summary = "鍒嗛〉鍒楄〃")
public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
return AjaxResult.success(infoService.searchListInfo(vo));
@@ -58,12 +64,14 @@
@PostMapping("/{id}")
+ @PreAuthorize("@ss.hasPermi('project:info:query')")
@Operation(summary = "璇︽儏")
public AjaxResult getInfoById(@PathVariable Long id) {
return AjaxResult.success(infoService.getInfoById(id));
}
@PostMapping("/saveStage")
+ @PreAuthorize("denyAll()")
@Operation(summary = "淇濆瓨闃舵")
public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
infoStageHandleService.save(dto);
@@ -71,12 +79,14 @@
}
@PostMapping("/listStage/{id}")
+ @PreAuthorize("denyAll()")
@Operation(summary = "鍒楄〃闃舵")
public AjaxResult listStage(@PathVariable Long id) {
return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
}
@PostMapping("/deleteStage/{id}")
+ @PreAuthorize("denyAll()")
@Operation(summary = "鍒犻櫎闃舵")
public AjaxResult deleteStage(@PathVariable Long id) {
infoStageHandleService.deleteById(id);
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index c8b982c..c3ec1d1 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -9,6 +9,7 @@
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
@@ -27,6 +28,7 @@
private final PlanService planService;
@PostMapping("/save")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "淇濆瓨")
public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
@@ -34,6 +36,7 @@
}
@PostMapping("/delete/{id}")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable Long id) {
planService.deletePlan(id);
@@ -41,6 +44,7 @@
}
@PostMapping("/listPage")
+ @PreAuthorize("@ss.hasPermi('project:legacy:query')")
@Operation(summary = "鍒嗛〉鍒楄〃")
public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
return AjaxResult.success(planService.searchPlan(searchPlanVo));
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java b/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java
index 0d5fa17..eb0c39c 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java
@@ -26,18 +26,20 @@
private final ProjectWorkflowService service;
@GetMapping("/{projectId}")
+ @PreAuthorize("@ss.hasPermi('project:info:query')")
@Operation(summary = "椤圭洰妯″潡銆佽窡杩涖�佹眹鎶ャ�佺粺璁″拰璧勬枡")
public AjaxResult workbench(@PathVariable Long projectId) {
return AjaxResult.success(service.getWorkbench(projectId));
}
@GetMapping("/lifecycle/{projectId}")
+ @PreAuthorize("@ss.hasPermi('project:info:query')")
@Operation(summary = "椤圭洰鐢熷懡鍛ㄦ湡")
public AjaxResult lifecycle(@PathVariable Long projectId) {
return AjaxResult.success(service.getLifecycle(projectId));
}
- @PreAuthorize("@ss.hasPermi('project:module:edit')")
+ @PreAuthorize("@ss.hasPermi('project:start')")
@PostMapping("/start/{projectId}")
@Log(title = "椤圭洰绠$悊-寮�濮嬮」鐩�", businessType = BusinessType.UPDATE)
public AjaxResult startProject(@PathVariable Long projectId) {
@@ -46,6 +48,7 @@
}
@PostMapping("/transition")
+ @PreAuthorize("@ss.hasPermi('project:phase:edit')")
@Log(title = "椤圭洰绠$悊-闃舵鎺ㄨ繘", businessType = BusinessType.UPDATE)
public AjaxResult transition(@RequestBody ProjectWorkflowDtos.StageTransitionRequest request) {
service.transitionStage(request);
@@ -86,7 +89,7 @@
@DeleteMapping("/follow-up/{id}")
@Log(title = "椤圭洰绠$悊-璺熻繘鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult deleteFollowUp(@PathVariable Long id) {
- service.softDelete("project_management_follow_up", id);
+ service.deleteFollowUp(id);
return AjaxResult.success();
}
@@ -128,6 +131,7 @@
}
@GetMapping("/category/list")
+ @PreAuthorize("@ss.hasAnyPermi('project:category:list,project:info:add,project:info:edit')")
public AjaxResult categoryList() {
return AjaxResult.success(service.listCategories());
}
@@ -148,6 +152,7 @@
}
@GetMapping("/policy/list")
+ @PreAuthorize("@ss.hasPermi('policy:file:list')")
public AjaxResult policyList(@RequestParam(required = false) String keyword) {
return AjaxResult.success(service.listPolicies(keyword));
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index 709c1aa..d14e0fc 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -14,6 +14,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -28,12 +29,14 @@
private RolesMapper rolesMapper;
@GetMapping("/listPage")
+ @PreAuthorize("@ss.hasPermi('project:legacy:query')")
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
public AjaxResult listPage(Page<Roles> page, Roles roles) {
return AjaxResult.success(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "鏂板")
public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
@@ -43,12 +46,14 @@
}
@PostMapping("/update")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "淇敼")
public AjaxResult update(@RequestBody Roles roles) {
return AjaxResult.success(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
+ @PreAuthorize("@ss.hasPermi('project:legacy:maintain')")
@Operation(summary = "鍒犻櫎")
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -56,6 +61,7 @@
}
@PostMapping("/listSimpleRole")
+ @PreAuthorize("@ss.hasPermi('project:legacy:query')")
public AjaxResult listSimpleRole() {
return AjaxResult.success(rolesservice.listSimpleRole());
}
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
index 3677398..d08a1ce 100644
--- a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
+++ b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
@@ -42,6 +42,7 @@
// 椤圭洰鍒嗙被
private String projectClassification;
+ private Long projectCategoryId;
private Long projectLeaderId;
private String projectLeaderName;
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
index 23ff686..04c9552 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
@@ -80,6 +80,10 @@
@TableField(value = "project_classification")
private String projectClassification;
+ /** 椤圭洰鍒嗙被涓婚敭锛屽悕绉颁粎浣滀负鍘嗗彶灞曠ず蹇収銆� */
+ @TableField(value = "project_category_id")
+ private Long projectCategoryId;
+
/** 椤圭洰璐熻矗浜恒�� */
@TableField(value = "project_leader_id")
private Long projectLeaderId;
diff --git a/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java b/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java
index f2e9b48..85b60ad 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java
@@ -155,10 +155,18 @@
@Transactional(rollbackFor = Exception.class)
public void startProject(Long projectId) {
requireProject(projectId);
+ String currentPhase = jdbc.queryForObject("""
+ select current_phase from project_management_info
+ where id=:projectId and is_delete=0 for update
+ """, Map.of("projectId", projectId), String.class);
+ if (!"鏈紑濮�".equals(currentPhase)) {
+ throw new ServiceException("鍙湁鏈紑濮嬬殑椤圭洰鍙互寮�濮嬶紝褰撳墠闃舵涓衡��" + currentPhase + "鈥�");
+ }
Integer basicReady = jdbc.queryForObject("""
select count(*) from project_management_info
- where id=:projectId and is_delete=0 and project_classification is not null
- and project_classification<>'' and plan_start_time is not null and plan_end_time is not null
+ where id=:projectId and is_delete=0 and project_category_id is not null
+ and plan_start_time is not null and plan_end_time is not null
+ and plan_end_time>=plan_start_time
and project_leader_id is not null and project_manager_ids is not null
and json_length(project_manager_ids)>0 and follow_cycle is not null and follow_cycle<>''
""", Map.of("projectId", projectId), Integer.class);
@@ -169,6 +177,15 @@
from project_management_module where project_id=:projectId and is_deleted=0
""", Map.of("projectId", projectId));
if (modules.isEmpty()) throw new ServiceException("椤圭洰寮�濮嬪墠璇疯嚦灏戞坊鍔犱竴涓」鐩ā鍧�");
+ Integer invalidModuleDates = jdbc.queryForObject("""
+ select count(*) from project_management_module m
+ join project_management_info p on p.id=m.project_id and p.is_delete=0
+ where m.project_id=:projectId and m.is_deleted=0
+ and (m.planned_start_date<p.plan_start_time or m.planned_start_date>p.plan_end_time)
+ """, Map.of("projectId", projectId), Integer.class);
+ if (invalidModuleDates != null && invalidModuleDates > 0) {
+ throw new ServiceException("妯″潡棰勮寮�濮嬫椂闂村繀椤诲湪椤圭洰璁″垝寮�濮嬪拰缁撴潫鏃ユ湡涔嬮棿");
+ }
BigDecimal total = BigDecimal.ZERO;
for (Map<String, Object> module : modules) {
if (isBlank(Objects.toString(module.get("moduleName"), "")) || module.get("plannedStartDate") == null
@@ -208,9 +225,8 @@
public void transitionStage(ProjectWorkflowDtos.StageTransitionRequest request) {
requireProject(request.getProjectId());
ensurePhases(request.getProjectId());
- String current = jdbc.queryForObject("select current_phase from project_management_info where id=:id and is_delete=0",
+ String current = jdbc.queryForObject("select current_phase from project_management_info where id=:id and is_delete=0 for update",
Map.of("id", request.getProjectId()), String.class);
- if ("绔嬮」".equals(current)) current = "寮�鍙�";
Map<String, String> nextStages = Map.of(
"寮�鍙�", "鐢虫姤",
"鐢虫姤", "鐢虫姤缁撴灉",
@@ -221,6 +237,7 @@
if (expected == null || !expected.equals(request.getTargetStage())) {
throw new ServiceException("椤圭洰闃舵鍙兘鎸夊紑鍙戙�佺敵鎶ャ�佺敵鎶ョ粨鏋溿�侀獙鏀躲�佸凡瀹屾垚鐨勯『搴忔帹杩�");
}
+ validateTransitionForm(current, request.getFormData());
if ("寮�鍙�".equals(current)) {
Integer unfinished = jdbc.queryForObject("""
select count(*) from project_management_module
@@ -283,28 +300,16 @@
int index = PHASE_CODES.indexOf(Objects.toString(request.getPhaseCode(), ""));
if (index < 0) throw new ServiceException("椤圭洰闃舵涓嶆纭�");
String status = Objects.toString(request.getStatus(), "IN_PROGRESS").toUpperCase();
- if (!List.of("NOT_STARTED", "IN_PROGRESS", "COMPLETED").contains(status)) {
- throw new ServiceException("闃舵鐘舵�佷笉姝g‘");
+ if (!"IN_PROGRESS".equals(status)) throw new ServiceException("闃舵琛ュ厖鍔炵悊鍙兘淇濇寔杩涜涓姸鎬�");
+ String currentPhase = jdbc.queryForObject("""
+ select current_phase from project_management_info
+ where id=:id and is_delete=0 for update
+ """, Map.of("id", request.getProjectId()), String.class);
+ String expectedCode = phaseCodeForName(currentPhase);
+ if (!Objects.equals(expectedCode, request.getPhaseCode())) {
+ throw new ServiceException("鍙兘缁存姢褰撳墠闃舵鈥�" + currentPhase + "鈥濓紝涓嶈兘璺宠浆鎴栧�掗��闃舵");
}
- if (index > 0 && !"NOT_STARTED".equals(status)) {
- Integer previousDone = jdbc.queryForObject("""
- select count(*) from project_management_phase
- where project_id=:projectId and phase_code=:phaseCode and status='COMPLETED' and is_deleted=0
- """, new MapSqlParameterSource().addValue("projectId", request.getProjectId())
- .addValue("phaseCode", PHASE_CODES.get(index - 1)), Integer.class);
- if (previousDone == null || previousDone == 0) {
- String projectPhase = jdbc.queryForObject("select current_phase from project_management_info where id=:id and is_delete=0",
- Map.of("id", request.getProjectId()), String.class);
- if (lifecyclePhaseRank(projectPhase) < index) {
- throw new ServiceException("璇峰厛瀹屾垚涓婁竴闃舵鈥�" + PHASE_NAMES.get(index - 1) + "鈥�");
- }
- jdbc.update("""
- update project_management_phase set status='COMPLETED',completed_time=coalesce(completed_time,now()),
- update_time=now() where project_id=:projectId and phase_code=:phaseCode and is_deleted=0
- """, new MapSqlParameterSource().addValue("projectId", request.getProjectId())
- .addValue("phaseCode", PHASE_CODES.get(index - 1)));
- }
- }
+ validateSupplementalPhase(currentPhase, request.getFormData());
MapSqlParameterSource p = new MapSqlParameterSource()
.addValue("projectId", request.getProjectId()).addValue("phaseCode", request.getPhaseCode())
.addValue("status", status).addValue("formData", jsonObject(request.getFormData()))
@@ -320,13 +325,6 @@
stageHistoryAction(PHASE_NAMES.get(index), request.getFormData(), false),
stageHistoryLabel(PHASE_NAMES.get(index), request.getFormData(), false),
request.getFormData(), request.getRemark(), request.getAttachments());
- String currentPhase = "COMPLETED".equals(status) && index == PHASE_CODES.size() - 1
- ? "宸插畬鎴�" : PHASE_NAMES.get(index);
- jdbc.update("""
- update project_management_info set current_phase=:phase,
- actual_end_time=case when :phase='宸插畬鎴�' then coalesce(actual_end_time,current_date) else actual_end_time end,
- update_time=now() where id=:projectId
- """, new MapSqlParameterSource().addValue("phase", currentPhase).addValue("projectId", request.getProjectId()));
return jdbc.queryForObject("select id from project_management_phase where project_id=:projectId and phase_code=:phaseCode and is_deleted=0",
p, Long.class);
}
@@ -402,6 +400,17 @@
validateMembers(request.getMembers());
boolean started = isProjectStarted(request.getProjectId());
+ if (!started) {
+ Integer dateInProjectRange = jdbc.queryForObject("""
+ select count(*) from project_management_info
+ where id=:projectId and is_delete=0 and plan_start_time is not null and plan_end_time is not null
+ and :plannedStartDate between plan_start_time and plan_end_time
+ """, new MapSqlParameterSource().addValue("projectId", request.getProjectId())
+ .addValue("plannedStartDate", request.getPlannedStartDate()), Integer.class);
+ if (dateInProjectRange == null || dateInProjectRange == 0) {
+ throw new ServiceException("妯″潡棰勮寮�濮嬫椂闂村繀椤诲湪椤圭洰璁″垝寮�濮嬪拰缁撴潫鏃ユ湡涔嬮棿");
+ }
+ }
if (started && request.getId() == null) {
throw new ServiceException("椤圭洰寮�濮嬪悗涓嶈兘鏂板妯″潡锛屼粎鍙鐞嗘ā鍧楁墽琛屼汉");
}
@@ -534,15 +543,23 @@
public Long saveFollowUp(ProjectWorkflowDtos.FollowUpRequest request) {
requireProject(request.getProjectId());
ensureProjectMaintenanceEditable(request.getProjectId());
- Long leaderId = jdbc.queryForObject("select project_leader_id from project_management_info where id=:id",
- Map.of("id", request.getProjectId()), Long.class);
- if (leaderId == null || !leaderId.equals(SecurityUtils.getUserId())) {
- throw new ServiceException("鍙湁椤圭洰璐熻矗浜哄彲浠ュ~鍐欓」鐩窡杩�");
- }
+ ensureProjectLeader(request.getProjectId());
if (request.getFollowDate() == null || isBlank(request.getDetail())) {
throw new ServiceException("璇峰~鍐欒窡杩涙棩鏈熷拰璺熻繘璇︽儏");
}
- validateFollowWindow(request.getProjectId(), request.getFollowDate(), request.getId());
+ if (request.getFollowDate().isAfter(LocalDate.now())) throw new ServiceException("璺熻繘鏃ユ湡涓嶈兘鏅氫簬浠婂ぉ");
+ if (request.getId() == null) {
+ validateFollowWindow(request.getProjectId(), request.getFollowDate(), null);
+ } else {
+ LocalDate oldDate = jdbc.query("""
+ select follow_date from project_management_follow_up
+ where id=:id and project_id=:projectId and is_deleted=0
+ """, new MapSqlParameterSource().addValue("id", request.getId())
+ .addValue("projectId", request.getProjectId()),
+ rs -> rs.next() ? rs.getDate(1).toLocalDate() : null);
+ if (oldDate == null) throw new ServiceException("璺熻繘璁板綍涓嶅瓨鍦�");
+ if (!oldDate.equals(request.getFollowDate())) throw new ServiceException("宸叉湁璺熻繘璁板綍涓嶈兘淇敼璺熻繘鏃ユ湡");
+ }
MapSqlParameterSource p = new MapSqlParameterSource()
.addValue("id", request.getId()).addValue("projectId", request.getProjectId())
.addValue("followDate", request.getFollowDate()).addValue("detail", request.getDetail())
@@ -557,11 +574,23 @@
""", p, keys, new String[]{"id"});
return Objects.requireNonNull(keys.getKey()).longValue();
}
- jdbc.update("""
+ int updated = jdbc.update("""
update project_management_follow_up set follow_date=:followDate,detail=:detail,
attachments=:attachments,update_time=now() where id=:id and project_id=:projectId and is_deleted=0
""", p);
+ if (updated == 0) throw new ServiceException("璺熻繘璁板綍涓嶅瓨鍦�");
return request.getId();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteFollowUp(Long id) {
+ Long projectId = jdbc.query("""
+ select project_id from project_management_follow_up where id=:id and is_deleted=0
+ """, Map.of("id", id), rs -> rs.next() ? rs.getLong(1) : null);
+ if (projectId == null) throw new ServiceException("璺熻繘璁板綍涓嶅瓨鍦�");
+ ensureProjectMaintenanceEditable(projectId);
+ ensureProjectLeader(projectId);
+ jdbc.update("update project_management_follow_up set is_deleted=1,update_time=now() where id=:id", Map.of("id", id));
}
@Transactional(rollbackFor = Exception.class)
@@ -571,11 +600,15 @@
if (request.getModuleId() == null || request.getReportDate() == null) {
throw new ServiceException("璇烽�夋嫨椤圭洰妯″潡鍜屾眹鎶ユ椂闂�");
}
+ if (request.getReportDate().isAfter(LocalDate.now())) {
+ throw new ServiceException("姹囨姤鏃堕棿涓嶈兘鏅氫簬浠婂ぉ");
+ }
BigDecimal increment = percent(request.getIncrementProgress(), "鏈杩涘害");
if (increment.compareTo(BigDecimal.ZERO) <= 0) throw new ServiceException("鏈杩涘害蹇呴』澶т簬0");
BigDecimal current = jdbc.queryForObject("""
select current_progress from project_management_module
where id=:moduleId and project_id=:projectId and is_deleted=0
+ for update
""", new MapSqlParameterSource().addValue("moduleId", request.getModuleId()).addValue("projectId", request.getProjectId()), BigDecimal.class);
if (current == null) throw new ServiceException("椤圭洰妯″潡涓嶅瓨鍦�");
List<ProjectWorkflowDtos.MemberRequest> reporterShares = normalizeReporterShares(request);
@@ -588,26 +621,33 @@
if (reporterShares.stream().anyMatch(member -> !moduleMemberIds.contains(member.getUserId()))) {
throw new ServiceException("姹囨姤浜哄憳鍙兘閫夋嫨璇ユā鍧楁墽琛屼汉");
}
+ if (reporterShares.stream().noneMatch(member -> Objects.equals(member.getUserId(), SecurityUtils.getUserId()))) {
+ throw new ServiceException("褰撳墠鍔炵悊浜哄繀椤诲寘鍚湪鏈姹囨姤浜哄憳涓�");
+ }
request.setReporterIds(reporterShares.stream().map(ProjectWorkflowDtos.MemberRequest::getUserId).toList());
request.setReporterNames(reporterShares.stream().map(ProjectWorkflowDtos.MemberRequest::getUserName).toList());
Long reportId = request.getId();
BigDecimal progress;
BigDecimal progressAdjustment = BigDecimal.ZERO;
if (reportId == null) {
- progress = current.add(increment);
- if (progress.compareTo(BigDecimal.valueOf(100)) > 0) {
+ BigDecimal finalProgress = current.add(increment);
+ if (finalProgress.compareTo(BigDecimal.valueOf(100)) > 0) {
throw new ServiceException("妯″潡褰撳墠杩涘害涓�" + current.stripTrailingZeros().toPlainString()
+ "% 锛屾湰娆¤繘搴︽渶澶氬彲濉啓" + BigDecimal.valueOf(100).subtract(current).stripTrailingZeros().toPlainString() + "%");
}
+ progress = previousReportProgress(request.getModuleId(), request.getReportDate(), Long.MAX_VALUE).add(increment);
} else {
Map<String, Object> oldReport = query("""
- select id,module_id as moduleId,report_date as reportDate,progress
+ select id,module_id as moduleId,report_date as reportDate,progress,reporter_ids as reporterIds
from project_management_progress_report
where id=:id and project_id=:projectId and is_deleted=0
""", new MapSqlParameterSource().addValue("id", reportId).addValue("projectId", request.getProjectId()))
.stream().findFirst().orElseThrow(() -> new ServiceException("杩涘害姹囨姤涓嶅瓨鍦�"));
if (!Objects.equals(asLong(oldReport.get("moduleId")), request.getModuleId())) {
throw new ServiceException("宸叉湁杩涘害姹囨姤涓嶈兘鏇存崲椤圭洰妯″潡");
+ }
+ if (!parseLongList(oldReport.get("reporterIds")).contains(SecurityUtils.getUserId())) {
+ throw new ServiceException("鍙湁鍘熸眹鎶ュ姙鐞嗕汉鍙互缂栬緫璇ヨ繘搴︽眹鎶�");
}
LocalDate oldDate = oldReport.get("reportDate") instanceof java.sql.Date date ? date.toLocalDate() : request.getReportDate();
if (!Objects.equals(oldDate, request.getReportDate())) throw new ServiceException("宸叉湁杩涘害姹囨姤涓嶈兘淇敼姹囨姤鏃堕棿");
@@ -636,6 +676,11 @@
values (:projectId,:moduleId,:reporterIds,:reporterNames,:reporterShares,:progress,:reportDate,:remark,:attachments,0,now(),now())
""", p, keys, new String[]{"id"});
reportId = Objects.requireNonNull(keys.getKey()).longValue();
+ jdbc.update("""
+ update project_management_progress_report set progress=progress+:increment,update_time=now()
+ where module_id=:moduleId and is_deleted=0 and report_date>:reportDate
+ """, new MapSqlParameterSource().addValue("increment", increment)
+ .addValue("moduleId", request.getModuleId()).addValue("reportDate", request.getReportDate()));
} else {
jdbc.update("""
update project_management_progress_report set module_id=:moduleId,reporter_ids=:reporterIds,
@@ -659,16 +704,19 @@
@Transactional(rollbackFor = Exception.class)
public void deleteReport(Long id) {
Map<String, Object> report = query("""
- select id,project_id as projectId,module_id as moduleId,report_date as reportDate,progress
+ select id,project_id as projectId,module_id as moduleId,report_date as reportDate,progress,
+ reporter_ids as reporterIds
from project_management_progress_report where id=:id and is_deleted=0
""", Map.of("id", id)).stream().findFirst().orElseThrow(() -> new ServiceException("杩涘害姹囨姤涓嶅瓨鍦�"));
ensureProjectMaintenanceEditable(asLong(report.get("projectId")));
Long moduleId = asLong(report.get("moduleId"));
- List<Long> moduleMemberIds = query("""
- select user_id as userId from project_management_module_member
- where module_id=:moduleId and is_deleted=0
- """, Map.of("moduleId", moduleId)).stream().map(row -> asLong(row.get("userId"))).toList();
- if (!moduleMemberIds.contains(SecurityUtils.getUserId())) throw new ServiceException("鍙湁璇ユā鍧楁墽琛屼汉鍙互鍒犻櫎杩涘害姹囨姤");
+ if (!parseLongList(report.get("reporterIds")).contains(SecurityUtils.getUserId())) {
+ throw new ServiceException("鍙湁鍘熸眹鎶ュ姙鐞嗕汉鍙互鍒犻櫎璇ヨ繘搴︽眹鎶�");
+ }
+ BigDecimal lockedProgress = jdbc.queryForObject("""
+ select current_progress from project_management_module where id=:moduleId and is_deleted=0 for update
+ """, Map.of("moduleId", moduleId), BigDecimal.class);
+ if (lockedProgress == null) throw new ServiceException("椤圭洰妯″潡涓嶅瓨鍦�");
LocalDate reportDate = report.get("reportDate") instanceof java.sql.Date date ? date.toLocalDate() : null;
BigDecimal previous = previousReportProgress(moduleId, reportDate, id);
BigDecimal increment = nvl((BigDecimal) report.get("progress")).subtract(previous).max(BigDecimal.ZERO);
@@ -689,6 +737,9 @@
requireProject(request.getProjectId());
ensureProjectMaintenanceEditable(request.getProjectId());
if (isBlank(request.getMaterialName())) throw new ServiceException("璇疯緭鍏ヨ祫鏂欏悕绉�");
+ if (request.getAttachments() == null || request.getAttachments().isEmpty()) {
+ throw new ServiceException("璇蜂笂浼犺嚦灏戜竴涓」鐩祫鏂欐枃浠�");
+ }
MapSqlParameterSource p = new MapSqlParameterSource()
.addValue("id", request.getId()).addValue("projectId", request.getProjectId())
.addValue("materialName", request.getMaterialName()).addValue("materialType", request.getMaterialType())
@@ -703,11 +754,12 @@
""", p, keys, new String[]{"id"});
return Objects.requireNonNull(keys.getKey()).longValue();
}
- jdbc.update("""
+ int updated = jdbc.update("""
update project_management_material set material_name=:materialName,material_type=:materialType,
remark=:remark,attachments=:attachments,update_time=now()
where id=:id and project_id=:projectId and is_deleted=0
""", p);
+ if (updated == 0) throw new ServiceException("椤圭洰璧勬枡涓嶅瓨鍦�");
return request.getId();
}
@@ -721,7 +773,8 @@
if (projectId == null) throw new ServiceException("璁板綍涓嶅瓨鍦�");
ensureProjectMaintenanceEditable(projectId);
}
- jdbc.getJdbcTemplate().update("update " + table + " set is_deleted=1,update_time=now() where id=?", id);
+ int updated = jdbc.getJdbcTemplate().update("update " + table + " set is_deleted=1,update_time=now() where id=? and is_deleted=0", id);
+ if (updated == 0) throw new ServiceException("璁板綍涓嶅瓨鍦�");
}
public List<Map<String, Object>> listCategories() {
@@ -736,6 +789,14 @@
if (isBlank(request.getCategoryName())) throw new ServiceException("璇疯緭鍏ュ垎绫诲悕绉�");
Long parentId = request.getParentId() == null ? 0L : request.getParentId();
if (request.getId() != null && request.getId().equals(parentId)) throw new ServiceException("涓婄骇鍒嗙被涓嶈兘閫夋嫨鑷繁");
+ validateCategoryParent(request.getId(), parentId);
+ Integer duplicate = jdbc.queryForObject("""
+ select count(*) from project_management_category
+ where coalesce(parent_id,0)=:parentId and category_name=:categoryName and is_deleted=0
+ and (:id is null or id<>:id)
+ """, new MapSqlParameterSource().addValue("parentId", parentId)
+ .addValue("categoryName", request.getCategoryName().trim()).addValue("id", request.getId()), Integer.class);
+ if (duplicate != null && duplicate > 0) throw new ServiceException("鍚屼竴涓婄骇涓嬪凡瀛樺湪鍚屽悕鍒嗙被");
MapSqlParameterSource p = new MapSqlParameterSource().addValue("id", request.getId())
.addValue("parentId", parentId).addValue("categoryName", request.getCategoryName().trim())
.addValue("sort", request.getSort() == null ? 0 : request.getSort()).addValue("remark", request.getRemark());
@@ -747,17 +808,41 @@
""", p, keys, new String[]{"id"});
return Objects.requireNonNull(keys.getKey()).longValue();
}
- jdbc.update("""
+ int updated = jdbc.update("""
update project_management_category set parent_id=:parentId,category_name=:categoryName,
sort=:sort,remark=:remark,update_time=now() where id=:id and is_deleted=0
""", p);
+ if (updated == 0) throw new ServiceException("椤圭洰鍒嗙被涓嶅瓨鍦ㄦ垨宸插垹闄�");
return request.getId();
}
public void deleteCategory(Long id) {
int children = jdbc.queryForObject("select count(*) from project_management_category where parent_id=:id and is_deleted=0", Map.of("id", id), Integer.class);
if (children > 0) throw new ServiceException("璇峰厛鍒犻櫎涓嬬骇鍒嗙被");
+ String categoryName = jdbc.query("select category_name from project_management_category where id=:id and is_deleted=0",
+ Map.of("id", id), rs -> rs.next() ? rs.getString(1) : null);
+ if (categoryName == null) throw new ServiceException("椤圭洰鍒嗙被涓嶅瓨鍦�");
+ Integer used = jdbc.queryForObject("""
+ select count(*) from project_management_info
+ where is_delete=0 and (project_category_id=:id or
+ (project_category_id is null and project_classification=:categoryName))
+ """, new MapSqlParameterSource().addValue("id", id).addValue("categoryName", categoryName), Integer.class);
+ if (used != null && used > 0) throw new ServiceException("璇ュ垎绫诲凡琚」鐩娇鐢紝涓嶈兘鍒犻櫎");
jdbc.update("update project_management_category set is_deleted=1,update_time=now() where id=:id", Map.of("id", id));
+ }
+
+ private void validateCategoryParent(Long categoryId, Long parentId) {
+ if (parentId == null || parentId == 0L) return;
+ Set<Long> visited = new HashSet<>();
+ Long current = parentId;
+ while (current != null && current != 0L) {
+ if (Objects.equals(current, categoryId)) throw new ServiceException("涓婄骇鍒嗙被涓嶈兘閫夋嫨褰撳墠鍒嗙被鎴栧叾涓嬬骇鍒嗙被");
+ if (!visited.add(current)) throw new ServiceException("鍒嗙被鏁版嵁宸插瓨鍦ㄥ惊鐜紝璇峰厛淇鍒嗙被鍏崇郴");
+ current = jdbc.query("""
+ select parent_id from project_management_category where id=:id and is_deleted=0
+ """, Map.of("id", current), rs -> rs.next() ? rs.getLong(1) : null);
+ if (current == null) throw new ServiceException("涓婄骇鍒嗙被涓嶅瓨鍦ㄦ垨宸插垹闄�");
+ }
}
public List<Map<String, Object>> listPolicies(String keyword) {
@@ -790,11 +875,12 @@
""", p, keys, new String[]{"id"});
return Objects.requireNonNull(keys.getKey()).longValue();
}
- jdbc.update("""
+ int updated = jdbc.update("""
update government_policy_file set policy_name=:policyName,publish_date=:publishDate,
policy_url=:policyUrl,attachments=:attachments,maintainer_name=:maintainer,
remark=:remark,update_time=now() where id=:id and is_deleted=0
""", p);
+ if (updated == 0) throw new ServiceException("鏀跨瓥鏂囦欢涓嶅瓨鍦ㄦ垨宸插垹闄�");
return request.getId();
}
@@ -1160,6 +1246,84 @@
return val.setScale(2, RoundingMode.HALF_UP);
}
+ private void validateTransitionForm(String currentPhase, Map<String, Object> formData) {
+ switch (currentPhase) {
+ case "寮�鍙�" -> {
+ requireDate(formData, "applicationDate", "鐢虫姤鏃ユ湡");
+ requireText(formData, "applicationType", "鐢虫姤绫诲瀷");
+ requireText(formData, "applicationName", "鐢虫姤鍚嶇О");
+ requireText(formData, "description", "鐢虫姤璇存槑");
+ }
+ case "鐢虫姤" -> {
+ requireDate(formData, "resultDate", "缁撴灉鏃ユ湡");
+ requireValue(formData, "resultStatus", "PASS", "鍙湁鐢虫姤閫氳繃鍚庢墠鑳借繘鍏ョ敵鎶ョ粨鏋滈樁娈�");
+ requireText(formData, "resultDescription", "缁撴灉璇存槑");
+ }
+ case "鐢虫姤缁撴灉" -> {
+ requireDate(formData, "acceptancePlanDate", "璁″垝楠屾敹鏃ユ湡");
+ requireText(formData, "acceptor", "楠屾敹浜�/瀹㈡埛");
+ requireText(formData, "acceptanceStandard", "楠屾敹鏍囧噯");
+ }
+ case "楠屾敹" -> {
+ requireDate(formData, "acceptanceDate", "楠屾敹鏃ユ湡");
+ requireText(formData, "acceptor", "楠屾敹浜�/瀹㈡埛");
+ requireValue(formData, "acceptanceResult", "PASS", "鍙湁楠屾敹閫氳繃鍚庢墠鑳藉畬鎴愰」鐩�");
+ requireText(formData, "acceptanceDescription", "楠屾敹璇存槑");
+ }
+ default -> throw new ServiceException("褰撳墠闃舵涓嶈兘鍔炵悊娴佽浆");
+ }
+ }
+
+ private void validateSupplementalPhase(String currentPhase, Map<String, Object> formData) {
+ if ("鐢虫姤".equals(currentPhase)) {
+ requireDate(formData, "resultDate", "缁撴灉鏃ユ湡");
+ String result = requireText(formData, "resultStatus", "鐢虫姤缁撴灉");
+ if (!List.of("SUPPLEMENT", "REJECTED").contains(result)) {
+ throw new ServiceException("鐢虫姤閫氳繃蹇呴』浣跨敤闃舵鎺ㄨ繘鎿嶄綔");
+ }
+ requireText(formData, "resultDescription", "缁撴灉璇存槑");
+ return;
+ }
+ if ("楠屾敹".equals(currentPhase)) {
+ requireDate(formData, "acceptanceDate", "楠屾敹鏃ユ湡");
+ requireText(formData, "acceptor", "楠屾敹浜�/瀹㈡埛");
+ requireValue(formData, "acceptanceResult", "RECTIFY", "楠屾敹閫氳繃蹇呴』浣跨敤瀹屾垚椤圭洰鎿嶄綔");
+ requireText(formData, "acceptanceDescription", "楠屾敹璇存槑");
+ return;
+ }
+ throw new ServiceException("褰撳墠闃舵涓嶆敮鎸佽ˉ鍏呭姙鐞嗭紝鍙兘鎸夋祦绋嬫帹杩�");
+ }
+
+ private String phaseCodeForName(String phaseName) {
+ return switch (Objects.toString(phaseName, "")) {
+ case "绔嬮」" -> "INITIATION";
+ case "寮�鍙�" -> "DEVELOPMENT";
+ case "鐢虫姤" -> "APPLICATION";
+ case "鐢虫姤缁撴灉" -> "RESULT";
+ case "楠屾敹" -> "ACCEPTANCE";
+ default -> null;
+ };
+ }
+
+ private String requireText(Map<String, Object> formData, String key, String label) {
+ String value = Objects.toString(formData == null ? null : formData.get(key), "").trim();
+ if (value.isEmpty()) throw new ServiceException("璇峰~鍐�" + label);
+ return value;
+ }
+
+ private void requireDate(Map<String, Object> formData, String key, String label) {
+ String value = requireText(formData, key, label);
+ try {
+ LocalDate.parse(value);
+ } catch (Exception e) {
+ throw new ServiceException(label + "鏍煎紡涓嶆纭�");
+ }
+ }
+
+ private void requireValue(Map<String, Object> formData, String key, String expected, String message) {
+ if (!expected.equals(requireText(formData, key, key))) throw new ServiceException(message);
+ }
+
private void requireProject(Long projectId) {
if (projectId == null) throw new ServiceException("椤圭洰涓嶈兘涓虹┖");
Integer count = jdbc.queryForObject("select count(*) from project_management_info where id=:id and is_delete=0", Map.of("id", projectId), Integer.class);
@@ -1174,6 +1338,14 @@
}
}
+ private void ensureProjectLeader(Long projectId) {
+ Long leaderId = jdbc.query("select project_leader_id from project_management_info where id=:id and is_delete=0",
+ Map.of("id", projectId), rs -> rs.next() ? rs.getLong(1) : null);
+ if (leaderId == null || !leaderId.equals(SecurityUtils.getUserId())) {
+ throw new ServiceException("鍙湁椤圭洰璐熻矗浜哄彲浠ョ淮鎶ら」鐩窡杩�");
+ }
+ }
+
private List<Map<String, Object>> query(String sql, Map<String, ?> params) {
return jdbc.queryForList(sql, params);
}
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
index 4a5aed5..4592366 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
@@ -9,6 +9,7 @@
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.common.enums.PlanStageEnum;
import com.ruoyi.common.enums.ReviewStatusEnum;
+import com.ruoyi.common.enums.IsDeleteEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.projectManagement.dto.InfoStageDto;
import com.ruoyi.projectManagement.dto.PlanStageDto;
@@ -19,11 +20,13 @@
import com.ruoyi.projectManagement.service.PlanService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.transaction.annotation.Transactional;
import jakarta.validation.constraints.NotNull;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -45,9 +48,17 @@
private final CustomerFollowUpFileService customerFollowUpFileService;
+ private final NamedParameterJdbcTemplate jdbc;
+
@Transactional(rollbackFor = Exception.class)
public Long save(@NotNull SaveInfoDto saveInfoDto) {
Info info = BeanUtil.copyProperties(saveInfoDto, Info.class);
+
+ if (info.getPlanStartTime() != null && info.getPlanEndTime() != null
+ && info.getPlanEndTime().isBefore(info.getPlanStartTime())) {
+ throw new ServiceException("棰勮缁撴潫鏃堕棿涓嶈兘鏃╀簬棰勮寮�濮嬫椂闂�");
+ }
+ bindProjectCategory(info);
// 闄勪欢鐗规畩澶勭悊
String attachmentIds = StrUtil.join(",", Optional.ofNullable(saveInfoDto.getAttachmentIds()).orElse(Collections.emptyList()));
@@ -70,13 +81,34 @@
infoMapper.insert(info);
} else {
Info existing = infoMapper.selectById(info.getId());
- if (existing == null) throw new ServiceException("椤圭洰涓嶅瓨鍦�");
+ if (existing == null || Integer.valueOf(IsDeleteEnum.DELETED.getCode()).equals(existing.getIsDelete())) {
+ throw new ServiceException("椤圭洰涓嶅瓨鍦ㄦ垨宸插垹闄�");
+ }
if (!StrUtil.isBlank(existing.getCurrentPhase()) && !"鏈紑濮�".equals(existing.getCurrentPhase())) {
throw new ServiceException("椤圭洰寮�濮嬪悗锛岄」鐩熀鏈俊鎭�佽礋璐d汉鍜岄」鐩粡鐞嗗潎涓嶅彲淇敼");
}
infoMapper.updateById(info);
}
return info.getId();
+ }
+
+ private void bindProjectCategory(Info info) {
+ if (info.getProjectCategoryId() != null) {
+ List<String> names = jdbc.queryForList("""
+ select category_name from project_management_category
+ where id=:id and is_deleted=0
+ """, Map.of("id", info.getProjectCategoryId()), String.class);
+ if (names.isEmpty()) throw new ServiceException("椤圭洰鍒嗙被涓嶅瓨鍦ㄦ垨宸插垹闄�");
+ info.setProjectClassification(names.getFirst());
+ return;
+ }
+ if (!StrUtil.isBlank(info.getProjectClassification())) {
+ List<Long> ids = jdbc.queryForList("""
+ select id from project_management_category
+ where category_name=:name and is_deleted=0 order by id
+ """, Map.of("name", info.getProjectClassification().trim()), Long.class);
+ if (ids.size() == 1) info.setProjectCategoryId(ids.getFirst());
+ }
}
@Transactional
@@ -86,6 +118,9 @@
public SaveInfoDto getInfoById(@NotNull Long id) {
Info info = infoMapper.selectById(id);
+ if (info == null || Integer.valueOf(IsDeleteEnum.DELETED.getCode()).equals(info.getIsDelete())) {
+ throw new ServiceException("椤圭洰涓嶅瓨鍦ㄦ垨宸插垹闄�");
+ }
return convert(info);
}
@@ -107,6 +142,7 @@
public List<SaveInfoDto> getSubordinateInfo(@NotNull Long id) {
LambdaQueryWrapper<Info> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Info::getProjectManagementInfoParentId, id);
+ queryWrapper.eq(Info::getIsDelete, IsDeleteEnum.NOT_DELETED.getCode());
queryWrapper.orderByAsc(Info::getCreateTime);
List<Info> infoList = infoMapper.selectList(queryWrapper);
return infoList.stream().map(this::convert).collect(Collectors.toList());
diff --git a/src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java b/src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java
index 166cc32..82885c5 100644
--- a/src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java
+++ b/src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java
@@ -9,6 +9,7 @@
import lombok.NoArgsConstructor;
import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
@@ -23,6 +24,7 @@
public class SaveInfoVo implements Serializable {
@Valid
+ @NotNull(message = "椤圭洰淇℃伅涓嶈兘涓虹┖")
private SaveInfoDto info;
@Valid
diff --git a/src/main/java/com/ruoyi/projectManagement/vo/SearchInfoVo.java b/src/main/java/com/ruoyi/projectManagement/vo/SearchInfoVo.java
index 725dc9a..3a9dce7 100644
--- a/src/main/java/com/ruoyi/projectManagement/vo/SearchInfoVo.java
+++ b/src/main/java/com/ruoyi/projectManagement/vo/SearchInfoVo.java
@@ -23,6 +23,9 @@
private String noOrName; // 椤圭洰缂栧彿鎴栭」鐩悕绉�
private String clientName; // 瀹㈡埛鍚嶇О
private String salesmanName; // 涓氬姟鍛�
+ private String source; // 椤圭洰鏉ユ簮
+ private Long projectCategoryId; // 椤圭洰鍒嗙被
+ private String currentPhase; // 褰撳墠闃舵
// 瀹℃壒鐘舵��
private ReviewStatusEnum reviewStatus;
diff --git a/src/main/resources/mapper/projectManagement/InfoMapper.xml b/src/main/resources/mapper/projectManagement/InfoMapper.xml
index c6b9683..1cba115 100644
--- a/src/main/resources/mapper/projectManagement/InfoMapper.xml
+++ b/src/main/resources/mapper/projectManagement/InfoMapper.xml
@@ -15,6 +15,7 @@
<result property="projectManagementPlanId" column="project_management_plan_id" jdbcType="BIGINT"/>
<result property="source" column="source" jdbcType="VARCHAR"/>
<result property="projectClassification" column="project_classification" jdbcType="VARCHAR"/>
+ <result property="projectCategoryId" column="project_category_id" jdbcType="BIGINT"/>
<result property="projectLeaderId" column="project_leader_id" jdbcType="BIGINT"/>
<result property="projectLeaderName" column="project_leader_name" jdbcType="VARCHAR"/>
<result property="projectManagerIds" column="project_manager_ids"
@@ -50,7 +51,7 @@
<sql id="Base_Column_List">
id,no,title,
client_id,client_name,project_management_info_parent_id,
- establish_time,project_management_plan_id,source,project_classification,
+ establish_time,project_management_plan_id,source,project_classification,project_category_id,
project_leader_id,project_leader_name,project_manager_ids,project_manager_names,
follow_cycle,follow_detail,current_phase,source_business_id,
manager_id,manager_name,salesman_id,
@@ -63,6 +64,8 @@
</sql>
<resultMap id="ListInfoVoMap" type="com.ruoyi.projectManagement.vo.ListInfoVo">
+ <result column="project_category_id" property="projectCategoryId"/>
+ <result column="project_classification" property="projectClassification"/>
<result column="project_leader_id" property="projectLeaderId"/>
<result column="project_leader_name" property="projectLeaderName"/>
<result column="project_manager_ids" property="projectManagerIds"
@@ -98,6 +101,15 @@
<if test="vo.salesmanName != null and vo.salesmanName != ''">
and t1.salesman_name like concat('%', #{vo.salesmanName}, '%')
</if>
+ <if test="vo.source != null and vo.source != ''">
+ and t1.source = #{vo.source}
+ </if>
+ <if test="vo.projectCategoryId != null">
+ and t1.project_category_id = #{vo.projectCategoryId}
+ </if>
+ <if test="vo.currentPhase != null and vo.currentPhase != ''">
+ and t1.current_phase = #{vo.currentPhase}
+ </if>
<if test="vo.reviewStatus != null">
and t1.review_status = #{vo.reviewStatus.code}
</if>
diff --git a/src/test/java/com/ruoyi/projectManagement/service/ProjectWorkflowServiceTest.java b/src/test/java/com/ruoyi/projectManagement/service/ProjectWorkflowServiceTest.java
new file mode 100644
index 0000000..d3d89db
--- /dev/null
+++ b/src/test/java/com/ruoyi/projectManagement/service/ProjectWorkflowServiceTest.java
@@ -0,0 +1,107 @@
+package com.ruoyi.projectManagement.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.projectManagement.controller.InfoController;
+import com.ruoyi.projectManagement.dto.ProjectWorkflowDtos;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ProjectWorkflowServiceTest {
+ @Mock
+ private NamedParameterJdbcTemplate jdbc;
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void completedProjectCannotBeStartedAgain() {
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(Integer.class))).thenReturn(1);
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(String.class))).thenReturn("宸插畬鎴�");
+ ProjectWorkflowService service = new ProjectWorkflowService(jdbc, objectMapper);
+
+ assertThatThrownBy(() -> service.startProject(10L))
+ .isInstanceOf(ServiceException.class)
+ .hasMessageContaining("鍙湁鏈紑濮嬬殑椤圭洰鍙互寮�濮�");
+ }
+
+ @Test
+ void transitionCannotSkipStages() {
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(Integer.class))).thenReturn(1);
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(String.class))).thenReturn("寮�鍙�");
+ ProjectWorkflowService service = new ProjectWorkflowService(jdbc, objectMapper);
+ ProjectWorkflowDtos.StageTransitionRequest request = new ProjectWorkflowDtos.StageTransitionRequest();
+ request.setProjectId(10L);
+ request.setTargetStage("楠屾敹");
+
+ assertThatThrownBy(() -> service.transitionStage(request))
+ .isInstanceOf(ServiceException.class)
+ .hasMessageContaining("鍙兘鎸夊紑鍙戙�佺敵鎶ャ�佺敵鎶ョ粨鏋溿�侀獙鏀躲�佸凡瀹屾垚鐨勯『搴忔帹杩�");
+ }
+
+ @Test
+ void legacyEstablishedProjectCannotBypassExplicitStart() {
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(Integer.class))).thenReturn(1);
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(String.class))).thenReturn("绔嬮」");
+ ProjectWorkflowService service = new ProjectWorkflowService(jdbc, objectMapper);
+ ProjectWorkflowDtos.StageTransitionRequest request = new ProjectWorkflowDtos.StageTransitionRequest();
+ request.setProjectId(10L);
+ request.setTargetStage("鐢虫姤");
+
+ assertThatThrownBy(() -> service.transitionStage(request))
+ .isInstanceOf(ServiceException.class)
+ .hasMessageContaining("鍙兘鎸夊紑鍙戙�佺敵鎶ャ�佺敵鎶ョ粨鏋溿�侀獙鏀躲�佸凡瀹屾垚鐨勯『搴忔帹杩�");
+ }
+
+ @Test
+ void transitionRequiresCurrentStageBusinessFields() {
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(Integer.class))).thenReturn(1);
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(String.class))).thenReturn("寮�鍙�");
+ ProjectWorkflowService service = new ProjectWorkflowService(jdbc, objectMapper);
+ ProjectWorkflowDtos.StageTransitionRequest request = new ProjectWorkflowDtos.StageTransitionRequest();
+ request.setProjectId(10L);
+ request.setTargetStage("鐢虫姤");
+ request.setFormData(Map.of());
+
+ assertThatThrownBy(() -> service.transitionStage(request))
+ .isInstanceOf(ServiceException.class)
+ .hasMessageContaining("璇峰~鍐欑敵鎶ユ棩鏈�");
+ }
+
+ @Test
+ void supplementalPhaseCannotModifyEarlierStage() {
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(Integer.class))).thenReturn(1);
+ when(jdbc.queryForObject(anyString(), anyMap(), eq(String.class))).thenReturn("楠屾敹");
+ ProjectWorkflowService service = new ProjectWorkflowService(jdbc, objectMapper);
+ ProjectWorkflowDtos.PhaseRequest request = new ProjectWorkflowDtos.PhaseRequest();
+ request.setProjectId(10L);
+ request.setPhaseCode("APPLICATION");
+ request.setStatus("IN_PROGRESS");
+
+ assertThatThrownBy(() -> service.savePhase(request))
+ .isInstanceOf(ServiceException.class)
+ .hasMessageContaining("涓嶈兘璺宠浆鎴栧�掗��闃舵");
+ }
+
+ @Test
+ void legacyStageWriteAndReadEndpointsAreRetired() throws Exception {
+ assertThat(InfoController.class.getMethod("saveStage", com.ruoyi.projectManagement.vo.SaveInfoStageVo.class)
+ .getAnnotation(PreAuthorize.class).value()).isEqualTo("denyAll()");
+ assertThat(InfoController.class.getMethod("listStage", Long.class)
+ .getAnnotation(PreAuthorize.class).value()).isEqualTo("denyAll()");
+ assertThat(InfoController.class.getMethod("deleteStage", Long.class)
+ .getAnnotation(PreAuthorize.class).value()).isEqualTo("denyAll()");
+ }
+}
--
Gitblit v1.9.3