From 9a107421d1b7d99eb4b68c092fe97013b755fb43 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 18:32:49 +0800
Subject: [PATCH] 修改“delFlag”
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 6 +
ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml | 264 +++++++++++++++++++++++++++----------------
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 6
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 6 +
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 6
ruoyi-admin/pom.xml | 5
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 5
10 files changed, 200 insertions(+), 112 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 8aa6e33..4ce1277 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,8 +8,9 @@
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>war</packaging>
- <artifactId>ruoyi-admin</artifactId>
+<!-- <packaging>war</packaging>-->
+ <packaging>jar</packaging>
+ <artifactId>ruoyi-admin-opo</artifactId>
<description>
web鏈嶅姟鍏ュ彛
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 7d2a7c7..f9f3af6 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
@@ -226,5 +226,11 @@
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private String zffs;
+
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index 06fd6fd..9d7034d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -256,6 +256,12 @@
@Excel(name = "璁板綍鐘舵��")
private long serfunid;
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private String zffs;
+
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
+
@ApiModelProperty("璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
@Excel(name = "璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index 942338b..3efbc38 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -307,7 +307,10 @@
@ApiModelProperty("浠樻鏂瑰紡")
- private String payterm;
+ private String zffs;
+
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
// @ApiModelProperty("寮�濮嬫椂闂�")
// private Date starttime;
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 5bff6b3..cd2be12 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
@@ -353,8 +353,10 @@
@ApiModelProperty("璐㈠姟绯荤粺椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
private String cxrjyj;
- @ApiModelProperty("鏀粯鏂瑰紡")
- private String payerm;
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private String zffs;
+ @ApiModelProperty("浠樻鏃ユ湡")
+ private String riqi;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 18e4417..e46ad73 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -51,6 +51,8 @@
<result property="pretaxcost" column="PretaxCost"/>
<result property="taxedcost" column="TaxedCost"/>
<result property="backflowlevel" column="backFlowLevel"/>
+ <result property="zffs" column="zffs"/>
+ <result property="riqi" column="riqi"/>
</resultMap>
@@ -101,7 +103,9 @@
uploadflag,
uploadtime,
backflowlevel,
- FlowLevel
+ FlowLevel,
+ zffs,
+ riqi
from service_fund
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index a3a1715..a2cdb80 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -1,68 +1,124 @@
<?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.ServiceFundSharedMapper">
-
- <resultMap type="ServiceFundShared" id="ServiceFundSharedResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="donorname" column="DonorName" />
- <result property="delFlag" 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="userno" column="UserNo" />
- <result property="username" column="UserName" />
- <result property="unitname" column="UnitName" />
- <result property="unitno" column="UnitNo" />
- <result property="unituserno" column="UnitUserNo" />
- <result property="phone" column="Phone" />
- <result property="annexbankcard" column="AnnexBankCard" />
- <result property="annexregistform" column="AnnexRegistForm" />
- <result property="pretaxcost" column="PretaxCost" />
- <result property="taxedcost" column="TaxedCost" />
- <result property="totalcost" column="TotalCost" />
- <result property="procurementcost" column="ProcurementCost" />
- <result property="expertcost" column="ExpertCost" />
- <result property="ethicscost" column="EthicsCost" />
- <result property="medicalcost" column="MedicalCost" />
- <result property="familycost" column="FamilyCost" />
- <result property="aftercarecost" column="AftercareCost" />
- <result property="amountrequested" column="AmountRequested" />
- <result property="applytype" column="ApplyType" />
- <result property="prepaidamount" column="PrepaidAmount" />
- <result property="invoicecount" column="InvoiceCount" />
- <result property="attachcount" column="AttachCount" />
- <result property="managerno" column="ManagerNo" />
- <result property="managername" column="ManagerName" />
- <result property="deptmentno" column="DeptmentNo" />
- <result property="deptmentname" column="DeptmentName" />
- <result property="opochecker" column="OPOchecker" />
- <result property="finvicepresident" column="FinVicePresident" />
- <result property="busvicepresident" column="BusVicePresident" />
- <result property="officedirector" column="OfficeDirector" />
- <result property="financedirector" column="FinanceDirector" />
- <result property="financechecher" column="FinanceChecher" />
- <result property="remark" column="Remark" />
- <result property="isdistribute" column="Isdistribute" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="flowlevel" column="FlowLevel" />
- <result property="oaid" column="oaid" />
- <result property="oabdzt" column="oabdzt" />
- <result property="filename" column="filename" />
- <result property="fileid" column="fileid" />
+
+ <resultMap type="com.ruoyi.project.domain.ServiceFundShared" id="ServiceFundSharedResult">
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="delflag" 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="userno" column="UserNo"/>
+ <result property="username" column="UserName"/>
+ <result property="unitname" column="UnitName"/>
+ <result property="unitno" column="UnitNo"/>
+ <result property="unituserno" column="UnitUserNo"/>
+ <result property="phone" column="Phone"/>
+ <result property="annexbankcard" column="AnnexBankCard"/>
+ <result property="annexregistform" column="AnnexRegistForm"/>
+ <result property="pretaxcost" column="PretaxCost"/>
+ <result property="taxedcost" column="TaxedCost"/>
+ <result property="totalcost" column="TotalCost"/>
+ <result property="procurementcost" column="ProcurementCost"/>
+ <result property="expertcost" column="ExpertCost"/>
+ <result property="ethicscost" column="EthicsCost"/>
+ <result property="medicalcost" column="MedicalCost"/>
+ <result property="familycost" column="FamilyCost"/>
+ <result property="aftercarecost" column="AftercareCost"/>
+ <result property="amountrequested" column="AmountRequested"/>
+ <result property="applytype" column="ApplyType"/>
+ <result property="prepaidamount" column="PrepaidAmount"/>
+ <result property="invoicecount" column="InvoiceCount"/>
+ <result property="attachcount" column="AttachCount"/>
+ <result property="managerno" column="ManagerNo"/>
+ <result property="managername" column="ManagerName"/>
+ <result property="deptmentno" column="DeptmentNo"/>
+ <result property="deptmentname" column="DeptmentName"/>
+ <result property="opochecker" column="OPOchecker"/>
+ <result property="finvicepresident" column="FinVicePresident"/>
+ <result property="busvicepresident" column="BusVicePresident"/>
+ <result property="officedirector" column="OfficeDirector"/>
+ <result property="financedirector" column="FinanceDirector"/>
+ <result property="financechecher" column="FinanceChecher"/>
+ <result property="remark" column="Remark"/>
+ <result property="isdistribute" column="Isdistribute"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="oaid" column="oaid"/>
+ <result property="oabdzt" column="oabdzt"/>
+ <result property="filename" column="filename"/>
+ <result property="fileid" column="fileid"/>
+ <result property="zffs" column="zffs"/>
+ <result property="riqi" column="riqi"/>
</resultMap>
<sql id="selectServiceFundSharedVo">
- select ID, InfoID, DonorNo, DonorName, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, Phone, AnnexBankCard, AnnexRegistForm, PretaxCost, TaxedCost, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, Isdistribute, RecordStatus, uploadflag, uploadtime, FlowLevel, oaid, oabdzt, filename, fileid,serfunid from service_fund_shared
+ select ID,
+ InfoID,
+ DonorNo,
+ DonorName,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ UserNo,
+ UserName,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ Phone,
+ AnnexBankCard,
+ AnnexRegistForm,
+ PretaxCost,
+ TaxedCost,
+ TotalCost,
+ ProcurementCost,
+ ExpertCost,
+ EthicsCost,
+ MedicalCost,
+ FamilyCost,
+ AftercareCost,
+ AmountRequested,
+ ApplyType,
+ PrepaidAmount,
+ InvoiceCount,
+ AttachCount,
+ ManagerNo,
+ ManagerName,
+ DeptmentNo,
+ DeptmentName,
+ OPOchecker,
+ FinVicePresident,
+ BusVicePresident,
+ OfficeDirector,
+ FinanceDirector,
+ FinanceChecher,
+ Remark,
+ Isdistribute,
+ RecordStatus,
+ uploadflag,
+ uploadtime,
+ FlowLevel,
+ oaid,
+ oabdzt,
+ filename,
+ fileid,
+ serfunid,
+ zffs,
+ riqi
+ from service_fund_shared
</sql>
- <select id="getFundShareInfoById" resultType="com.ruoyi.project.domain.ServiceFundShared" resultMap="ServiceFundSharedResult">
+ <select id="getFundShareInfoById" resultType="com.ruoyi.project.domain.ServiceFundShared"
+ resultMap="ServiceFundSharedResult">
<include refid="selectServiceFundSharedVo"/>
where serfunid = #{fundid}
</select>
@@ -70,50 +126,56 @@
<select id="selectServiceFundSharedList" parameterType="ServiceFundShared" resultMap="ServiceFundSharedResult">
<include refid="selectServiceFundSharedVo"/>
<where>
- <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="userno != null and userno != ''"> and UserNo = #{userno}</if>
- <if test="username != null and username != ''"> and UserName like concat('%', #{username}, '%')</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="phone != null and phone != ''"> and Phone = #{phone}</if>
- <if test="annexbankcard != null and annexbankcard != ''"> and AnnexBankCard = #{annexbankcard}</if>
- <if test="annexregistform != null and annexregistform != ''"> and AnnexRegistForm = #{annexregistform}</if>
- <if test="pretaxcost != null "> and PretaxCost = #{pretaxcost}</if>
- <if test="taxedcost != null "> and TaxedCost = #{taxedcost}</if>
- <if test="totalcost != null "> and TotalCost = #{totalcost}</if>
- <if test="expertcost != null "> and ExpertCost = #{expertcost}</if>
- <if test="ethicscost != null "> and EthicsCost = #{ethicscost}</if>
- <if test="medicalcost != null "> and MedicalCost = #{medicalcost}</if>
- <if test="familycost != null "> and FamilyCost = #{familycost}</if>
- <if test="aftercarecost != null "> and AftercareCost = #{aftercarecost}</if>
- <if test="amountrequested != null "> and AmountRequested = #{amountrequested}</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
- <if test="prepaidamount != null "> and PrepaidAmount = #{prepaidamount}</if>
- <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
- <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
- <if test="managerno != null and managerno != ''"> and ManagerNo = #{managerno}</if>
- <if test="managername != null and managername != ''"> and ManagerName like concat('%', #{managername}, '%')</if>
- <if test="deptmentno != null and deptmentno != ''"> and DeptmentNo = #{deptmentno}</if>
- <if test="deptmentname != null and deptmentname != ''"> and DeptmentName like concat('%', #{deptmentname}, '%')</if>
- <if test="opochecker != null and opochecker != ''"> and OPOchecker = #{opochecker}</if>
- <if test="finvicepresident != null and finvicepresident != ''"> and FinVicePresident = #{finvicepresident}</if>
- <if test="busvicepresident != null and busvicepresident != ''"> and BusVicePresident = #{busvicepresident}</if>
- <if test="officedirector != null and officedirector != ''"> and OfficeDirector = #{officedirector}</if>
- <if test="financedirector != null and financedirector != ''"> and FinanceDirector = #{financedirector}</if>
- <if test="financechecher != null and financechecher != ''"> and FinanceChecher = #{financechecher}</if>
- <if test="remark != null and remark != ''"> and Remark = #{remark}</if>
- <if test="isdistribute != null and isdistribute != ''"> and Isdistribute = #{isdistribute}</if>
- <if test="recordstatus != null "> and RecordStatus = #{recordstatus}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
- <if test="flowlevel != null "> and FlowLevel = #{flowlevel}</if>
- <if test="oaid != null and oaid != ''"> and oaid = #{oaid}</if>
- <if test="oabdzt != null and oabdzt != ''"> and oabdzt = #{oabdzt}</if>
- <if test="filename != null and filename != ''"> and filename like concat('%', #{filename}, '%')</if>
- <if test="fileid != null and fileid != ''"> and fileid = #{fileid}</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="userno != null and userno != ''">and UserNo = #{userno}</if>
+ <if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</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="phone != null and phone != ''">and Phone = #{phone}</if>
+ <if test="annexbankcard != null and annexbankcard != ''">and AnnexBankCard = #{annexbankcard}</if>
+ <if test="annexregistform != null and annexregistform != ''">and AnnexRegistForm = #{annexregistform}</if>
+ <if test="pretaxcost != null ">and PretaxCost = #{pretaxcost}</if>
+ <if test="taxedcost != null ">and TaxedCost = #{taxedcost}</if>
+ <if test="totalcost != null ">and TotalCost = #{totalcost}</if>
+ <if test="expertcost != null ">and ExpertCost = #{expertcost}</if>
+ <if test="ethicscost != null ">and EthicsCost = #{ethicscost}</if>
+ <if test="medicalcost != null ">and MedicalCost = #{medicalcost}</if>
+ <if test="familycost != null ">and FamilyCost = #{familycost}</if>
+ <if test="aftercarecost != null ">and AftercareCost = #{aftercarecost}</if>
+ <if test="amountrequested != null ">and AmountRequested = #{amountrequested}</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
+ <if test="prepaidamount != null ">and PrepaidAmount = #{prepaidamount}</if>
+ <if test="invoicecount != null ">and InvoiceCount = #{invoicecount}</if>
+ <if test="attachcount != null ">and AttachCount = #{attachcount}</if>
+ <if test="managerno != null and managerno != ''">and ManagerNo = #{managerno}</if>
+ <if test="managername != null and managername != ''">and ManagerName like concat('%', #{managername},
+ '%')
+ </if>
+ <if test="deptmentno != null and deptmentno != ''">and DeptmentNo = #{deptmentno}</if>
+ <if test="deptmentname != null and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
+ '%')
+ </if>
+ <if test="opochecker != null and opochecker != ''">and OPOchecker = #{opochecker}</if>
+ <if test="finvicepresident != null and finvicepresident != ''">and FinVicePresident = #{finvicepresident}
+ </if>
+ <if test="busvicepresident != null and busvicepresident != ''">and BusVicePresident = #{busvicepresident}
+ </if>
+ <if test="officedirector != null and officedirector != ''">and OfficeDirector = #{officedirector}</if>
+ <if test="financedirector != null and financedirector != ''">and FinanceDirector = #{financedirector}</if>
+ <if test="financechecher != null and financechecher != ''">and FinanceChecher = #{financechecher}</if>
+ <if test="remark != null and remark != ''">and Remark = #{remark}</if>
+ <if test="isdistribute != null and isdistribute != ''">and Isdistribute = #{isdistribute}</if>
+ <if test="recordstatus != null ">and RecordStatus = #{recordstatus}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="flowlevel != null ">and FlowLevel = #{flowlevel}</if>
+ <if test="oaid != null and oaid != ''">and oaid = #{oaid}</if>
+ <if test="oabdzt != null and oabdzt != ''">and oabdzt = #{oabdzt}</if>
+ <if test="filename != null and filename != ''">and filename like concat('%', #{filename}, '%')</if>
+ <if test="fileid != null and fileid != ''">and fileid = #{fileid}</if>
</where>
</select>
<update id="delfundsharedInfoById">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 74b5651..519981a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -56,7 +56,8 @@
<result property="donoramount" column="donoramount"/>
<result property="donorrelatives" column="donorrelatives"/>
<result property="backflowlevel" column="backFlowLevel"/>
- <result property="payterm" column="payTerm"/>
+ <result property="zffs" column="zffs"/>
+ <result property="riqi" column="riqi"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -109,7 +110,8 @@
donoramount,
donorrelatives,
backFlowLevel,
- payterm
+ zffs,
+ riqi
from service_reimbursement
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index 32f46be..2a90fe2 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -59,7 +59,8 @@
<result property="donorremark" column="donorremark"/>
<result property="donoramount" column="donoramount"/>
<result property="donorrelatives" column="donorrelatives"/>
- <result property="payterm" column="payTerm"/>
+ <result property="zffs" column="zffs"/>
+ <result property="riqi" column="riqi"/>
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
@@ -117,7 +118,8 @@
donorremark,
donoramount,
donorrelatives,
- payTerm
+ zffs,
+ riqi
from service_reimbursement_shared
</sql>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 3290b71..2a5f264 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -121,7 +121,7 @@
contentList.add(map);
DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
- dingTalkReqVo.setNumber("13634195431");
+ dingTalkReqVo.setNumber("17607179857");
dingTalkReqVo.setContents(contentList);
dingTalkService.sendNotification(dingTalkReqVo);
}
--
Gitblit v1.9.3