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 | 107 +++++++++++------------------------------------------
1 files changed, 23 insertions(+), 84 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
index 752da17..a0cb132 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
@@ -1,88 +1,27 @@
-<?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">
+<?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.ycl.platform.mapper.CheckResultMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.CheckResult" id="CheckResultResult">
- <result property="id" column="id" />
- <result property="deptId" column="dept_id" />
- <result property="publishId" column="publish_id" />
- <result property="examineCategory" column="examine_category" />
- <result property="checkScore" column="check_score" />
- <result property="publish" column="publish" />
- <result property="checkTime" column="check_time" />
- <result property="updateTime" column="update_time" />
- <result property="deleted" column="deleted" />
- </resultMap>
- <sql id="selectCheckResultVo">
- select id, dept_id, publish_id, examine_category, check_score, publish, check_time, update_time, deleted from t_check_result
- </sql>
- <select id="selectCheckResultList" resultMap="CheckResultResult">
- <include refid="selectCheckResultVo"/>
- <where>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
- <if test="publishId != null "> and publish_id = #{publishId}</if>
- <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
- <if test="publish != null "> and publish = #{publish}</if>
- <if test="checkTime != null "> and check_time = #{checkTime}</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>
-
- <select id="selectCheckResultById" resultMap="CheckResultResult">
- <include refid="selectCheckResultVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertCheckResult" useGeneratedKeys="true" keyProperty="id">
- insert into t_check_result
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="deptId != null">dept_id,</if>
- <if test="publishId != null">publish_id,</if>
- <if test="examineCategory != null">examine_category,</if>
- <if test="checkScore != null">check_score,</if>
- <if test="publish != null">publish,</if>
- <if test="checkTime != null">check_time,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="deleted != null">deleted,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="deptId != null">#{deptId},</if>
- <if test="publishId != null">#{publishId},</if>
- <if test="examineCategory != null">#{examineCategory},</if>
- <if test="checkScore != null">#{checkScore},</if>
- <if test="publish != null">#{publish},</if>
- <if test="checkTime != null">#{checkTime},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="deleted != null">#{deleted},</if>
- </trim>
- </insert>
-
- <update id="updateCheckResult" >
- update t_check_result
- <trim prefix="SET" suffixOverrides=",">
- <if test="deptId != null">dept_id = #{deptId},</if>
- <if test="publishId != null">publish_id = #{publishId},</if>
- <if test="examineCategory != null">examine_category = #{examineCategory},</if>
- <if test="checkScore != null">check_score = #{checkScore},</if>
- <if test="publish != null">publish = #{publish},</if>
- <if test="checkTime != null">check_time = #{checkTime},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="deleted != null">deleted = #{deleted},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteCheckResultById" >
- delete from t_check_result where id = #{id}
- </delete>
-
- <delete id="deleteCheckResultByIds" >
- delete from t_check_result where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0