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

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

Browse Source
This commit is contained in:
zhangchenbiao
2023-07-20 16:16:55 +08:00
parent 2c77668631 8d25552041
commit e03e59f51c
10 changed files with 157 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java
View File

@@ -1,6 +1,6 @@
package com.cool.store.mapper;
import com.cool.store.entity.HyInspection;
import com.cool.store.entity.HyInspectionDO;
import com.cool.store.request.GetInterviewInspectionListReq;
import com.cool.store.request.GetInterviewInspectionResultListReq;
import com.cool.store.vo.interview.InterviewInspectionHistoryInfo;
@@ -16,15 +16,15 @@ import java.util.List;
public interface HyInspectionMapper {
int deleteByPrimaryKey(Long id);
int insert(HyInspection record);
int insert(HyInspectionDO record);
int insertSelective(HyInspection record);
int insertSelective(HyInspectionDO record);
HyInspection selectByPrimaryKey(Long id);
HyInspectionDO selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(HyInspection record);
int updateByPrimaryKeySelective(HyInspectionDO record);
int updateByPrimaryKey(HyInspection record);
int updateByPrimaryKey(HyInspectionDO record);
List<InterviewInspectionVO> interviewInspectionGetList(GetInterviewInspectionListReq request);

12
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java
View File

@@ -1,19 +1,19 @@
package com.cool.store.mapper;
import com.cool.store.entity.HyInterviewInspectionLog;
import com.cool.store.entity.HyInterviewInspectionLogDO;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface HyInterviewInspectionLogMapper {
int deleteByPrimaryKey(Long id);
int insert(HyInterviewInspectionLog record);
int insert(HyInterviewInspectionLogDO record);
int insertSelective(HyInterviewInspectionLog record);
int insertSelective(HyInterviewInspectionLogDO record);
HyInterviewInspectionLog selectByPrimaryKey(Long id);
HyInterviewInspectionLogDO selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(HyInterviewInspectionLog record);
int updateByPrimaryKeySelective(HyInterviewInspectionLogDO record);
int updateByPrimaryKey(HyInterviewInspectionLog record);
int updateByPrimaryKey(HyInterviewInspectionLogDO record);
}

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

@@ -1,7 +1,7 @@
<?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">
<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" />
@@ -45,7 +45,7 @@
delete from hy_inspection
where id = #{id}
</delete>
<insert id="insert" parameterType="com.cool.store.entity.HyInspection">
<insert id="insert" parameterType="com.cool.store.entity.HyInspectionDO">
insert into hy_inspection (id, interview_plan_id, operator_user_id,
type, status, files,
description, inspection_time, creator,
@@ -57,7 +57,7 @@
#{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 id="insertSelective" parameterType="com.cool.store.entity.HyInspectionDO">
insert into hy_inspection
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -148,7 +148,7 @@
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInspection">
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInspectionDO">
update hy_inspection
<set>
<if test="interviewPlanId != null">
@@ -193,7 +193,7 @@
</set>
where id = #{id}
</update>
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspection">
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspectionDO">
update hy_inspection
set interview_plan_id = #{interviewPlanId},
operator_user_id = #{operatorUserId,jdbcType=VARCHAR},

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

@@ -1,7 +1,7 @@
<?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" />
@@ -29,7 +29,7 @@
delete from hy_interview_inspection_log
where id = #{id,jdbcType=BIGINT}
</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,
@@ -39,7 +39,7 @@
#{operationTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</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">
@@ -106,7 +106,7 @@
</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">
@@ -139,7 +139,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</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},