From 4920ea5372b919f8b8f27cd709e1ab4040fe8d2b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 12:02:30 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 8 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 26 +++++++++----
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 4 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java | 13 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 3 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 12 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 6 +++
7 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index a35a71e..1ce2c4d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -334,14 +334,6 @@
private Integer checkstatus;
/**
- * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
- */
- @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- private Integer performancetype;
-
-
- /**
* 鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�
*/
@ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
@@ -371,5 +363,23 @@
*/
@ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
private String notes;
+
+
+ /**
+ * 缁╂晥鏃ユ湡
+ */
+ @ApiModelProperty("缁╂晥鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁╂晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date jxrq;
+
+ /**
+ * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
+
+
}
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 5c64c7e..dbe6445 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
@@ -370,5 +370,17 @@
@ApiModelProperty("椤圭洰鍚嶇О璇存槑")
private String itemdescribe;
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
+
}
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 1054750..7bc954e 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
@@ -373,5 +373,18 @@
@ApiModelProperty("椤圭洰鍚嶇О璇存槑")
private String itemdescribe;
+
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 0c78571..3778291 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -115,6 +115,9 @@
if (serviceFund.getFlowlevel() != null) {
wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
}
+ if (serviceFund.getJxrq() != null) {
+ wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
+ }
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 6f21282..3f9541f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -99,6 +99,12 @@
if (serviceFunddetail.getDel_flag() != null) {
wrappers.eq(ServiceFunddetail::getDel_flag, serviceFunddetail.getDel_flag());
}
+ if (serviceFunddetail.getDeptId() != null) {
+ wrappers.eq(ServiceFunddetail::getDeptId, serviceFunddetail.getDeptId());
+ }
+ if (serviceFunddetail.getDeptName() != null) {
+ wrappers.eq(ServiceFunddetail::getDeptName, serviceFunddetail.getDeptName());
+ }
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 7fbc1ac..5f96bcf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -63,6 +63,7 @@
<result property="applyTime" column="apply_time"/>
<result property="uploadStates" column="upload_states"/>
<result property="notes" column="notes"/>
+ <result property="jxrq" column="jxrq"/>
</resultMap>
<sql id="selectServiceFundVo">
@@ -123,6 +124,7 @@
apply_time,
fundtaxtime,
upload_states,
+ jxrq,
notes
from service_fund
</sql>
@@ -145,6 +147,7 @@
<if test="createBy != null and createBy != '' ">and create_by = #{createBy}</if>
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="donorno != null and donorno != '' ">and DonorNo = #{donorno}</if>
+ <if test="jxrq != null ">and jxrq = #{jxrq}</if>
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -203,6 +206,7 @@
`service_fund`.`uploadtime` AS `uploadtime`,
`service_fund`.`PretaxCost` AS `pretaxcost`,
`service_fund`.`TaxedCost` AS `taxedcost`,
+ `service_fund`.`jxrq` AS `jxrq`,
`service_funddetail`.`ID` AS `fdid`,
`service_funddetail`.`fundID` AS `fundid`,
`service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 72576e4..a2e4c8a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -62,6 +62,8 @@
<result property="taxTime" column="tax_time"/>
<result property="jxrq" column="jxrq"/>
<result property="invoicefiles" column="InvoiceFiles"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="deptName" column="dept_name"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -69,6 +71,8 @@
fundID,
InfoId,
DonorNo,
+ dept_id,
+ dept_name,
DonorName,
BeneficiaryName,
BeneficiaryNo,
@@ -142,6 +146,8 @@
<if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
<if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
<if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
+ <if test="deptId != null ">and dept_id = #{deptId}</if>
+ <if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>
</where>
</select>
@@ -235,6 +241,8 @@
a.SERVICETYPE,
a.SERVICETYPENAME,
a.subjecttype,
+ a.dept_id,
+ a.dept_name,
a.subjecttypename
from service_funddetail a,
service_fund b
--
Gitblit v1.9.3