From 2c456094bdf1cc7e1bab5e0dbee00bb1f2743488 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 17 七月 2023 13:50:12 +0800 Subject: [PATCH] 1、审批顺序:审批时,从一级到五级逐级审批,回退时,由审批人员指定回退级别,如从五级审批退回到经办人(需要重新修改材料的人员处),每一级可以看到回退的信息;修改完成后,直接从经办人处到达五级审批或退回的审批人。被退回的信息修改完成后,直接从经办人到达五级审批或退回的审批人处,那么其他层级的审批人虽然不需要审批,但要能够看到重新修改后的信息。 说明: (1)差旅费报销主表:service_reimbursement 标识字段:FlowLevel(当前审核级别 处于哪个阶段 0:申请;1:一级审核;2:二级审核;3:三级审核等; 4:四级审核等; 5:五级审核等);RecordStatus(记录状态 详见字典sys_travelexpensestatus) (2)费用报销主表:service_fund 标识字段:FlowLevel(当前审核级别 处于哪个阶段 0:申请;1:一级审核;2:二级审核;3:三级审核等; 4:四级审核等; 5:五级审核等);RecordStatus(记录状态 详见字典sys_travelexpensestatus) (3)审批流程设置表:service_fundflowrule (4)审批流程记录表:service_fundflow --- ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java index 78220ef..20a6a11 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java @@ -34,6 +34,11 @@ @Excel(name = "璧勯噾鐢宠涓昏〃ID") private Long rbid; + /** 宸梾鎶ラ攢鍗曟槑缁咺D */ + @ApiModelProperty("宸梾鎶ラ攢鍗曟槑缁咺D") + @Excel(name = "宸梾鎶ラ攢鍗曟槑缁咺D") + private Long rdid; + /** 浜哄憳绫诲埆 */ @ApiModelProperty("浜哄憳绫诲埆") @Excel(name = "浜哄憳绫诲埆") @@ -85,6 +90,11 @@ @ApiModelProperty("浜ら�氬伐鍏�") @Excel(name = "浜ら�氬伐鍏�") private String traffictype; + + /** 浜ら�氬伐鍏� */ + @ApiModelProperty("浜ら�氬伐鍏�") + @Excel(name = "浜ら�氬伐鍏�") + private String traffictype2; /** 甯傚唴浜ら�氳垂 */ @ApiModelProperty("甯傚唴浜ら�氳垂") @@ -177,15 +187,15 @@ @Excel(name = "鍏朵粬璐圭敤璇存槑") private String otherfeedesc; - /** 閲戦-鎺ュ彛 */ - @ApiModelProperty("閲戦-鎺ュ彛") - @Excel(name = "閲戦-鎺ュ彛") - private String jine; - - /** 鐞嗙敱-鎺ュ彛 */ - @ApiModelProperty("鐞嗙敱-鎺ュ彛") - @Excel(name = "鐞嗙敱-鎺ュ彛") - private String liyou; +// /** 閲戦-鎺ュ彛 */ +// @ApiModelProperty("閲戦-鎺ュ彛") +// @Excel(name = "閲戦-鎺ュ彛") +// private String jine; +// +// /** 鐞嗙敱-鎺ュ彛 */ +// @ApiModelProperty("鐞嗙敱-鎺ュ彛") +// @Excel(name = "鐞嗙敱-鎺ュ彛") +// private String liyou; } -- Gitblit v1.9.3