diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 7911564..30c5c41 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -144,14 +144,15 @@ public class ProjectProcessService { for (Dept dept : level1) { // 只需要一级领导 Admin leader = userRepository.getAdminById(dept.getManagerId()); + Integer leaderId = leader.getId(); String leaderName = leader.getRealName(); - DeptReturnValue returnValue = createReturnValue(dept, leaderName); + DeptReturnValue returnValue = createReturnValue(dept, leaderId, leaderName); for (Dept dept2 : level2) { if (Objects.equals(dept2.getParentId(), dept.getId())) { - DeptReturnValue returnValue2 = createReturnValue(dept2, leaderName); + DeptReturnValue returnValue2 = createReturnValue(dept2, leaderId, leaderName); for (Dept dept3 : level3) { if (Objects.equals(dept3.getParentId(), dept2.getId())) { - returnValue2.addChildren(createReturnValue(dept3, leaderName)); + returnValue2.addChildren(createReturnValue(dept3, leaderId, leaderName)); } } returnValue.addChildren(returnValue2); @@ -172,12 +173,12 @@ public class ProjectProcessService { return ret; } - private DeptReturnValue createReturnValue(Dept dept, String leaderName) { + private DeptReturnValue createReturnValue(Dept dept, Integer leaderId, String leaderName) { DeptReturnValue returnValue = new DeptReturnValue(); returnValue.setId(dept.getId()); returnValue.setName(dept.getName()); - returnValue.setLeaderId(dept.getManagerId()); + returnValue.setLeaderId(leaderId); returnValue.setLeaderName(leaderName); return returnValue; } diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0-ddl.sql similarity index 89% rename from src/main/resources/sql/2.0.sql rename to src/main/resources/sql/2.0-ddl.sql index e5735e1..d0c178c 100644 --- a/src/main/resources/sql/2.0.sql +++ b/src/main/resources/sql/2.0-ddl.sql @@ -1,5 +1,7 @@ -# 创建 项目流程表 -# 针对不通过流程需要创建不同表 +-- ---------------------------- +-- 创建 项目流程表 +-- 针对不通过流程需要创建不同表 +-- ---------------------------- create table project_process ( @@ -32,10 +34,7 @@ create table project_process ) comment '项目对应的流程'; -alter table project_process - add reviewed_id varchar(1024) null comment '审核过的人的ID'; -# 采购合同 create table procurement_contract ( id int auto_increment primary key comment 'ID', @@ -45,7 +44,6 @@ create table procurement_contract process_id int comment '流程ID' ) comment '采购合同流程'; -# 销售合同 create table sale_contract ( id int auto_increment primary key comment 'ID', @@ -82,10 +80,6 @@ create table procurement_contract_budget_purchase_amount UNIQUE key (process_id, budget_cost_id) ) comment '采购合同流程预算采购明细的数量记录'; -alter table procurement_contract_budget_purchase_detail - add budget_cost_id int not null comment '成本ID' -; - create table procurement_contract_budget_purchase_detail ( id int auto_increment primary key comment 'ID', @@ -103,10 +97,3 @@ create table procurement_contract_budget_purchase_detail budget_cost_id int not null comment '成本ID' ) comment '采购合同流程预算采购明细的详情'; - -alter table procurement_contract_budget_purchase_amount - drop amount_left; - -alter table procurement_contract_budget_purchase_amount - add submit bit default 0 not null comment '该流程是否提交,提交了才计算到已采购数量' -; \ No newline at end of file