Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727
This commit is contained in:
@@ -0,0 +1,201 @@
|
||||
<?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.HyInspectionMapper">
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspection">
|
||||
<constructor>
|
||||
<idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" />
|
||||
<arg column="interview_plan_id" javaType="java.lang.Long" jdbcType="BIGINT" />
|
||||
<arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="type" javaType="java.lang.Byte" jdbcType="TINYINT" />
|
||||
<arg column="status" javaType="java.lang.Byte" jdbcType="TINYINT" />
|
||||
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="inspection_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
|
||||
<arg column="creator" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="updator" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="deleted" javaType="java.lang.Boolean" jdbcType="BIT" />
|
||||
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
|
||||
<arg column="update_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
|
||||
</constructor>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
id, interview_plan_id, operator_user_id, type, status, files, description, inspection_time,
|
||||
creator, updator, remark, deleted, create_time, update_time
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from hy_inspection
|
||||
where id = #{id}
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete from hy_inspection
|
||||
where id = #{id}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.cool.store.entity.HyInspection">
|
||||
insert into hy_inspection (id, interview_plan_id, operator_user_id,
|
||||
type, status, files,
|
||||
description, inspection_time, creator,
|
||||
updator, remark, deleted,
|
||||
create_time, update_time)
|
||||
values (#{id}, #{interviewPlanId}, #{operatorUserId,jdbcType=VARCHAR},
|
||||
#{type,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{files,jdbcType=VARCHAR},
|
||||
#{description,jdbcType=VARCHAR}, #{inspectionTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR},
|
||||
#{updator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT},
|
||||
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInspection">
|
||||
insert into hy_inspection
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
id,
|
||||
</if>
|
||||
<if test="interviewPlanId != null">
|
||||
interview_plan_id,
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
operator_user_id,
|
||||
</if>
|
||||
<if test="type != null">
|
||||
type,
|
||||
</if>
|
||||
<if test="status != null">
|
||||
status,
|
||||
</if>
|
||||
<if test="files != null">
|
||||
files,
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description,
|
||||
</if>
|
||||
<if test="inspectionTime != null">
|
||||
inspection_time,
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
creator,
|
||||
</if>
|
||||
<if test="updator != null">
|
||||
updator,
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark,
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
#{id},
|
||||
</if>
|
||||
<if test="interviewPlanId != null">
|
||||
#{interviewPlanId},
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
#{operatorUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="type != null">
|
||||
#{type,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
#{status,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
#{files,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
#{description,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="inspectionTime != null">
|
||||
#{inspectionTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
#{creator,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updator != null">
|
||||
#{updator,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
#{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
#{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInspection">
|
||||
update hy_inspection
|
||||
<set>
|
||||
<if test="interviewPlanId != null">
|
||||
interview_plan_id = #{interviewPlanId},
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="type != null">
|
||||
type = #{type,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
status = #{status,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
files = #{files,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="inspectionTime != null">
|
||||
inspection_time = #{inspectionTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
creator = #{creator,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updator != null">
|
||||
updator = #{updator,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted = #{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspection">
|
||||
update hy_inspection
|
||||
set interview_plan_id = #{interviewPlanId},
|
||||
operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
|
||||
type = #{type,jdbcType=TINYINT},
|
||||
status = #{status,jdbcType=TINYINT},
|
||||
files = #{files,jdbcType=VARCHAR},
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
inspection_time = #{inspectionTime,jdbcType=TIMESTAMP},
|
||||
creator = #{creator,jdbcType=VARCHAR},
|
||||
updator = #{updator,jdbcType=VARCHAR},
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
deleted = #{deleted,jdbcType=BIT},
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP}
|
||||
where id = #{id}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -3,7 +3,7 @@
|
||||
<mapper namespace="com.cool.store.mapper.HyIntendDevelopementMappingMapper">
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyIntendDevelopementMappingDO">
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="mapping_id" jdbcType="VARCHAR" property="mappingId" />
|
||||
<result column="mapping_id" jdbcType="BIGINT" property="mappingId" />
|
||||
<result column="open_area_mapping_id" jdbcType="VARCHAR" property="openAreaMappingId" />
|
||||
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
<?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">
|
||||
<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.time.LocalDateTime" 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.time.LocalDateTime" jdbcType="TIMESTAMP" />
|
||||
</constructor>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
id, operator_user_id, inspection_id, operation_type, description, files, operation_time,
|
||||
remark, create_time, update_time
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from hy_interview_inspection_log
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete from hy_interview_inspection_log
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
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})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
insert into hy_interview_inspection_log
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
id,
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
operator_user_id,
|
||||
</if>
|
||||
<if test="inspectionId != null">
|
||||
inspection_id,
|
||||
</if>
|
||||
<if test="operationType != null">
|
||||
operation_type,
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description,
|
||||
</if>
|
||||
<if test="files != null">
|
||||
files,
|
||||
</if>
|
||||
<if test="operationTime != null">
|
||||
operation_time,
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
#{id,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="operatorUserId != null">
|
||||
#{operatorUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="inspectionId != null">
|
||||
#{inspectionId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="operationType != null">
|
||||
#{operationType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
#{description,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
#{files,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="operationTime != null">
|
||||
#{operationTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
#{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
update hy_interview_inspection_log
|
||||
<set>
|
||||
<if test="operatorUserId != null">
|
||||
operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="inspectionId != null">
|
||||
inspection_id = #{inspectionId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="operationType != null">
|
||||
operation_type = #{operationType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="files != null">
|
||||
files = #{files,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="operationTime != null">
|
||||
operation_time = #{operationTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
|
||||
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}
|
||||
</update>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user