From 7a7dbbd34179b79caf3b74dedf2d5b84f30d0c05 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 26 四月 2024 11:13:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml similarity index 82% rename from ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml rename to ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml index 687461b..83e5b33 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml @@ -2,13 +2,13 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.ycl.platform.mapper.DefaultResultMapper"> - - <resultMap type="com.ycl.platform.domain.entity.DefaultResult" id="DefaultResultResult"> +<mapper namespace="com.ycl.platform.mapper.ContractResultMapper"> + + <resultMap type="com.ycl.platform.domain.entity.ContractResult" id="DefaultResultResult"> <result property="id" column="id" /> <result property="unitId" column="unit_id" /> <result property="publishId" column="publish_id" /> - <result property="defaultScore" column="default_score" /> + <result property="contractScore" column="default_score" /> <result property="auditState" column="audit_state" /> <result property="publish" column="publish" /> <result property="checkTime" column="check_time" /> @@ -17,12 +17,12 @@ </resultMap> <sql id="selectDefaultResultVo"> - select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_default_result + select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_contract_result </sql> <select id="selectDefaultResultList" resultMap="DefaultResultResult"> <include refid="selectDefaultResultVo"/> - <where> + <where> <if test="unitId != null "> and unit_id = #{unitId}</if> <if test="publishId != null "> and publish_id = #{publishId}</if> <if test="auditState != null "> and audit_state = #{auditState}</if> @@ -30,18 +30,18 @@ <if test="checkTime != null "> and check_time = #{checkTime}</if> </where> </select> - + <select id="selectDefaultResultById" resultMap="DefaultResultResult"> <include refid="selectDefaultResultVo"/> where id = #{id} </select> - + <insert id="insertDefaultResult" useGeneratedKeys="true" keyProperty="id"> - insert into t_default_result + insert into t_contract_result <trim prefix="(" suffix=")" suffixOverrides=","> <if test="unitId != null">unit_id,</if> <if test="publishId != null">publish_id,</if> - <if test="defaultScore != null">default_score,</if> + <if test="contractScore != null">default_score,</if> <if test="auditState != null">audit_state,</if> <if test="publish != null">publish,</if> <if test="checkTime != null">check_time,</if> @@ -51,7 +51,7 @@ <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="unitId != null">#{unitId},</if> <if test="publishId != null">#{publishId},</if> - <if test="defaultScore != null">#{defaultScore},</if> + <if test="contractScore != null">#{contractScore},</if> <if test="auditState != null">#{auditState},</if> <if test="publish != null">#{publish},</if> <if test="checkTime != null">#{checkTime},</if> @@ -61,11 +61,11 @@ </insert> <update id="updateDefaultResult" > - update t_default_result + update t_contract_result <trim prefix="SET" suffixOverrides=","> <if test="unitId != null">unit_id = #{unitId},</if> <if test="publishId != null">publish_id = #{publishId},</if> - <if test="defaultScore != null">default_score = #{defaultScore},</if> + <if test="contractScore != null">default_score = #{contractScore},</if> <if test="auditState != null">audit_state = #{auditState},</if> <if test="publish != null">publish = #{publish},</if> <if test="checkTime != null">check_time = #{checkTime},</if> @@ -76,13 +76,13 @@ </update> <delete id="deleteDefaultResultById"> - delete from t_default_result where id = #{id} + delete from t_contract_result where id = #{id} </delete> <delete id="deleteDefaultResultByIds" > - delete from t_default_result where id in + delete from t_contract_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