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/ServiceReimbursementpayeeMapper.xml | 93 ++++++++++++++++++----------------------------
1 files changed, 36 insertions(+), 57 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementpayeeMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementpayeeMapper.xml
index c0470d7..40116b7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementpayeeMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementpayeeMapper.xml
@@ -1,70 +1,50 @@
<?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.ServiceReimbursementpayeeMapper">
-
+
<resultMap type="ServiceReimbursementpayee" id="ServiceReimbursementpayeeResult">
- <result property="id" column="id"/>
- <result property="rbid" column="rbid"/>
- <result property="orderno" column="orderno"/>
- <result property="persontype" column="persontype"/>
- <result property="personname" column="personname"/>
- <result property="bankname" column="bankname"/>
- <result property="bankcardno" column="bankcardno"/>
- <result property="amount" column="amount"/>
- <result property="phone" column="phone"/>
- <result property="familyrelations" column="familyrelations"/>
- <result property="paiddate" column="paiddate"/>
- <result property="remark" column="remark"/>
- <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="uploadflag" column="uploadflag"/>
- <result property="uploadtime" column="uploadtime"/>
+ <result property="id" column="id" />
+ <result property="rbid" column="rbid" />
+ <result property="orderno" column="orderno" />
+ <result property="persontype" column="persontype" />
+ <result property="personname" column="personname" />
+ <result property="bankname" column="bankname" />
+ <result property="bankcardno" column="bankcardno" />
+ <result property="amount" column="amount" />
+ <result property="phone" column="phone" />
+ <result property="familyrelations" column="familyrelations" />
+ <result property="paiddate" column="paiddate" />
+ <result property="remark" column="remark" />
+ <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="uploadflag" column="uploadflag" />
+ <result property="uploadtime" column="uploadtime" />
</resultMap>
<sql id="selectServiceReimbursementpayeeVo">
- select id,
- rbid,
- orderno,
- persontype,
- personname,
- bankname,
- bankcardno,
- amount,
- phone,
- familyrelations,
- paiddate,
- remark,
- del_flag,
- create_by,
- create_time,
- update_by,
- update_time,
- uploadflag,
- uploadtime
- from service_reimbursementpayee
+ select id, rbid, orderno, persontype, personname, bankname, bankcardno, amount, phone, familyrelations, paiddate, remark, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_reimbursementpayee
</sql>
- <select id="selectServiceReimbursementpayeeList" parameterType="ServiceReimbursementpayee"
- resultMap="ServiceReimbursementpayeeResult">
+ <select id="selectServiceReimbursementpayeeList" parameterType="ServiceReimbursementpayee" resultMap="ServiceReimbursementpayeeResult">
<include refid="selectServiceReimbursementpayeeVo"/>
<where>
- <if test="rbid != null ">and rbid = #{rbid}</if>
- <if test="orderno != null ">and orderno = #{orderno}</if>
- <if test="persontype != null and persontype != ''">and persontype = #{persontype}</if>
- <if test="personname != null and personname != ''">and personname like concat('%', #{personname}, '%')</if>
- <if test="bankname != null and bankname != ''">and bankname like concat('%', #{bankname}, '%')</if>
- <if test="bankcardno != null and bankcardno != ''">and bankcardno = #{bankcardno}</if>
- <if test="amount != null ">and amount = #{amount}</if>
- <if test="phone != null and phone != ''">and phone = #{phone}</if>
- <if test="familyrelations != null and familyrelations != ''">and familyrelations = #{familyrelations}</if>
- <if test="paiddate != null ">and paiddate = #{paiddate}</if>
- <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="rbid != null "> and rbid = #{rbid}</if>
+ <if test="orderno != null "> and orderno = #{orderno}</if>
+ <if test="persontype != null and persontype != ''"> and persontype = #{persontype}</if>
+ <if test="personname != null and personname != ''"> and personname like concat('%', #{personname}, '%')</if>
+ <if test="bankname != null and bankname != ''"> and bankname like concat('%', #{bankname}, '%')</if>
+ <if test="bankcardno != null and bankcardno != ''"> and bankcardno = #{bankcardno}</if>
+ <if test="amount != null "> and amount = #{amount}</if>
+ <if test="phone != null and phone != ''"> and phone = #{phone}</if>
+ <if test="familyrelations != null and familyrelations != ''"> and familyrelations = #{familyrelations}</if>
+ <if test="paiddate != null "> and paiddate = #{paiddate}</if>
+ <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
</where>
</select>
@@ -88,5 +68,4 @@
ORDER BY a.id desc
</select>
-
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3