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/ServiceReimbursementShared.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index 4f3303f..a1b4d20 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -257,13 +257,68 @@
private String donorremark;
@ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
- private BigDecimal donoramount;
+ private Double donoramount;
@ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
private Integer donorrelatives;
- @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�")
- private String donorpayee;
+ @ApiModelProperty("璐㈠姟绯荤粺椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
+ private String cxrjyj;
+ @Override
+ public String toString() {
+ return "ServiceReimbursementShared{" +
+ "id=" + id +
+ ", userno='" + userno + '\'' +
+ ", username='" + username + '\'' +
+ ", travelers='" + travelers + '\'' +
+ ", idcardtype='" + idcardtype + '\'' +
+ ", idcardno='" + idcardno + '\'' +
+ ", phone='" + phone + '\'' +
+ ", depositbank='" + depositbank + '\'' +
+ ", bankcardno='" + bankcardno + '\'' +
+ ", branchbankname='" + branchbankname + '\'' +
+ ", annexbankcard='" + annexbankcard + '\'' +
+ ", annexfiles='" + annexfiles + '\'' +
+ ", amountrequested=" + amountrequested +
+ ", prepaidamount=" + prepaidamount +
+ ", invoicecount=" + invoicecount +
+ ", attachcount=" + attachcount +
+ ", managerno='" + managerno + '\'' +
+ ", managername='" + managername + '\'' +
+ ", deptmentno='" + deptmentno + '\'' +
+ ", deptmentname='" + deptmentname + '\'' +
+ ", opochecker='" + opochecker + '\'' +
+ ", finvicepresident='" + finvicepresident + '\'' +
+ ", busvicepresident='" + busvicepresident + '\'' +
+ ", officedirector='" + officedirector + '\'' +
+ ", financedirector='" + financedirector + '\'' +
+ ", financechecher='" + financechecher + '\'' +
+ ", infoid=" + infoid +
+ ", donorno='" + donorno + '\'' +
+ ", donorname='" + donorname + '\'' +
+ ", reason='" + reason + '\'' +
+ ", recordstatus=" + recordstatus +
+ ", uploadflag='" + uploadflag + '\'' +
+ ", uploadtime=" + uploadtime +
+ ", totalamount=" + totalamount +
+ ", bigstrmoney='" + bigstrmoney + '\'' +
+ ", flowlevel=" + flowlevel +
+ ", costtype='" + costtype + '\'' +
+ ", costtypename='" + costtypename + '\'' +
+ ", oaid='" + oaid + '\'' +
+ ", oabdzt='" + oabdzt + '\'' +
+ ", fileurl='" + fileurl + '\'' +
+ ", filename='" + filename + '\'' +
+ ", fileid='" + fileid + '\'' +
+ ", reimid=" + reimid +
+ ", delFlag=" + delFlag +
+ ", donorbank='" + donorbank + '\'' +
+ ", donorbankcard='" + donorbankcard + '\'' +
+ ", donorremark='" + donorremark + '\'' +
+ ", donoramount=" + donoramount +
+ ", donorrelatives=" + donorrelatives +
+ '}';
+ }
}
--
Gitblit v1.9.3