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

2023-07-20 16:51:34 +08:00
parent f3e46c281e 35dc22f8f1
commit f6006afcb1
4 changed files with 103 additions and 103 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
@@ -3,20 +3,20 @@
 <mapper namespace="com.cool.store.mapper.HyInspectionMapper">
  <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspectionDO">
    <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.Integer" jdbcType="TINYINT" />
-      <arg column="status" javaType="java.lang.Integer" 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.lang.String" 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.lang.String" jdbcType="TIMESTAMP" />
+      <idArg column="id" javaType="java.lang.Long" />
+      <arg column="interview_plan_id" javaType="java.lang.Long" />
+      <arg column="operator_user_id" javaType="java.lang.String" />
+      <arg column="type" javaType="java.lang.Integer" />
+      <arg column="status" javaType="java.lang.Integer" />
+      <arg column="files" javaType="java.lang.String" />
+      <arg column="description" javaType="java.lang.String" />
+      <arg column="inspection_time" javaType="java.lang.String" />
+      <arg column="creator" javaType="java.lang.String" />
+      <arg column="updator" javaType="java.lang.String" />
+      <arg column="remark" javaType="java.lang.String" />
+      <arg column="deleted" javaType="java.lang.Boolean" />
+      <arg column="create_time" javaType="java.lang.String" />
+      <arg column="update_time" javaType="java.lang.String" />
    </constructor>
  </resultMap>
  <sql id="Base_Column_List">
@@ -51,11 +51,11 @@
      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})
+    values (#{id}, #{interviewPlanId}, #{operatorUserId}, 
+      #{type}, #{status}, #{files}, 
+      #{description}, #{inspectionTime}, #{creator}, 
+      #{updator}, #{remark}, #{deleted}, 
+      #{createTime}, #{updateTime})
  </insert>
  <insert id="insertSelective" parameterType="com.cool.store.entity.HyInspectionDO">
    insert into hy_inspection
@@ -111,40 +111,40 @@
        #{interviewPlanId},
      </if>
      <if test="operatorUserId != null">
-        #{operatorUserId,jdbcType=VARCHAR},
+        #{operatorUserId},
      </if>
      <if test="type != null">
-        #{type,jdbcType=TINYINT},
+        #{type},
      </if>
      <if test="status != null">
-        #{status,jdbcType=TINYINT},
+        #{status},
      </if>
      <if test="files != null">
-        #{files,jdbcType=VARCHAR},
+        #{files},
      </if>
      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
+        #{description},
      </if>
      <if test="inspectionTime != null">
-        #{inspectionTime,jdbcType=TIMESTAMP},
+        #{inspectionTime},
      </if>
      <if test="creator != null">
-        #{creator,jdbcType=VARCHAR},
+        #{creator},
      </if>
      <if test="updator != null">
-        #{updator,jdbcType=VARCHAR},
+        #{updator},
      </if>
      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
+        #{remark},
      </if>
      <if test="deleted != null">
-        #{deleted,jdbcType=BIT},
+        #{deleted},
      </if>
      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+        #{createTime},
      </if>
      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
+        #{updateTime},
      </if>
    </trim>
  </insert>
@@ -155,40 +155,40 @@
        interview_plan_id = #{interviewPlanId},
      </if>
      <if test="operatorUserId != null">
-        operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
+        operator_user_id = #{operatorUserId},
      </if>
      <if test="type != null">
-        type = #{type,jdbcType=TINYINT},
+        type = #{type},
      </if>
      <if test="status != null">
-        status = #{status,jdbcType=TINYINT},
+        status = #{status},
      </if>
      <if test="files != null">
-        files = #{files,jdbcType=VARCHAR},
+        files = #{files},
      </if>
      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
+        description = #{description},
      </if>
      <if test="inspectionTime != null">
-        inspection_time = #{inspectionTime,jdbcType=TIMESTAMP},
+        inspection_time = #{inspectionTime},
      </if>
      <if test="creator != null">
-        creator = #{creator,jdbcType=VARCHAR},
+        creator = #{creator},
      </if>
      <if test="updator != null">
-        updator = #{updator,jdbcType=VARCHAR},
+        updator = #{updator},
      </if>
      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
+        remark = #{remark},
      </if>
      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=BIT},
+        deleted = #{deleted},
      </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}
@@ -196,18 +196,18 @@
  <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspectionDO">
    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}
+      operator_user_id = #{operatorUserId},
+      type = #{type},
+      status = #{status},
+      files = #{files},
+      description = #{description},
+      inspection_time = #{inspectionTime},
+      creator = #{creator},
+      updator = #{updator},
+      remark = #{remark},
+      deleted = #{deleted},
+      create_time = #{createTime},
+      update_time = #{updateTime}
    where id = #{id}
  </update>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
@@ -3,16 +3,16 @@
 <mapper namespace="com.cool.store.mapper.HyInterviewInspectionLogMapper">
  <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,21 +23,21 @@
    select 
    <include refid="Base_Column_List" />
    from hy_interview_inspection_log
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id}
  </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.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.HyInterviewInspectionLogDO">
    insert into hy_interview_inspection_log
@@ -75,34 +75,34 @@
    </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>
@@ -110,46 +110,46 @@
    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.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>
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
@@ -98,7 +98,7 @@ public class InterviewVO {
    private Integer status;

    @ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
-    private List<String> vedioList;
+    private List<String> videoList;

    @ApiModelProperty(value = "面试过程信息未解析String", required = false)
    private String processInfo;
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -123,7 +123,7 @@ public class InterviewServiceImpl implements InterviewService {
        //将 processInfo 解析为 List
        if (!StringUtils.isEmpty(vo.getProcessInfo())) {
            List<String> split = Arrays.asList(vo.getProcessInfo().split(","));
-            vo.setVedioList(split);
+            vo.setVideoList(split);
            vo.setProcessInfo("");
        }
        //查询面试官和记录人信息（面试官必须有）