From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml | 112 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 41 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
index cd74c62..564d6a0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
@@ -1,56 +1,86 @@
<?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.VDonationworkflowMapper">
<resultMap type="com.ruoyi.project.domain.VDonationworkflow" id="VDonationworkflowResult">
- <result property="id" column="id" />
- <result property="name" column="name" />
- <result property="idcardno" column="IDCardNo" />
- <result property="workflow" column="workflow" />
- <result property="terminationcase" column="terminationCase" />
- <result property="deptid" column="deptid" />
- <result property="deptname" column="deptname" />
- <result property="reporterno" column="reporterNo" />
- <result property="reportername" column="reporterName" />
- <result property="donatetime" column="donatetime" />
- <result property="reporttime" column="ReportTime" />
- <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion" />
- <result property="coreteamassesstime" column="coreTeamAssessTime" />
- <result property="signdate" column="signdate" />
- <result property="expertconclusion" column="ExpertConclusion" />
- <result property="conclusiontime" column="conclusionTime" />
- <result property="organcount" column="organcount" />
- <result property="operationbegtime" column="operationBegTime" />
- <result property="completetime" column="completeTime" />
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="workflow" column="workflow"/>
+ <result property="terminationcase" column="terminationCase"/>
+ <result property="deptid" column="deptid"/>
+ <result property="deptname" column="deptname"/>
+ <result property="reporterno" column="reporterNo"/>
+ <result property="reportername" column="reporterName"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="reporttime" column="ReportTime"/>
+ <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion"/>
+ <result property="coreteamassesstime" column="coreTeamAssessTime"/>
+ <result property="signdate" column="signdate"/>
+ <result property="expertconclusion" column="ExpertConclusion"/>
+ <result property="conclusiontime" column="conclusionTime"/>
+ <result property="organcount" column="organcount"/>
+ <result property="operationbegtime" column="operationBegTime"/>
+ <result property="completetime" column="completeTime"/>
+ <result property="regionallevel" column="regionallevel"/>
</resultMap>
<sql id="selectVDonationworkflowVo">
- select id, name, IDCardNo, workflow, terminationCase, deptid, deptname, reporterNo, reporterName, donatetime, ReportTime, CoreTeamAssessConclusion, coreTeamAssessTime, signdate, ExpertConclusion, conclusionTime, organcount, operationBegTime, completeTime from v_donationworkflow
+ select id,
+ name,
+ IDCardNo,
+ workflow,
+ terminationCase,
+ deptid,
+ deptname,
+ reporterNo,
+ reporterName,
+ donatetime,
+ ReportTime,
+ CoreTeamAssessConclusion,
+ coreTeamAssessTime,
+ signdate,
+ ExpertConclusion,
+ conclusionTime,
+ organcount,
+ operationBegTime,
+ completeTime,
+ regionallevel
+ from v_donationworkflow
</sql>
- <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow" resultMap="VDonationworkflowResult">
+ <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow"
+ resultMap="VDonationworkflowResult">
<include refid="selectVDonationworkflowVo"/>
<where>
- <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="workflow != null "> and workflow = #{workflow}</if>
- <if test="terminationcase != null "> and terminationCase = #{terminationcase}</if>
- <if test="deptid != null "> and deptid = #{deptid}</if>
- <if test="deptname != null and deptname != ''"> and deptname like concat('%', #{deptname}, '%')</if>
- <if test="reporterno != null and reporterno != ''"> and reporterNo = #{reporterno}</if>
- <if test="reportername != null and reportername != ''"> and reporterName like concat('%', #{reportername}, '%')</if>
- <if test="donatetime != null "> and donatetime = #{donatetime}</if>
- <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
- <if test="coreteamassessconclusion != null and coreteamassessconclusion != ''"> and CoreTeamAssessConclusion = #{coreteamassessconclusion}</if>
- <if test="coreteamassesstime != null "> and coreTeamAssessTime = #{coreteamassesstime}</if>
- <if test="signdate != null "> and signdate = #{signdate}</if>
- <if test="expertconclusion != null "> and ExpertConclusion = #{expertconclusion}</if>
- <if test="conclusiontime != null "> and conclusionTime = #{conclusiontime}</if>
- <if test="organcount != null "> and organcount = #{organcount}</if>
- <if test="operationbegtime != null "> and operationBegTime = #{operationbegtime}</if>
- <if test="completetime != null "> and completeTime = #{completetime}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="workflow != null ">and workflow = #{workflow}</if>
+ <if test="terminationcase != null ">and terminationCase = #{terminationcase}</if>
+ <if test="deptid != null ">and deptid = #{deptid}</if>
+ <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
+ <if test="reporterno != null and reporterno != ''">and reporterNo = #{reporterno}</if>
+ <if test="reportername != null and reportername != ''">and reporterName like concat('%', #{reportername},
+ '%')
+ </if>
+ --
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="starttime != null ">and donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and donatetime <= #{endtime}
+ </if>
+ <if test="coreteamassessconclusion != null and coreteamassessconclusion != ''">and CoreTeamAssessConclusion
+ = #{coreteamassessconclusion}
+ </if>
+ <if test="coreteamassesstime != null ">and coreTeamAssessTime = #{coreteamassesstime}</if>
+ <if test="signdate != null ">and signdate = #{signdate}</if>
+ <if test="expertconclusion != null ">and ExpertConclusion = #{expertconclusion}</if>
+ <if test="conclusiontime != null ">and conclusionTime = #{conclusiontime}</if>
+ <if test="organcount != null ">and organcount = #{organcount}</if>
+ <if test="operationbegtime != null ">and operationBegTime = #{operationbegtime}</if>
+ <if test="completetime != null ">and completeTime = #{completetime}</if>
+ <if test="regionallevel != null ">and regionallevel = #{regionallevel}</if>
</where>
</select>
--
Gitblit v1.9.3