From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/resources/mapper/approve/ApprovalInstanceMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
new file mode 100644
index 0000000..f632e74
--- /dev/null
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -0,0 +1,58 @@
+<?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">
+<mapper namespace="com.ruoyi.approve.mapper.ApprovalInstanceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApprovalInstance">
+ <id column="id" property="id" />
+ <result column="instance_no" property="instanceNo" />
+ <result column="template_id" property="templateId" />
+ <result column="template_name" property="templateName" />
+ <result column="business_id" property="businessId" />
+ <result column="business_type" property="businessType" />
+ <result column="title" property="title" />
+ <result column="status" property="status" />
+ <result column="current_level" property="currentLevel" />
+ <result column="applicant_id" property="applicantId" />
+ <result column="applicant_name" property="applicantName" />
+ <result column="apply_time" property="applyTime" />
+ <result column="finish_time" property="finishTime" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="deleted" property="deleted" />
+ </resultMap>
+ <select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalInstanceVo">
+ select ai.*,su.nick_name as create_user_name from
+ approval_instance ai
+ left join sys_user su on ai.create_user = su.user_id
+ <where>
+ deleted = 0
+ <if test="ew.instanceNo != null">
+ and ai.instance_no like concat('%',#{ew.instanceNo},'%')
+ </if>
+ <if test="ew.templateName != null">
+ and ai.template_name like concat('%',#{ew.templateName},'%')
+ </if>
+ <if test="ew.templateId != null ">
+ and ai. template_id = #{ew.templateId}
+ </if>
+ <if test="ew.businessType != null ">
+ and ai.business_type = #{ew.businessType}
+ </if>
+ <if test="ew.createTimeStart != null and ew.createTimeEnd != null">
+ and ai.apply_time >= #{ew.createTimeStart}
+ and ai.apply_time <= #{ew.createTimeEnd}
+ </if>
+ <if test="ew.status != null">
+ and ai.status = #{ew.status}
+ </if>
+ <if test="ew.applicantName != null and ew.applicantName !=''">
+ and ai.applicant_name = #{ew.applicantName}
+ </if>
+ </where>
+ order by ai.create_time desc
+ </select>
+
+</mapper>
--
Gitblit v1.9.3