From 89aafec33bb9ad3a283232f3028f912a0c164fa6 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 19 Nov 2025 09:12:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=96=B0=E5=A2=9E=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=92=8C=E6=94=B6=E8=B4=A7=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E5=85=B6=E6=98=A0=E5=B0=84=E5=92=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在ErpProjectAcceptance和ErpProjectReceiving的Mapper XML中新增acceptanceStatus和receivingStatus字段映射 - 在相关SQL查询中添加acceptance_status和receiving_status字段的查询和关联 - 在ErpProjectAcceptanceVo和ErpProjectReceivingVo中新增acceptanceStatus和receivingStatus属性 - 为新增状态字段添加Excel导出注解，支持状态信息展示 - 状态字段含义为项目状态，值包括1暂存、2审批中、3可用 --- .../dromara/oa/erp/domain/vo/ErpProjectAcceptanceVo.java | 6 ++++++ .../dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java | 6 ++++++ .../mapper/oa/erp/ErpProjectAcceptanceMapper.xml | 9 +++++---- .../mapper/oa/erp/ErpProjectReceivingMapper.xml | 7 ++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectAcceptanceVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectAcceptanceVo.java index 3ab5f0b7..8365fe5d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectAcceptanceVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectAcceptanceVo.java @@ -114,6 +114,12 @@ public class ErpProjectAcceptanceVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 项目状态(1暂存 2审批中 3可用) + */ + @ExcelProperty(value = "项目状态") + private String acceptanceStatus; + /** * 流程状态 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java index 25522ed9..c6141959 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java @@ -108,6 +108,12 @@ public class ErpProjectReceivingVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 项目状态(1暂存 2审批中 3可用) + */ + @ExcelProperty(value = "项目状态") + private String receivingStatus; + /** * 流程状态 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectAcceptanceMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectAcceptanceMapper.xml index 5be4aecf..e9d96236 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectAcceptanceMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectAcceptanceMapper.xml @@ -18,13 +18,14 @@ + select t.acceptance_id, t.project_id, t.tenant_id, t.project_code, t.project_name, t.manager_id, u1.nick_name as projectManagerName, t.acceptance_date, t.oss_id, t.acceptance_code, - t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.acceptance_status, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from erp_project_acceptance t left join sys_user u1 on t.manager_id = u1.user_id left join sys_user u3 on t.charge_id = u3.user_id @@ -48,7 +49,7 @@ select t.acceptance_id, t.tenant_id, t.project_id, t.project_code, t.project_name, t.manager_id, u1.nick_name as projectManagerName, t.acceptance_date, t.oss_id, t.acceptance_code, - t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.acceptance_status, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from erp_project_acceptance t left join sys_user u1 on t.manager_id = u1.user_id left join sys_user u3 on t.charge_id = u3.user_id diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml index 68cc1ca0..b2503650 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml @@ -18,13 +18,14 @@ + select t.receiving_id, t.tenant_id, t.project_id, t.project_code, t.project_name, t.manager_id, u1.nick_name as projectManagerName, t.arrival_date, t.oss_id, t.receiving_code, - t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.receiving_status, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from erp_project_receiving t left join sys_user u1 on t.manager_id = u1.user_id left join sys_user u3 on t.charge_id = u3.user_id @@ -48,7 +49,7 @@