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/ServiceFundMapper.xml | 191 ++++++++++++++++++++++++++++++-----------------
1 files changed, 122 insertions(+), 69 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index c2d6661..18e4417 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -1,76 +1,127 @@
<?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.ServiceFundMapper">
-
- <resultMap type="ServiceFund" id="ServiceFundResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="donorname" column="DonorName" />
- <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="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="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="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="remark" column="Remark" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="flowlevel" column="FlowLevel" />
- <result property="pretaxcost" column="PretaxCost" />
- <result property="taxedcost" column="TaxedCost" />
+
+ <resultMap type="com.ruoyi.project.domain.ServiceFund" id="ServiceFundResult">
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
+ <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="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="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="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="remark" column="Remark"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="pretaxcost" column="PretaxCost"/>
+ <result property="taxedcost" column="TaxedCost"/>
+ <result property="backflowlevel" column="backFlowLevel"/>
+
</resultMap>
<sql id="selectServiceFundVo">
- select ID, InfoID, DonorNo, DonorName, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, PretaxCost, TaxedCost, Phone, AnnexBankCard, AnnexRegistForm, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, Remark, RecordStatus, uploadflag, uploadtime,FlowLevel from service_fund
+ select ID,
+ InfoID,
+ DonorNo,
+ DonorName,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ UserNo,
+ UserName,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ PretaxCost,
+ TaxedCost,
+ Phone,
+ AnnexBankCard,
+ AnnexRegistForm,
+ AmountRequested,
+ ApplyType,
+ PrepaidAmount,
+ InvoiceCount,
+ AttachCount,
+ ManagerNo,
+ ManagerName,
+ DeptmentNo,
+ DeptmentName,
+ OPOchecker,
+ FinVicePresident,
+ BusVicePresident,
+ OfficeDirector,
+ FinanceDirector,
+ FinanceChecher,
+ TotalCost,
+ ProcurementCost,
+ ExpertCost,
+ EthicsCost,
+ MedicalCost,
+ FamilyCost,
+ AftercareCost,
+ Remark,
+ RecordStatus,
+ uploadflag,
+ uploadtime,
+ backflowlevel,
+ FlowLevel
+ from service_fund
</sql>
<select id="selectServiceFundList" parameterType="ServiceFund" resultMap="ServiceFundResult">
<include refid="selectServiceFundVo"/>
where del_flag = '0'
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</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="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
- <if test="deptmentname != null and deptmentname != ''"> and DeptmentName like concat('%', #{deptmentname}, '%')</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="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="donorno != null and donorno != ''">and DonorNo = #{donorno}</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="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
+ <if test="deptmentname != null and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
+ '%')
+ </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="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>
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -79,7 +130,8 @@
</select>
<select id="getFundId" resultType="java.lang.Long">
- select max(ID) from service_fund
+ select max(ID)
+ from service_fund
where infoid = #{infoid}
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.FundVO">
@@ -167,18 +219,19 @@
`service_fund`.`ID` = `service_funddetail`.`fundID`
)))
<where>
- <if test="donorno != null and donorno != ''"> and `service_fund`.`DonorNo` = #{donorno}</if>
- <if test="userno != null and userno != ''"> and `service_fund`.`UserNo` = #{userno}</if>
- <if test="username != null and username != ''"> and `service_fund`.`UserName` = #{username}</if>
- <if test="unitname != null and unitname != ''"> and `service_fund`.`UnitName` = #{unitname}</if>
- <if test="create_by != null and create_by != ''"> and `service_fund`.`create_by` = #{create_by}</if>
- <if test="create_time != null and create_time != ''"> and `service_fund`.`create_time` = #{create_time}</if>
+ <if test="donorno != null and donorno != ''">and `service_fund`.`DonorNo` = #{donorno}</if>
+ <if test="userno != null and userno != ''">and `service_fund`.`UserNo` = #{userno}</if>
+ <if test="username != null and username != ''">and `service_fund`.`UserName` = #{username}</if>
+ <if test="unitname != null and unitname != ''">and `service_fund`.`UnitName` = #{unitname}</if>
+ <if test="create_by != null and create_by != ''">and `service_fund`.`create_by` = #{create_by}</if>
+ <if test="create_time != null and create_time != ''">and `service_fund`.`create_time` = #{create_time}</if>
</where>
</select>
- <select id="getListBypower" statementType="CALLABLE" resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
+ <select id="getListBypower" statementType="CALLABLE"
+ resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
</select>
--
Gitblit v1.9.3