From ec5a6ede3f88abebdf7a280744ea762757f310aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml | 67 ++++++++++-----------------------
1 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
index 11aedde..a0cb132 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
@@ -2,53 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckResultMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckResultVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="unit_name" property="checkUnitName" />
- <result column="examine_name" property="examineName" />
- <result column="check_score" property="checkScore" />
- <result column="system_score" property="systemScore" />
- <result column="manual_score" property="manualScore" />
- <result column="check_time" property="checkTime" />
- <result column="frequency" property="frequency" />
- <result column="examine_range" property="examineRange" />
- <result column="publish" property="publish" />
- </resultMap>
- <select id="page" resultMap="BaseResultMap">
- SELECT
- tcr.id,
- tyu.unit_name,
- tcp.examine_name,
- tcp.examine_range,
- tcp.frequency,
- tcr.check_time,
- tcr.check_score,
- tcr.system_score,
- tcr.manual_score,
- tcr.publish
- FROM
- t_check_result tcr
- INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id
- INNER JOIN t_yw_unit tyu ON tcr.check_unit_id = tyu.id
- <where>
- AND tcr.deleted = 0
- <if test="query.checkUnitName != null and query.checkUnitName != ''">
- AND tyu.unit_name like concat('%', #{query.checkUnitName}, '%')
- </if>
- <if test="query.frequency != null and query.frequency != ''">
- AND tcp.frequency = #{query.frequency}
- </if>
- <if test="query.frequency != null and query.frequency != ''">
- AND tcp.examine_range = #{query.examineRange}
- </if>
- <if test="query.start != null and query.end != null">
- AND tcr.check_time BETWEEN #{query.start} AND #{query.end}
- </if>
- </where>
+ <select id="selectCheckResultList" resultType="com.ycl.platform.domain.vo.CheckResultVO">
+ SELECT c.*,
+ u.unit_name AS unitName,
+ ct.name AS contractName
+ FROM t_contract_result c
+ LEFT JOIN
+ t_yw_unit u ON c.unit_id = u.id and u.deleted = '0'
+ LEFT JOIN
+ t_contract ct ON c.contract_id = ct.id and ct.deleted = '0'
+ where
+ c.deleted = '0'
+ <if test="unitId != null">
+ AND c.unit_id = #{unitId}
+ </if>
+ <if test="createStartTime != null">
+ AND c.check_time BETWEEN #{createStartTime} AND #{createEndTime}
+ </if>
+ <if test="publish != null">
+ AND c.publish = #{publish}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0