Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect
# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java
This commit is contained in:
xiaodong.hu
@@ -1,18 +1,18 @@
|
||||
<?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.cool.store.mapper.HyInterviewInspectionLogMapper">
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLogDO">
|
||||
<constructor>
|
||||
<idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" />
|
||||
<arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="inspection_id" javaType="java.lang.Long" jdbcType="BIGINT" />
|
||||
<arg column="operation_type" javaType="java.lang.Byte" jdbcType="TINYINT" />
|
||||
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="operation_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
|
||||
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
|
||||
<arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
|
||||
<idArg column="id" javaType="java.lang.Long" />
|
||||
<arg column="operator_user_id" javaType="java.lang.String" />
|
||||
<arg column="inspection_id" javaType="java.lang.Long" />
|
||||
<arg column="operation_type" javaType="java.lang.Byte" />
|
||||
<arg column="description" javaType="java.lang.String" />
|
||||
<arg column="files" javaType="java.lang.String" />
|
||||
<arg column="operation_time" javaType="java.lang.String" />
|
||||
<arg column="remark" javaType="java.lang.String" />
|
||||
<arg column="create_time" javaType="java.lang.String" />
|
||||
<arg column="update_time" javaType="java.lang.String" />
|
||||
</constructor>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
@@ -23,7 +23,7 @@
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from hy_interview_inspection_log
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
where id = #{id}
|
||||
</select>
|
||||
<select id="interviewInspectionGetHistoryDetail" resultType="com.cool.store.vo.interview.InterviewInspectionHistoryInfo">
|
||||
SELECT a.id, b.`name` as auditorName, b.mobile as auditorMobile,operation_time as inspectionTime, operation_type as operationType ,description,files as filesStr
|
||||
@@ -31,19 +31,19 @@
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete from hy_interview_inspection_log
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
where id = #{id}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
<insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
|
||||
insert into hy_interview_inspection_log (id, operator_user_id, inspection_id,
|
||||
operation_type, description, files,
|
||||
operation_time, remark, create_time,
|
||||
update_time)
|
||||
values (#{id,jdbcType=BIGINT}, #{operatorUserId,jdbcType=VARCHAR}, #{inspectionId,jdbcType=BIGINT},
|
||||
#{operationType,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, #{files,jdbcType=VARCHAR},
|
||||
#{operationTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
|
||||
#{updateTime,jdbcType=TIMESTAMP})
|
||||
values (#{id}, #{operatorUserId}, #{inspectionId},
|
||||
#{operationType}, #{description}, #{files},
|
||||
#{operationTime}, #{remark}, #{createTime},
|
||||
#{updateTime})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
|
||||
insert into hy_interview_inspection_log
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
@@ -79,81 +79,81 @@
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
#{id,jdbcType=BIGINT},
|
||||
#{id},
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
#{operatorUserId,jdbcType=VARCHAR},
|
||||
#{operatorUserId},
|
||||
</if>
|
||||
<if test="inspectionId != null">
|
||||
#{inspectionId,jdbcType=BIGINT},
|
||||
#{inspectionId},
|
||||
</if>
|
||||
<if test="operationType != null">
|
||||
#{operationType,jdbcType=TINYINT},
|
||||
#{operationType},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
#{description,jdbcType=VARCHAR},
|
||||
#{description},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
#{files,jdbcType=VARCHAR},
|
||||
#{files},
|
||||
</if>
|
||||
<if test="operationTime != null">
|
||||
#{operationTime,jdbcType=TIMESTAMP},
|
||||
#{operationTime},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
#{remark,jdbcType=VARCHAR},
|
||||
#{remark},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{createTime},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
#{updateTime},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
|
||||
update hy_interview_inspection_log
|
||||
<set>
|
||||
<if test="operatorUserId != null">
|
||||
operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
|
||||
operator_user_id = #{operatorUserId},
|
||||
</if>
|
||||
<if test="inspectionId != null">
|
||||
inspection_id = #{inspectionId,jdbcType=BIGINT},
|
||||
inspection_id = #{inspectionId},
|
||||
</if>
|
||||
<if test="operationType != null">
|
||||
operation_type = #{operationType,jdbcType=TINYINT},
|
||||
operation_type = #{operationType},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
description = #{description},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
files = #{files,jdbcType=VARCHAR},
|
||||
files = #{files},
|
||||
</if>
|
||||
<if test="operationTime != null">
|
||||
operation_time = #{operationTime,jdbcType=TIMESTAMP},
|
||||
operation_time = #{operationTime},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
remark = #{remark},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
create_time = #{createTime},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
update_time = #{updateTime},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
where id = #{id}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
|
||||
update hy_interview_inspection_log
|
||||
set operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
|
||||
inspection_id = #{inspectionId,jdbcType=BIGINT},
|
||||
operation_type = #{operationType,jdbcType=TINYINT},
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
files = #{files,jdbcType=VARCHAR},
|
||||
operation_time = #{operationTime,jdbcType=TIMESTAMP},
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP}
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
set operator_user_id = #{operatorUserId},
|
||||
inspection_id = #{inspectionId},
|
||||
operation_type = #{operationType},
|
||||
description = #{description},
|
||||
files = #{files},
|
||||
operation_time = #{operationTime},
|
||||
remark = #{remark},
|
||||
create_time = #{createTime},
|
||||
update_time = #{updateTime}
|
||||
where id = #{id}
|
||||
</update>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user