feat(erp): 新增验收和收货状态字段及其映射和展示

- 在ErpProjectAcceptance和ErpProjectReceiving的Mapper XML中新增acceptanceStatus和receivingStatus字段映射
- 在相关SQL查询中添加acceptance_status和receiving_status字段的查询和关联
- 在ErpProjectAcceptanceVo和ErpProjectReceivingVo中新增acceptanceStatus和receivingStatus属性
- 为新增状态字段添加Excel导出注解，支持状态信息展示
- 状态字段含义为项目状态，值包括1暂存、2审批中、3可用

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;
+
     /**
      * 流程状态
      */

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;
+
     /**
      * 流程状态
      */

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectAcceptanceMapper.xml

@@ -18,13 +18,14 @@
         <result property="deputyId" column="deputy_id"/>
         <result property="deputyName" column="deputyName"/>
         <result property="remark" column="remark"/>
+        <result property="acceptanceStatus" column="acceptance_status"/>
         <result property="flowStatus" column="flow_status"/>
     </resultMap>
 
     <select id="selectCustomErpProjectAcceptanceVoList" resultMap="ErpProjectAcceptanceResult">
         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
@@ -36,7 +37,7 @@
     <select id="selectCustomErpProjectAcceptanceVoById" resultMap="ErpProjectAcceptanceResult">
         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 id="selectCustomErpProjectAcceptanceVoByIds" resultMap="ErpProjectAcceptanceResult">
         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
@@ -69,7 +70,7 @@
     <select id="selectCustomErpProjectAcceptanceVoPage" resultMap="ErpProjectAcceptanceResult">
         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

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml

@@ -18,13 +18,14 @@
         <result property="deputyId" column="deputy_id"/>
         <result property="deputyName" column="deputyName"/>
         <result property="remark" column="remark"/>
+        <result property="receivingStatus" column="receiving_status"/>
         <result property="flowStatus" column="flow_status"/>
     </resultMap>
 
     <select id="selectCustomErpProjectReceivingVoList" resultMap="ErpProjectReceivingResult">
         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
@@ -36,7 +37,7 @@
     <select id="selectCustomErpProjectReceivingVoById" resultMap="ErpProjectReceivingResult">
         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 @@
     <select id="selectCustomErpProjectReceivingVoByIds" resultMap="ErpProjectReceivingResult">
         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