From 0363d8873e26c8e7a2b8e9b08ee56b7a3605d6c7 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 31 五月 2023 19:03:56 +0800
Subject: [PATCH] yxh
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java | 4 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java | 13 ++++++++++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrganization.java | 13 +++++++++++--
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrganization.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrganization.java
index 7f00a22..e4eb356 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrganization.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOrganization.java
@@ -1,14 +1,15 @@
package com.ruoyi.project.domain;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* 鏈烘瀯绠＄悊瀵硅薄 base_organization
@@ -159,6 +160,14 @@
@ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
@Excel(name = "鎵�灞炲尯鍩熷悕绉�")
private String countyname;
+ /** 鎵�灞炲尯鍩熷悕绉� */
+ @ApiModelProperty("閾惰鍚嶇О")
+ @Excel(name = "閾惰鍚嶇О")
+ private String bankname;
+ /** 鎵�灞炲尯鍩熷悕绉� */
+ @ApiModelProperty("閾惰璐﹀彿")
+ @Excel(name = "閾惰璐﹀彿")
+ private String bankaccount;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
index 7e66c22..5414dc2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
@@ -1,15 +1,16 @@
package com.ruoyi.project.domain;
-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;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 宸梾鎶ラ攢浠樻淇℃伅瀵硅薄 service_reimbursementpayee
@@ -80,6 +81,12 @@
@Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date paiddate;
+ /** 浠樻璇存槑 */
+ @ApiModelProperty("浠樻璇存槑")
+ @Excel(name = "浠樻璇存槑")
+ private String remark;
+
+
/** 涓婁紶鏍囧織 */
@ApiModelProperty("涓婁紶鏍囧織")
@Excel(name = "涓婁紶鏍囧織")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
index 1d74862..48f4b99 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
@@ -71,6 +71,10 @@
if (serviceReimbursementpayee.getUploadtime() != null) {
wrappers.eq(ServiceReimbursementpayee::getUploadtime, serviceReimbursementpayee.getUploadtime());
}
+
+ if (StringUtils.isNotBlank(serviceReimbursementpayee.getRemark())) {
+ wrappers.eq(ServiceReimbursementpayee::getRemark, serviceReimbursementpayee.getRemark());
+ }
return this.list(wrappers);
}
--
Gitblit v1.9.3