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

Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

Browse Source
This commit is contained in:
feng.li
2023-09-22 16:06:26 +08:00
parent fc6b70c31d c723af1381
commit 8f3d16df4f
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml
View File

@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.cool.store.entity.BeautyCameraSettingDO">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="beauty_status" jdbcType="BIT" property="beautyStatus"/>
<result column="beauty" jdbcType="INTEGER" property="beauty"/>
<result column="brightness" jdbcType="INTEGER" property="brightness"/>
<result column="ruddy" jdbcType="INTEGER" property="ruddy"/>
@@ -13,7 +12,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, user_id, beauty_status, beauty, brightness, ruddy, deleted, create_time, update_time
id, user_id, beauty, brightness, ruddy, deleted, create_time, update_time
</sql>
<insert id="insertOrUpdateBeautyCameraSetting" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
@@ -22,9 +21,6 @@
<if test="record.userId != null">
user_id,
</if>
<if test="record.beautyStatus != null">
beauty_status,
</if>
<if test="record.beauty != null">
beauty,
</if>
@@ -48,9 +44,6 @@
<if test="record.userId != null">
#{record.userId},
</if>
<if test="record.beautyStatus != null">
#{record.beautyStatus},
</if>
<if test="record.beauty != null">
#{record.beauty},
</if>
@@ -70,7 +63,7 @@
#{record.updateTime},
</if>
</trim>
ON DUPLICATE KEY UPDATE beauty_status = values(beauty_status), beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy)
ON DUPLICATE KEY UPDATE beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy)
</insert>
<select id="getBeautyCameraSetting" resultMap="BaseResultMap">

7
coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
View File

@@ -360,7 +360,12 @@
<if test="workflowStatus!=null and workflowStatus!=''">
and a.workflow_status = #{workflowStatus}
</if>
order by b.create_time
<if test="workflowStatus!=null and workflowStatus=='1'">
order by b.update_time
</if>
<if test="workflowStatus!=null and workflowStatus=='0'">
order by a.create_time
</if>
</select>
<select id="selectByLineId" resultMap="BaseResultMap">