From b9cc263b8d1d31608a4c16cd157cc84b51e3d29d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 18:11:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 231 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 179 insertions(+), 52 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 87ad7f5..d7c1dcc 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -9,238 +10,331 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.Date;
/**
* 鎶ラ攢鐢宠瀵硅薄 service_reimbursement_shared
- *
+ *
* @author ruoyi
* @date 2023-01-10
*/
@Data
@ApiModel("鎶ラ攢鐢宠")
-public class ServiceReimbursementShared extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
+@TableName("service_reimbursement_shared")
+public class ServiceReimbursementShared extends BaseEntity {
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鎶ラ攢浜虹紪鍙� */
+ /**
+ * 鎶ラ攢浜虹紪鍙�
+ */
@ApiModelProperty("鎶ラ攢浜虹紪鍙�")
@Excel(name = "鎶ラ攢浜虹紪鍙�")
private String userno;
- /** 鎶ラ攢浜哄鍚� */
+ /**
+ * 鎶ラ攢浜哄鍚�
+ */
@ApiModelProperty("鎶ラ攢浜哄鍚�")
@Excel(name = "鎶ラ攢浜哄鍚�")
private String username;
- /** 鍑哄樊浜哄憳 */
+ /**
+ * 鍑哄樊浜哄憳
+ */
@ApiModelProperty("鍑哄樊浜哄憳")
@Excel(name = "鍑哄樊浜哄憳")
private String travelers;
- /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
@ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
@Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
private String idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 寮�鎴烽摱琛� */
+ /**
+ * 寮�鎴烽摱琛�
+ */
@ApiModelProperty("寮�鎴烽摱琛�")
@Excel(name = "寮�鎴烽摱琛�")
private String depositbank;
- /** 鍗″彿 */
+ /**
+ * 鍗″彿
+ */
@ApiModelProperty("鍗″彿")
@Excel(name = "鍗″彿")
private String bankcardno;
- /** 鍒嗚鍚嶇О */
+ /**
+ * 鍒嗚鍚嶇О
+ */
@ApiModelProperty("鍒嗚鍚嶇О")
@Excel(name = "鍒嗚鍚嶇О")
private String branchbankname;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexbankcard;
- /** 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
private String annexfiles;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
- private BigDecimal amountrequested;
+ private Double amountrequested;
- /** 棰勬敮璐圭敤 */
+ /**
+ * 棰勬敮璐圭敤
+ */
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
- private BigDecimal prepaidamount;
+ private Double prepaidamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢鏁� */
+ /**
+ * 闄勪欢鏁�
+ */
@ApiModelProperty("闄勪欢鏁�")
@Excel(name = "闄勪欢鏁�")
private Long attachcount;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 闄㈤暱绛惧瓧
+ */
+ @ApiModelProperty("闄㈤暱绛惧瓧")
+ @Excel(name = "闄㈤暱绛惧瓧")
+ private String president;
+
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鎹愮尞鑰呭鍚� */
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
@ApiModelProperty("鎹愮尞鑰呭鍚�")
@Excel(name = "鎹愮尞鑰呭鍚�")
private String donorname;
- /** 浜嬬敱 */
+ /**
+ * 浜嬬敱
+ */
@ApiModelProperty("浜嬬敱")
@Excel(name = "浜嬬敱")
private String reason;
- /** 璁板綍鐘舵�� 璇﹁瀛楀吀sys_travelexpensestatus */
+ /**
+ * 璁板綍鐘舵�� 璇﹁瀛楀吀sys_travelexpensestatus
+ */
@ApiModelProperty("璁板綍鐘舵�� 璇﹁瀛楀吀sys_travelexpensestatus")
@Excel(name = "璁板綍鐘舵�� 璇﹁瀛楀吀sys_travelexpensestatus")
private Integer recordstatus;
- /** 涓婁紶鏍囧織 */
+ /**
+ * 涓婁紶鏍囧織
+ */
@ApiModelProperty("涓婁紶鏍囧織")
@Excel(name = "涓婁紶鏍囧織")
private String uploadflag;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date uploadtime;
- /** 鎬婚噾棰� */
+ /**
+ * 鎬婚噾棰�
+ */
@ApiModelProperty("鎬婚噾棰�")
@Excel(name = "鎬婚噾棰�")
- private BigDecimal totalamount;
+ private Double totalamount;
- /** 鎬婚噾棰濈殑澶у啓 */
+ /**
+ * 鎬婚噾棰濈殑澶у啓
+ */
@ApiModelProperty("鎬婚噾棰濈殑澶у啓")
@Excel(name = "鎬婚噾棰濈殑澶у啓")
private String bigstrmoney;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
@Excel(name = "褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
private Long flowlevel;
- /** 璐圭敤褰掑睘锛堝瓧鍏歌〃锛歴ys_travelexpensebelong锛夛細0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+ /**
+ * 璐圭敤褰掑睘锛堝瓧鍏歌〃锛歴ys_travelexpensebelong锛夛細0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�
+ */
@ApiModelProperty("璐圭敤褰掑睘锛堝瓧鍏歌〃锛歴ys_travelexpensebelong锛夛細0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�")
@Excel(name = "璐圭敤褰掑睘", readConverterExp = "瀛�=鍏歌〃锛歴ys_travelexpensebelong")
private String costtype;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "璐圭敤褰掑睘", readConverterExp = "$column.readConverterExp()")
private String costtypename;
- /** 瀵规帴绯荤粺鐨勮〃鍗昳d */
+ /**
+ * 瀵规帴绯荤粺鐨勮〃鍗昳d
+ */
@ApiModelProperty("瀵规帴绯荤粺鐨勮〃鍗昳d")
@Excel(name = "瀵规帴绯荤粺鐨勮〃鍗昳d")
private String oaid;
- /** 瀵规帴绯荤粺鐨勮〃鍗曠姸鎬� */
+ /**
+ * 瀵规帴绯荤粺鐨勮〃鍗曠姸鎬�
+ */
@ApiModelProperty("瀵规帴绯荤粺鐨勮〃鍗曠姸鎬�")
@Excel(name = "瀵规帴绯荤粺鐨勮〃鍗曠姸鎬�")
private String oabdzt;
- /** 闄勪欢鍦板潃锛宎dd by yangjb 20230109 */
+ /**
+ * 闄勪欢鍦板潃锛宎dd by yangjb 20230109
+ */
@ApiModelProperty("闄勪欢鍦板潃")
private String fileurl;
- /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+ /**
+ * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+ */
@ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
@Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
private String filename;
- /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+ /**
+ * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+ */
@ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
@Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
private String fileid;
- /** service reimbursement鐨勪富閿� */
+ /**
+ * service reimbursement鐨勪富閿�
+ */
@ApiModelProperty("service reimbursement鐨刬d")
private Long reimid;
@@ -262,5 +356,38 @@
@ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
private Integer donorrelatives;
+ @ApiModelProperty("璐㈠姟绯荤粺椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
+ private String cxrjyj;
+
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private String zffs;
+
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
+
+ @ApiModelProperty("瀹℃壒缁撴灉")
+ private Integer spjg;
+
+ /**
+ * 鎵撳嵃缂栧彿
+ */
+ @ApiModelProperty("缂栧彿")
+ private String bh;
+
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Integer checkstatus;
+
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
+
+ @ApiModelProperty("涓婃姤鏃堕棿")
+ private Date applyTime;
}
--
Gitblit v1.9.3