suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

Browse Source
This commit is contained in:
苏竹红
2023-07-20 16:51:34 +08:00
parent f3e46c281e 35dc22f8f1
commit f6006afcb1
4 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
View File

@@ -3,20 +3,20 @@
<mapper namespace="com.cool.store.mapper.HyInspectionMapper"> <mapper namespace="com.cool.store.mapper.HyInspectionMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspectionDO"> <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspectionDO">
<constructor> <constructor>
<idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" /> <idArg column="id" javaType="java.lang.Long" />
<arg column="interview_plan_id" javaType="java.lang.Long" jdbcType="BIGINT" /> <arg column="interview_plan_id" javaType="java.lang.Long" />
<arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="operator_user_id" javaType="java.lang.String" />
<arg column="type" javaType="java.lang.Integer" jdbcType="TINYINT" /> <arg column="type" javaType="java.lang.Integer" />
<arg column="status" javaType="java.lang.Integer" jdbcType="TINYINT" /> <arg column="status" javaType="java.lang.Integer" />
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="files" javaType="java.lang.String" />
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="description" javaType="java.lang.String" />
<arg column="inspection_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="inspection_time" javaType="java.lang.String" />
<arg column="creator" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="creator" javaType="java.lang.String" />
<arg column="updator" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="updator" javaType="java.lang.String" />
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="remark" javaType="java.lang.String" />
<arg column="deleted" javaType="java.lang.Boolean" jdbcType="BIT" /> <arg column="deleted" javaType="java.lang.Boolean" />
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="create_time" javaType="java.lang.String" />
<arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="update_time" javaType="java.lang.String" />
</constructor> </constructor>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@@ -51,11 +51,11 @@
description, inspection_time, creator, description, inspection_time, creator,
updator, remark, deleted, updator, remark, deleted,
create_time, update_time) create_time, update_time)
values (#{id}, #{interviewPlanId}, #{operatorUserId,jdbcType=VARCHAR}, values (#{id}, #{interviewPlanId}, #{operatorUserId},
#{type,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{files,jdbcType=VARCHAR}, #{type}, #{status}, #{files},
#{description,jdbcType=VARCHAR}, #{inspectionTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{description}, #{inspectionTime}, #{creator},
#{updator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, #{updator}, #{remark}, #{deleted},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) #{createTime}, #{updateTime})
</insert> </insert>
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInspectionDO"> <insert id="insertSelective" parameterType="com.cool.store.entity.HyInspectionDO">
insert into hy_inspection insert into hy_inspection
@@ -111,40 +111,40 @@
#{interviewPlanId}, #{interviewPlanId},
</if> </if>
<if test="operatorUserId != null"> <if test="operatorUserId != null">
#{operatorUserId,jdbcType=VARCHAR}, #{operatorUserId},
</if> </if>
<if test="type != null"> <if test="type != null">
#{type,jdbcType=TINYINT}, #{type},
</if> </if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=TINYINT}, #{status},
</if> </if>
<if test="files != null"> <if test="files != null">
#{files,jdbcType=VARCHAR}, #{files},
</if> </if>
<if test="description != null"> <if test="description != null">
#{description,jdbcType=VARCHAR}, #{description},
</if> </if>
<if test="inspectionTime != null"> <if test="inspectionTime != null">
#{inspectionTime,jdbcType=TIMESTAMP}, #{inspectionTime},
</if> </if>
<if test="creator != null"> <if test="creator != null">
#{creator,jdbcType=VARCHAR}, #{creator},
</if> </if>
<if test="updator != null"> <if test="updator != null">
#{updator,jdbcType=VARCHAR}, #{updator},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark},
</if> </if>
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime},
</if> </if>
</trim> </trim>
</insert> </insert>
@@ -155,40 +155,40 @@
interview_plan_id = #{interviewPlanId}, interview_plan_id = #{interviewPlanId},
</if> </if>
<if test="operatorUserId != null"> <if test="operatorUserId != null">
operator_user_id = #{operatorUserId,jdbcType=VARCHAR}, operator_user_id = #{operatorUserId},
</if> </if>
<if test="type != null"> <if test="type != null">
type = #{type,jdbcType=TINYINT}, type = #{type},
</if> </if>
<if test="status != null"> <if test="status != null">
status = #{status,jdbcType=TINYINT}, status = #{status},
</if> </if>
<if test="files != null"> <if test="files != null">
files = #{files,jdbcType=VARCHAR}, files = #{files},
</if> </if>
<if test="description != null"> <if test="description != null">
description = #{description,jdbcType=VARCHAR}, description = #{description},
</if> </if>
<if test="inspectionTime != null"> <if test="inspectionTime != null">
inspection_time = #{inspectionTime,jdbcType=TIMESTAMP}, inspection_time = #{inspectionTime},
</if> </if>
<if test="creator != null"> <if test="creator != null">
creator = #{creator,jdbcType=VARCHAR}, creator = #{creator},
</if> </if>
<if test="updator != null"> <if test="updator != null">
updator = #{updator,jdbcType=VARCHAR}, updator = #{updator},
</if> </if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark},
</if> </if>
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime},
</if> </if>
</set> </set>
where id = #{id} where id = #{id}
@@ -196,18 +196,18 @@
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspectionDO"> <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspectionDO">
update hy_inspection update hy_inspection
set interview_plan_id = #{interviewPlanId}, set interview_plan_id = #{interviewPlanId},
operator_user_id = #{operatorUserId,jdbcType=VARCHAR}, operator_user_id = #{operatorUserId},
type = #{type,jdbcType=TINYINT}, type = #{type},
status = #{status,jdbcType=TINYINT}, status = #{status},
files = #{files,jdbcType=VARCHAR}, files = #{files},
description = #{description,jdbcType=VARCHAR}, description = #{description},
inspection_time = #{inspectionTime,jdbcType=TIMESTAMP}, inspection_time = #{inspectionTime},
creator = #{creator,jdbcType=VARCHAR}, creator = #{creator},
updator = #{updator,jdbcType=VARCHAR}, updator = #{updator},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark},
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime},
update_time = #{updateTime,jdbcType=TIMESTAMP} update_time = #{updateTime}
where id = #{id} where id = #{id}
</update> </update>
</mapper> </mapper>

