From 8aaffe80f14469a81d0c1c54a3a60908de66ce37 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 28 九月 2023 13:09:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java | 229 +++++++++++++++++-----
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java | 19 +
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml | 286 +++++++++++++++++----------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 7
5 files changed, 382 insertions(+), 165 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 2362ef7..d476d9f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -347,5 +347,12 @@
@ApiModelProperty("缁╂晥鏃ユ湡")
private String jxrq;
+
+ /**
+ * 椤圭洰鍚嶇О璇存槑
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+ private String itemdescribe;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index d9631da..a47ce33 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,273 +14,393 @@
/**
* 璐圭敤鐢宠鏄庣粏瀵硅薄 service_funddetail_shared
- *
+ *
* @author ruoyi
* @date 2023-04-20
*/
@Data
@ApiModel("璐圭敤鐢宠鏄庣粏")
-public class ServiceFunddetailShared extends BaseEntity
-{
+public class ServiceFunddetailShared extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 涓婚敭ID */
+ /**
+ * 涓婚敭ID
+ */
@ApiModelProperty("涓婚敭ID")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 璧勯噾鐢宠涓昏〃ID */
+ /**
+ * 璧勯噾鐢宠涓昏〃ID
+ */
@ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
@Excel(name = "璧勯噾鐢宠涓昏〃ID")
private Long fundid;
- /** 瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID */
+ /**
+ * 瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID
+ */
@ApiModelProperty("瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID")
@Excel(name = "瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID")
private Long fdid;
- /** 椤哄簭鍙� */
+ /**
+ * 椤哄簭鍙�
+ */
@ApiModelProperty("椤哄簭鍙�")
@Excel(name = "椤哄簭鍙�")
private Integer orderno;
- /** 椤圭洰ID */
+ /**
+ * 椤圭洰ID
+ */
@ApiModelProperty("椤圭洰ID")
@Excel(name = "椤圭洰ID")
private Long itemid;
- /** 璐圭敤椤圭洰鏍囧彿 */
+ /**
+ * 璐圭敤椤圭洰鏍囧彿
+ */
@ApiModelProperty("璐圭敤椤圭洰鏍囧彿")
@Excel(name = "璐圭敤椤圭洰鏍囧彿")
private String itemcode;
- /** 椤圭洰鍚嶇О */
+ /**
+ * 椤圭洰鍚嶇О
+ */
@ApiModelProperty("椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
private String itemname;
- /** 椤圭洰绫诲埆 */
+ /**
+ * 椤圭洰绫诲埆
+ */
@ApiModelProperty("椤圭洰绫诲埆")
@Excel(name = "椤圭洰绫诲埆")
private String itemtype;
- /** 璧勯噾绫诲埆 */
+ /**
+ * 璧勯噾绫诲埆
+ */
@ApiModelProperty("璧勯噾绫诲埆")
@Excel(name = "璧勯噾绫诲埆")
private String applytype;
- /** 璧勯噾绫诲埆鍚嶇О */
+ /**
+ * 璧勯噾绫诲埆鍚嶇О
+ */
@ApiModelProperty("璧勯噾绫诲埆鍚嶇О")
@Excel(name = "璧勯噾绫诲埆鍚嶇О")
private String applytypename;
- /** 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹� */
+ /**
+ * 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�
+ */
@ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
@Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
private String beneficiaryname;
- /** 鏀剁泭浜虹紪鍙� */
+ /**
+ * 鏀剁泭浜虹紪鍙�
+ */
@ApiModelProperty("鏀剁泭浜虹紪鍙�")
@Excel(name = "鏀剁泭浜虹紪鍙�")
private String beneficiaryno;
- /** 闄勪欢琛� */
+ /**
+ * 闄勪欢琛�
+ */
@ApiModelProperty("闄勪欢琛�")
@Excel(name = "闄勪欢琛�")
private String annexfiles;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle */
+ /**
+ * 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
+ */
@ApiModelProperty("鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
@Excel(name = "鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
private String title;
- /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
@ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
@Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鎬у埆 鏍规嵁瀛楀吀sys_user_sex */
+ /**
+ * 鎬у埆 鏍规嵁瀛楀吀sys_user_sex
+ */
@ApiModelProperty("鎬у埆 鏍规嵁瀛楀吀sys_user_sex")
@Excel(name = "鎬у埆 鏍规嵁瀛楀吀sys_user_sex")
private String sex;
- /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
@Excel(name = "涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
private String familyrelations;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@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 annexregistform;
- /** 鏁伴噺 */
+ /**
+ * 鏁伴噺
+ */
@ApiModelProperty("鏁伴噺")
@Excel(name = "鏁伴噺")
private Double quantity;
- /** 浠锋牸 */
+ /**
+ * 浠锋牸
+ */
@ApiModelProperty("浠锋牸")
@Excel(name = "浠锋牸")
private Double price;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
private Double amount;
- /** 鎵ｇ◣閲戦 */
+ /**
+ * 鎵ｇ◣閲戦
+ */
@ApiModelProperty("鎵ｇ◣閲戦")
@Excel(name = "鎵ｇ◣閲戦")
private Double taxamount;
- /** 绋庡悗閲戦 */
+ /**
+ * 绋庡悗閲戦
+ */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
private Double taxedamount;
- /** 棰勬敮閲戦 */
+ /**
+ * 棰勬敮閲戦
+ */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
private Double prepaidamount;
- /** 浠樻閲戦 */
+ /**
+ * 浠樻閲戦
+ */
@ApiModelProperty("浠樻閲戦")
@Excel(name = "浠樻閲戦")
private Double paidamount;
- /** 浠樻鏃堕棿 */
+ /**
+ * 浠樻鏃堕棿
+ */
@ApiModelProperty("浠樻鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "浠樻鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date paidtime;
- /** 浠樻鏂瑰紡 */
+ /**
+ * 浠樻鏂瑰紡
+ */
@ApiModelProperty("浠樻鏂瑰紡")
@Excel(name = "浠樻鏂瑰紡")
private String payterm;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢寮犳暟 */
+ /**
+ * 闄勪欢寮犳暟
+ */
@ApiModelProperty("闄勪欢寮犳暟")
@Excel(name = "闄勪欢寮犳暟")
private Long attachcount;
- /** 鎹愮尞ID */
+ /**
+ * 鎹愮尞ID
+ */
@ApiModelProperty("鎹愮尞ID")
@Excel(name = "鎹愮尞ID")
private Long infoid;
- /** 鎹愮尞缂栧彿 */
+ /**
+ * 鎹愮尞缂栧彿
+ */
@ApiModelProperty("鎹愮尞缂栧彿")
@Excel(name = "鎹愮尞缂栧彿")
private String donorno;
- /** 鎹愮尞鑰呭鍚� */
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
@ApiModelProperty("鎹愮尞鑰呭鍚�")
@Excel(name = "鎹愮尞鑰呭鍚�")
private String donorname;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String 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;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
private String servicesscope;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
private String servicesscopename;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
private String servicetype;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
private String servicetypename;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
private Double reimbursementamount;
- /** 閲戦 */
+ /**
+ * 閲戦
+ */
@ApiModelProperty("閲戦")
@Excel(name = "閲戦")
private String jine;
- /** 鐞嗙敱 */
+ /**
+ * 鐞嗙敱
+ */
@ApiModelProperty("鐞嗙敱")
@Excel(name = "鐞嗙敱")
private String liyou;
+ /**
+ * 璁＄畻绋庤垂鏃堕棿
+ */
+ @ApiModelProperty("璁＄畻绋庤垂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date taxTime;
+
+ /**
+ * 缁╂晥鏃ユ湡
+ */
+ @ApiModelProperty("缁╂晥鏃ユ湡")
+ private String jxrq;
+
+ /**
+ * 椤圭洰鍚嶇О璇存槑
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+ private String itemdescribe;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
index 13e752c..7eff77b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -338,5 +338,24 @@
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
private String annexfiles;
+ /**
+ * 璁＄畻绋庤垂鏃堕棿
+ */
+ @ApiModelProperty("璁＄畻绋庤垂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date taxTime;
+
+ /**
+ * 缁╂晥鏃ユ湡
+ */
+ @ApiModelProperty("缁╂晥鏃ユ湡")
+ private String jxrq;
+
+ /**
+ * 椤圭洰鍚嶇О璇存槑
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+ private String itemdescribe;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index dae5778..d1e0bde 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -59,6 +59,7 @@
<result property="annexfiles" column="AnnexFiles"/>
<result property="taxTime" column="tax_time"/>
<result property="jxrq" column="jxrq"/>
+ <result property="itemdescribe" column="ItemDescribe"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -115,7 +116,8 @@
subjecttypename,
AnnexFiles,
tax_time,
- jxrq
+ jxrq,
+ ItemDescribe
from service_funddetail
</sql>
@@ -263,7 +265,7 @@
where fundID < #{fundID}
and tax_time < #{taxTime}
and tax_time >= #{firstDay}
- and IDCardNo=#{IDCard}
+ and IDCardNo = #{IDCard}
and ApplyType in (1, 2)
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
index b2019d2..67577fa 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
@@ -1,123 +1,191 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailSharedMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceFunddetailShared" id="ServiceFunddetailSharedResult">
- <result property="id" column="ID" />
- <result property="fundid" column="fundID" />
- <result property="orderno" column="OrderNo" />
- <result property="itemid" column="ItemID" />
- <result property="itemcode" column="ItemCode" />
- <result property="itemname" column="ItemName" />
- <result property="itemtype" column="ItemType" />
- <result property="applytype" column="ApplyType" />
- <result property="applytypename" column="ApplyTypeName" />
- <result property="beneficiaryname" column="BeneficiaryName" />
- <result property="beneficiaryno" column="BeneficiaryNo" />
- <result property="unitname" column="UnitName" />
- <result property="unitno" column="UnitNo" />
- <result property="unituserno" column="UnitUserNo" />
- <result property="title" column="Title" />
- <result property="idcardtype" column="IDCardType" />
- <result property="idcardno" column="IDCardNo" />
- <result property="sex" column="Sex" />
- <result property="familyrelations" column="FamilyRelations" />
- <result property="phone" column="Phone" />
- <result property="depositbank" column="DepositBank" />
- <result property="bankcardno" column="BankCardNo" />
- <result property="branchbankname" column="BranchBankName" />
- <result property="annexbankcard" column="AnnexBankCard" />
- <result property="annexregistform" column="AnnexRegistForm" />
- <result property="quantity" column="Quantity" />
- <result property="price" column="Price" />
- <result property="amount" column="Amount" />
- <result property="taxamount" column="TaxAmount" />
- <result property="taxedamount" column="TaxedAmount" />
- <result property="prepaidamount" column="PrepaidAmount" />
- <result property="paidamount" column="paidAmount" />
- <result property="paidtime" column="paidTime" />
- <result property="payterm" column="payTerm" />
- <result property="invoicecount" column="InvoiceCount" />
- <result property="attachcount" column="AttachCount" />
- <result property="remark" column="Remark" />
- <result property="infoid" column="InfoId" />
- <result property="donorno" column="DonorNo" />
- <result property="donorname" column="DonorName" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="servicesscope" column="SERVICESSCOPE" />
- <result property="servicesscopename" column="SERVICESSCOPENAME" />
- <result property="servicetype" column="SERVICETYPE" />
- <result property="servicetypename" column="SERVICETYPENAME" />
- <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT" />
- <result property="jine" column="jine" />
- <result property="liyou" column="liyou" />
+ <result property="id" column="ID"/>
+ <result property="fundid" column="fundID"/>
+ <result property="orderno" column="OrderNo"/>
+ <result property="itemid" column="ItemID"/>
+ <result property="itemcode" column="ItemCode"/>
+ <result property="itemname" column="ItemName"/>
+ <result property="itemtype" column="ItemType"/>
+ <result property="applytype" column="ApplyType"/>
+ <result property="applytypename" column="ApplyTypeName"/>
+ <result property="beneficiaryname" column="BeneficiaryName"/>
+ <result property="beneficiaryno" column="BeneficiaryNo"/>
+ <result property="unitname" column="UnitName"/>
+ <result property="unitno" column="UnitNo"/>
+ <result property="unituserno" column="UnitUserNo"/>
+ <result property="title" column="Title"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="sex" column="Sex"/>
+ <result property="familyrelations" column="FamilyRelations"/>
+ <result property="phone" column="Phone"/>
+ <result property="depositbank" column="DepositBank"/>
+ <result property="bankcardno" column="BankCardNo"/>
+ <result property="branchbankname" column="BranchBankName"/>
+ <result property="annexbankcard" column="AnnexBankCard"/>
+ <result property="annexregistform" column="AnnexRegistForm"/>
+ <result property="quantity" column="Quantity"/>
+ <result property="price" column="Price"/>
+ <result property="amount" column="Amount"/>
+ <result property="taxamount" column="TaxAmount"/>
+ <result property="taxedamount" column="TaxedAmount"/>
+ <result property="prepaidamount" column="PrepaidAmount"/>
+ <result property="paidamount" column="paidAmount"/>
+ <result property="paidtime" column="paidTime"/>
+ <result property="payterm" column="payTerm"/>
+ <result property="invoicecount" column="InvoiceCount"/>
+ <result property="attachcount" column="AttachCount"/>
+ <result property="remark" column="Remark"/>
+ <result property="infoid" column="InfoId"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="servicesscope" column="SERVICESSCOPE"/>
+ <result property="servicesscopename" column="SERVICESSCOPENAME"/>
+ <result property="servicetype" column="SERVICETYPE"/>
+ <result property="servicetypename" column="SERVICETYPENAME"/>
+ <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT"/>
+ <result property="jine" column="jine"/>
+ <result property="liyou" column="liyou"/>
+ <result property="itemdescribe" column="ItemDescribe"/>
</resultMap>
<sql id="selectServiceFunddetailSharedVo">
- select ID, fundID, OrderNo, ItemID, ItemCode, ItemName, ItemType, ApplyType, ApplyTypeName, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, Quantity, Price, Amount, TaxAmount, TaxedAmount, PrepaidAmount, paidAmount, paidTime, payTerm, InvoiceCount, AttachCount, Remark, InfoId, DonorNo, DonorName, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime, SERVICESSCOPE, SERVICESSCOPENAME, SERVICETYPE, SERVICETYPENAME, REIMBURSEMENTAMOUNT, jine, liyou from service_funddetail_shared
+ select ID,
+ fundID,
+ OrderNo,
+ ItemID,
+ ItemCode,
+ ItemName,
+ ItemType,
+ ApplyType,
+ ApplyTypeName,
+ BeneficiaryName,
+ BeneficiaryNo,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ Title,
+ IDCardType,
+ IDCardNo,
+ Sex,
+ FamilyRelations,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexRegistForm,
+ Quantity,
+ Price,
+ Amount,
+ TaxAmount,
+ TaxedAmount,
+ PrepaidAmount,
+ paidAmount,
+ paidTime,
+ payTerm,
+ InvoiceCount,
+ AttachCount,
+ Remark,
+ InfoId,
+ DonorNo,
+ DonorName,
+ RecordStatus,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ uploadflag,
+ uploadtime,
+ SERVICESSCOPE,
+ SERVICESSCOPENAME,
+ SERVICETYPE,
+ SERVICETYPENAME,
+ REIMBURSEMENTAMOUNT,
+ jine,
+ liyou,
+ ItemDescribe
+ from service_funddetail_shared
</sql>
- <select id="selectServiceFunddetailSharedList" parameterType="com.ruoyi.project.domain.ServiceFunddetailShared" resultMap="ServiceFunddetailSharedResult">
+ <select id="selectServiceFunddetailSharedList" parameterType="com.ruoyi.project.domain.ServiceFunddetailShared"
+ resultMap="ServiceFunddetailSharedResult">
<include refid="selectServiceFunddetailSharedVo"/>
<where>
- <if test="fundid != null "> and fundID = #{fundid}</if>
- <if test="orderno != null "> and OrderNo = #{orderno}</if>
- <if test="itemid != null "> and ItemID = #{itemid}</if>
- <if test="itemcode != null and itemcode != ''"> and ItemCode = #{itemcode}</if>
- <if test="itemname != null and itemname != ''"> and ItemName like concat('%', #{itemname}, '%')</if>
- <if test="itemtype != null and itemtype != ''"> and ItemType = #{itemtype}</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
- <if test="applytypename != null and applytypename != ''"> and ApplyTypeName like concat('%', #{applytypename}, '%')</if>
- <if test="beneficiaryname != null and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>
- <if test="beneficiaryno != null and beneficiaryno != ''"> and BeneficiaryNo = #{beneficiaryno}</if>
- <if test="unitname != null and unitname != ''"> and UnitName like concat('%', #{unitname}, '%')</if>
- <if test="unitno != null and unitno != ''"> and UnitNo = #{unitno}</if>
- <if test="unituserno != null and unituserno != ''"> and UnitUserNo = #{unituserno}</if>
- <if test="title != null and title != ''"> and Title = #{title}</if>
- <if test="idcardtype != null "> and IDCardType = #{idcardtype}</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="sex != null and sex != ''"> and Sex = #{sex}</if>
- <if test="familyrelations != null and familyrelations != ''"> and FamilyRelations = #{familyrelations}</if>
- <if test="phone != null and phone != ''"> and Phone = #{phone}</if>
- <if test="depositbank != null and depositbank != ''"> and DepositBank = #{depositbank}</if>
- <if test="bankcardno != null and bankcardno != ''"> and BankCardNo = #{bankcardno}</if>
- <if test="branchbankname != null and branchbankname != ''"> and BranchBankName like concat('%', #{branchbankname}, '%')</if>
- <if test="annexbankcard != null and annexbankcard != ''"> and AnnexBankCard = #{annexbankcard}</if>
- <if test="annexregistform != null and annexregistform != ''"> and AnnexRegistForm = #{annexregistform}</if>
- <if test="quantity != null "> and Quantity = #{quantity}</if>
- <if test="price != null "> and Price = #{price}</if>
- <if test="amount != null "> and Amount = #{amount}</if>
- <if test="taxamount != null "> and TaxAmount = #{taxamount}</if>
- <if test="taxedamount != null "> and TaxedAmount = #{taxedamount}</if>
- <if test="prepaidamount != null "> and PrepaidAmount = #{prepaidamount}</if>
- <if test="paidamount != null "> and paidAmount = #{paidamount}</if>
- <if test="paidtime != null "> and paidTime = #{paidtime}</if>
- <if test="payterm != null and payterm != ''"> and payTerm = #{payterm}</if>
- <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
- <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
- <if test="remark != null and remark != ''"> and Remark = #{remark}</if>
- <if test="infoid != null "> and InfoId = #{infoid}</if>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="donorname != null and donorname != ''"> and DonorName like concat('%', #{donorname}, '%')</if>
- <if test="recordstatus != null and recordstatus != ''"> and RecordStatus = #{recordstatus}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
- <if test="servicesscope != null and servicesscope != ''"> and SERVICESSCOPE = #{servicesscope}</if>
- <if test="servicesscopename != null and servicesscopename != ''"> and SERVICESSCOPENAME like concat('%', #{servicesscopename}, '%')</if>
- <if test="servicetype != null and servicetype != ''"> and SERVICETYPE = #{servicetype}</if>
- <if test="servicetypename != null and servicetypename != ''"> and SERVICETYPENAME like concat('%', #{servicetypename}, '%')</if>
- <if test="reimbursementamount != null "> and REIMBURSEMENTAMOUNT = #{reimbursementamount}</if>
- <if test="jine != null and jine != ''"> and jine = #{jine}</if>
- <if test="liyou != null and liyou != ''"> and liyou = #{liyou}</if>
+ <if test="fundid != null ">and fundID = #{fundid}</if>
+ <if test="orderno != null ">and OrderNo = #{orderno}</if>
+ <if test="itemid != null ">and ItemID = #{itemid}</if>
+ <if test="itemcode != null and itemcode != ''">and ItemCode = #{itemcode}</if>
+ <if test="itemname != null and itemname != ''">and ItemName like concat('%', #{itemname}, '%')</if>
+ <if test="itemtype != null and itemtype != ''">and ItemType = #{itemtype}</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
+ <if test="applytypename != null and applytypename != ''">and ApplyTypeName like concat('%',
+ #{applytypename}, '%')
+ </if>
+ <if test="beneficiaryname != null and beneficiaryname != ''">and BeneficiaryName like concat('%',
+ #{beneficiaryname}, '%')
+ </if>
+ <if test="beneficiaryno != null and beneficiaryno != ''">and BeneficiaryNo = #{beneficiaryno}</if>
+ <if test="unitname != null and unitname != ''">and UnitName like concat('%', #{unitname}, '%')</if>
+ <if test="unitno != null and unitno != ''">and UnitNo = #{unitno}</if>
+ <if test="unituserno != null and unituserno != ''">and UnitUserNo = #{unituserno}</if>
+ <if test="title != null and title != ''">and Title = #{title}</if>
+ <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="sex != null and sex != ''">and Sex = #{sex}</if>
+ <if test="familyrelations != null and familyrelations != ''">and FamilyRelations = #{familyrelations}</if>
+ <if test="phone != null and phone != ''">and Phone = #{phone}</if>
+ <if test="depositbank != null and depositbank != ''">and DepositBank = #{depositbank}</if>
+ <if test="bankcardno != null and bankcardno != ''">and BankCardNo = #{bankcardno}</if>
+ <if test="branchbankname != null and branchbankname != ''">and BranchBankName like concat('%',
+ #{branchbankname}, '%')
+ </if>
+ <if test="annexbankcard != null and annexbankcard != ''">and AnnexBankCard = #{annexbankcard}</if>
+ <if test="annexregistform != null and annexregistform != ''">and AnnexRegistForm = #{annexregistform}</if>
+ <if test="quantity != null ">and Quantity = #{quantity}</if>
+ <if test="price != null ">and Price = #{price}</if>
+ <if test="amount != null ">and Amount = #{amount}</if>
+ <if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
+ <if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
+ <if test="prepaidamount != null ">and PrepaidAmount = #{prepaidamount}</if>
+ <if test="paidamount != null ">and paidAmount = #{paidamount}</if>
+ <if test="paidtime != null ">and paidTime = #{paidtime}</if>
+ <if test="payterm != null and payterm != ''">and payTerm = #{payterm}</if>
+ <if test="invoicecount != null ">and InvoiceCount = #{invoicecount}</if>
+ <if test="attachcount != null ">and AttachCount = #{attachcount}</if>
+ <if test="remark != null and remark != ''">and Remark = #{remark}</if>
+ <if test="infoid != null ">and InfoId = #{infoid}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="donorname != null and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
+ <if test="recordstatus != null and recordstatus != ''">and RecordStatus = #{recordstatus}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="servicesscope != null and servicesscope != ''">and SERVICESSCOPE = #{servicesscope}</if>
+ <if test="servicesscopename != null and servicesscopename != ''">and SERVICESSCOPENAME like concat('%',
+ #{servicesscopename}, '%')
+ </if>
+ <if test="servicetype != null and servicetype != ''">and SERVICETYPE = #{servicetype}</if>
+ <if test="servicetypename != null and servicetypename != ''">and SERVICETYPENAME like concat('%',
+ #{servicetypename}, '%')
+ </if>
+ <if test="reimbursementamount != null ">and REIMBURSEMENTAMOUNT = #{reimbursementamount}</if>
+ <if test="jine != null and jine != ''">and jine = #{jine}</if>
+ <if test="liyou != null and liyou != ''">and liyou = #{liyou}</if>
</where>
</select>
--
Gitblit v1.9.3