From 2c456094bdf1cc7e1bab5e0dbee00bb1f2743488 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 13:50:12 +0800
Subject: [PATCH] 1、审批顺序：审批时，从一级到五级逐级审批，回退时，由审批人员指定回退级别，如从五级审批退回到经办人（需要重新修改材料的人员处），每一级可以看到回退的信息；修改完成后，直接从经办人处到达五级审批或退回的审批人。被退回的信息修改完成后，直接从经办人到达五级审批或退回的审批人处，那么其他层级的审批人虽然不需要审批，但要能够看到重新修改后的信息。 说明： （1）差旅费报销主表：service_reimbursement 标识字段：FlowLevel（当前审核级别 处于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等; 4：四级审核等； 5：五级审核等）；RecordStatus（记录状态 详见字典sys_travelexpensestatus） （2）费用报销主表：service_fund 标识字段：FlowLevel（当前审核级别 处于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等; 4：四级审核等； 5：五级审核等）；RecordStatus（记录状态 详见字典sys_travelexpensestatus） （3）审批流程设置表：service_fundflowrule （4）审批流程记录表：service_fundflow
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 279 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 176 insertions(+), 103 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index 438d475..437dadd 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -1,120 +1,193 @@
<?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.ServiceReimbursementSharedMapper">
-
- <resultMap type="ServiceReimbursementShared" id="ServiceReimbursementSharedResult">
- <result property="id" column="ID" />
- <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="travelers" column="Travelers" />
- <result property="idcardtype" column="IDCardType" />
- <result property="idcardno" column="IDCardNo" />
- <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="annexfiles" column="AnnexFiles" />
- <result property="amountrequested" column="AmountRequested" />
- <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="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="donorname" column="DonorName" />
- <result property="reason" column="Reason" />
- <result property="remark" column="remark" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="totalamount" column="totalAmount" />
- <result property="bigstrmoney" column="bigStrMoney" />
- <result property="flowlevel" column="FlowLevel" />
- <result property="costtype" column="costtype" />
- <result property="costtypename" column="costtypename" />
- <result property="oaid" column="oaid" />
- <result property="oabdzt" column="oabdzt" />
- <result property="filename" column="filename" />
- <result property="fileid" column="fileid" />
- <result property="reimid" column="reimid" />
- <result property="donorbank" column="donorbank" />
- <result property="donorbankcard" column="donorbankcard" />
- <result property="donorremark" column="donorremark" />
- <result property="donoramount" column="donoramount" />
- <result property="donorrelatives" column="donorrelatives" />
+
+ <resultMap type="com.ruoyi.project.domain.ServiceReimbursementShared" id="ServiceReimbursementSharedResult">
+ <result property="id" column="ID"/>
+ <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="travelers" column="Travelers"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <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="annexfiles" column="AnnexFiles"/>
+ <result property="amountrequested" column="AmountRequested"/>
+ <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="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="reason" column="Reason"/>
+ <result property="remark" column="remark"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="totalamount" column="totalAmount"/>
+ <result property="bigstrmoney" column="bigStrMoney"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="costtype" column="costtype"/>
+ <result property="costtypename" column="costtypename"/>
+ <result property="oaid" column="oaid"/>
+ <result property="oabdzt" column="oabdzt"/>
+ <result property="filename" column="filename"/>
+ <result property="fileid" column="fileid"/>
+ <result property="reimid" column="reimid"/>
+ <result property="donorbank" column="donorbank"/>
+ <result property="donorbankcard" column="donorbankcard"/>
+ <result property="donorremark" column="donorremark"/>
+ <result property="donoramount" column="donoramount"/>
+ <result property="donorrelatives" column="donorrelatives"/>
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement_shared
+ select ID,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ UserNo,
+ UserName,
+ Travelers,
+ IDCardType,
+ IDCardNo,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexFiles,
+ AmountRequested,
+ PrepaidAmount,
+ InvoiceCount,
+ AttachCount,
+ ManagerNo,
+ ManagerName,
+ DeptmentNo,
+ DeptmentName,
+ OPOchecker,
+ FinVicePresident,
+ BusVicePresident,
+ OfficeDirector,
+ FinanceDirector,
+ FinanceChecher,
+ InfoID,
+ DonorNo,
+ DonorName,
+ Reason,
+ remark,
+ RecordStatus,
+ uploadflag,
+ uploadtime,
+ totalAmount,
+ bigStrMoney,
+ FlowLevel,
+ costtype,
+ costtypename,
+ oaid,
+ oabdzt,
+ filename,
+ fileid,
+ reimid,
+ donorbank,
+ donorbankcard,
+ donorremark,
+ donoramount,
+ donorrelatives
+ from service_reimbursement_shared
</sql>
- <select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
+ <select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared"
+ resultMap="ServiceReimbursementSharedResult">
<include refid="selectServiceReimbursementSharedVo"/>
- where reimid = #{RemId}
+ where reimid = #{RemId} and del_flag!=1
</select>
- <select id="selectServiceReimbursementSharedList" parameterType="ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
+ <select id="selectServiceReimbursementSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementShared"
+ resultMap="ServiceReimbursementSharedResult">
<include refid="selectServiceReimbursementSharedVo"/>
<where>
- <if test="userno != null and userno != ''"> and UserNo = #{userno}</if>
- <if test="username != null and username != ''"> and UserName like concat('%', #{username}, '%')</if>
- <if test="travelers != null and travelers != ''"> and Travelers = #{travelers}</if>
- <if test="idcardtype != null and idcardtype != ''"> and IDCardType = #{idcardtype}</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</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="annexfiles != null and annexfiles != ''"> and AnnexFiles = #{annexfiles}</if>
- <if test="amountrequested != null "> and AmountRequested = #{amountrequested}</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="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="reason != null and reason != ''"> and Reason = #{reason}</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="totalamount != null "> and totalAmount = #{totalamount}</if>
- <if test="bigstrmoney != null and bigstrmoney != ''"> and bigStrMoney = #{bigstrmoney}</if>
- <if test="flowlevel != null "> and FlowLevel = #{flowlevel}</if>
- <if test="costtype != null and costtype != ''"> and costtype = #{costtype}</if>
- <if test="costtypename != null and costtypename != ''"> and costtypename like concat('%', #{costtypename}, '%')</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="userno != null and userno != ''">and UserNo = #{userno}</if>
+ <if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
+ <if test="travelers != null and travelers != ''">and Travelers = #{travelers}</if>
+ <if test="idcardtype != null and idcardtype != ''">and IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</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="annexfiles != null and annexfiles != ''">and AnnexFiles = #{annexfiles}</if>
+ <if test="amountrequested != null ">and AmountRequested = #{amountrequested}</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="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="reason != null and reason != ''">and Reason = #{reason}</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="totalamount != null ">and totalAmount = #{totalamount}</if>
+ <if test="bigstrmoney != null and bigstrmoney != ''">and bigStrMoney = #{bigstrmoney}</if>
+ <if test="flowlevel != null ">and FlowLevel = #{flowlevel}</if>
+ <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+ <if test="costtypename != null and costtypename != ''">and costtypename like concat('%', #{costtypename},
+ '%')
+ </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="delResharedInfoById">
+ UPDATE service_reimbursement_shared
+ SET del_flag = 1
+ WHERE id = #{id}
+ and del_flag != 1
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3