92
coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
View File

@@ -3,16 +3,16 @@
<mapper namespace="com.cool.store.mapper.HyInterviewInspectionLogMapper"> <mapper namespace="com.cool.store.mapper.HyInterviewInspectionLogMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLogDO"> <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLogDO">
<constructor> <constructor>
<idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" /> <idArg column="id" javaType="java.lang.Long" />
<arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="operator_user_id" javaType="java.lang.String" />
<arg column="inspection_id" javaType="java.lang.Long" jdbcType="BIGINT" /> <arg column="inspection_id" javaType="java.lang.Long" />
<arg column="operation_type" javaType="java.lang.Byte" jdbcType="TINYINT" /> <arg column="operation_type" javaType="java.lang.Byte" />
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="description" javaType="java.lang.String" />
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="files" javaType="java.lang.String" />
<arg column="operation_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="operation_time" javaType="java.lang.String" />
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" /> <arg column="remark" javaType="java.lang.String" />
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="create_time" javaType="java.lang.String" />
<arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" /> <arg column="update_time" javaType="java.lang.String" />
</constructor> </constructor>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@@ -23,21 +23,21 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from hy_interview_inspection_log from hy_interview_inspection_log
where id = #{id,jdbcType=BIGINT} where id = #{id}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from hy_interview_inspection_log delete from hy_interview_inspection_log
where id = #{id,jdbcType=BIGINT} where id = #{id}
</delete> </delete>
<insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO"> <insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
insert into hy_interview_inspection_log (id, operator_user_id, inspection_id, insert into hy_interview_inspection_log (id, operator_user_id, inspection_id,
operation_type, description, files, operation_type, description, files,
operation_time, remark, create_time, operation_time, remark, create_time,
update_time) update_time)
values (#{id,jdbcType=BIGINT}, #{operatorUserId,jdbcType=VARCHAR}, #{inspectionId,jdbcType=BIGINT}, values (#{id}, #{operatorUserId}, #{inspectionId},
#{operationType,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, #{files,jdbcType=VARCHAR}, #{operationType}, #{description}, #{files},
#{operationTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{operationTime}, #{remark}, #{createTime},
#{updateTime,jdbcType=TIMESTAMP}) #{updateTime})
</insert> </insert>
<insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO"> <insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
insert into hy_interview_inspection_log insert into hy_interview_inspection_log
@@ -75,34 +75,34 @@
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
#{id,jdbcType=BIGINT}, #{id},
</if> </if>
<if test="operatorUserId != null"> <if test="operatorUserId != null">
#{operatorUserId,jdbcType=VARCHAR}, #{operatorUserId},
</if> </if>
<if test="inspectionId != null"> <if test="inspectionId != null">
#{inspectionId,jdbcType=BIGINT}, #{inspectionId},
</if> </if>
<if test="operationType != null"> <if test="operationType != null">
#{operationType,jdbcType=TINYINT}, #{operationType},
</if> </if>
<if test="description != null"> <if test="description != null">
#{description,jdbcType=VARCHAR}, #{description},
</if> </if>
<if test="files != null"> <if test="files != null">
#{files,jdbcType=VARCHAR}, #{files},
</if> </if>
<if test="operationTime != null"> <if test="operationTime != null">
#{operationTime,jdbcType=TIMESTAMP}, #{operationTime},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime},
</if> </if>
</trim> </trim>
</insert> </insert>
@@ -110,46 +110,46 @@
update hy_interview_inspection_log update hy_interview_inspection_log
<set> <set>
<if test="operatorUserId != null"> <if test="operatorUserId != null">
operator_user_id = #{operatorUserId,jdbcType=VARCHAR}, operator_user_id = #{operatorUserId},
</if> </if>
<if test="inspectionId != null"> <if test="inspectionId != null">
inspection_id = #{inspectionId,jdbcType=BIGINT}, inspection_id = #{inspectionId},
</if> </if>
<if test="operationType != null"> <if test="operationType != null">
operation_type = #{operationType,jdbcType=TINYINT}, operation_type = #{operationType},
</if> </if>
<if test="description != null"> <if test="description != null">
description = #{description,jdbcType=VARCHAR}, description = #{description},
</if> </if>
<if test="files != null"> <if test="files != null">
files = #{files,jdbcType=VARCHAR}, files = #{files},
</if> </if>
<if test="operationTime != null"> <if test="operationTime != null">
operation_time = #{operationTime,jdbcType=TIMESTAMP}, operation_time = #{operationTime},
</if> </if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO"> <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
update hy_interview_inspection_log update hy_interview_inspection_log
set operator_user_id = #{operatorUserId,jdbcType=VARCHAR}, set operator_user_id = #{operatorUserId},
inspection_id = #{inspectionId,jdbcType=BIGINT}, inspection_id = #{inspectionId},
operation_type = #{operationType,jdbcType=TINYINT}, operation_type = #{operationType},
description = #{description,jdbcType=VARCHAR}, description = #{description},
files = #{files,jdbcType=VARCHAR}, files = #{files},
operation_time = #{operationTime,jdbcType=TIMESTAMP}, operation_time = #{operationTime},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime},
update_time = #{updateTime,jdbcType=TIMESTAMP} update_time = #{updateTime}
where id = #{id,jdbcType=BIGINT} where id = #{id}
</update> </update>
</mapper> </mapper>

2
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
View File

@@ -98,7 +98,7 @@ public class InterviewVO {
private Integer status; private Integer status;
@ApiModelProperty(value = "面试过程信息视频URL数组", required = true) @ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
private List<String> vedioList; private List<String> videoList;
@ApiModelProperty(value = "面试过程信息未解析String", required = false) @ApiModelProperty(value = "面试过程信息未解析String", required = false)
private String processInfo; private String processInfo;

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
View File

@@ -123,7 +123,7 @@ public class InterviewServiceImpl implements InterviewService {
//将 processInfo 解析为 List //将 processInfo 解析为 List
if (!StringUtils.isEmpty(vo.getProcessInfo())) { if (!StringUtils.isEmpty(vo.getProcessInfo())) {
List<String> split = Arrays.asList(vo.getProcessInfo().split(",")); List<String> split = Arrays.asList(vo.getProcessInfo().split(","));
vo.setVedioList(split); vo.setVideoList(split);
vo.setProcessInfo(""); vo.setProcessInfo("");
} }
//查询面试官和记录人信息（面试官必须有） //查询面试官和记录人信息（面试官必须有）