|
@@ -27,6 +27,8 @@
|
|
<result property="fsUserId" column="fs_user_id" />
|
|
<result property="fsUserId" column="fs_user_id" />
|
|
<result property="takeRecords" column="take_records" />
|
|
<result property="takeRecords" column="take_records" />
|
|
<result property="sort" column="sort" />
|
|
<result property="sort" column="sort" />
|
|
|
|
+ <result property="qwUserKey" column="qw_user_key" />
|
|
|
|
+ <result property="userLogsId" column="user_logs_id" />
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectQwSopLogsVo">
|
|
<sql id="selectQwSopLogsVo">
|
|
@@ -98,6 +100,8 @@
|
|
<if test="data.fsUserId != null">fs_user_id,</if>
|
|
<if test="data.fsUserId != null">fs_user_id,</if>
|
|
<if test="data.takeRecords != null">take_records,</if>
|
|
<if test="data.takeRecords != null">take_records,</if>
|
|
<if test="data.sort != null">sort,</if>
|
|
<if test="data.sort != null">sort,</if>
|
|
|
|
+ <if test="data.userLogsId != null">user_logs_id,</if>
|
|
|
|
+ <if test="data.qwUserKey != null">qw_user_key,</if>
|
|
</trim>
|
|
</trim>
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<if test="data.qwUserid != null">#{data.qwUserid},</if>
|
|
<if test="data.qwUserid != null">#{data.qwUserid},</if>
|
|
@@ -120,6 +124,8 @@
|
|
<if test="data.fsUserId != null">#{data.fsUserId},</if>
|
|
<if test="data.fsUserId != null">#{data.fsUserId},</if>
|
|
<if test="data.takeRecords != null">#{data.takeRecords},</if>
|
|
<if test="data.takeRecords != null">#{data.takeRecords},</if>
|
|
<if test="data.sort != null">#{data.sort},</if>
|
|
<if test="data.sort != null">#{data.sort},</if>
|
|
|
|
+ <if test="data.userLogsId != null">#{data.userLogsId},</if>
|
|
|
|
+ <if test="data.qwUserKey != null">#{data.qwUserKey},</if>
|
|
</trim>
|
|
</trim>
|
|
</insert>
|
|
</insert>
|
|
|
|
|
|
@@ -141,6 +147,7 @@
|
|
<if test="data.remark != null ">remark = #{data.remark},</if>
|
|
<if test="data.remark != null ">remark = #{data.remark},</if>
|
|
<if test="data.fsUserId != null ">fs_user_id = #{data.fsUserId},</if>
|
|
<if test="data.fsUserId != null ">fs_user_id = #{data.fsUserId},</if>
|
|
<if test="data.sort != null ">sort = #{data.sort},</if>
|
|
<if test="data.sort != null ">sort = #{data.sort},</if>
|
|
|
|
+ <if test="data.qwUserKey != null ">qw_user_key = #{data.qwUserKey},</if>
|
|
</trim>
|
|
</trim>
|
|
where id = #{data.id}
|
|
where id = #{data.id}
|
|
</update>
|
|
</update>
|
|
@@ -219,11 +226,49 @@
|
|
<foreach collection="list" item="item">
|
|
<foreach collection="list" item="item">
|
|
WHEN id = #{item.id} THEN #{item.sendStatus}
|
|
WHEN id = #{item.id} THEN #{item.sendStatus}
|
|
</foreach>
|
|
</foreach>
|
|
|
|
+ else send_status
|
|
END,
|
|
END,
|
|
msg_id = CASE
|
|
msg_id = CASE
|
|
<foreach collection="list" item="item">
|
|
<foreach collection="list" item="item">
|
|
- WHEN id = #{item.id} THEN #{item.msgId}
|
|
|
|
|
|
+ WHEN id = #{item.id} AND #{item.msgId} IS NOT NULL THEN #{item.msgId}
|
|
</foreach>
|
|
</foreach>
|
|
|
|
+ ELSE msg_id
|
|
|
|
+ END,
|
|
|
|
+ send_type = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.sendType} IS NOT NULL THEN #{item.sendType}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE send_type
|
|
|
|
+ END,
|
|
|
|
+ send_time = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.sendTime} IS NOT NULL THEN #{item.sendTime}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE send_time
|
|
|
|
+ END,
|
|
|
|
+ receiving_status = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.receivingStatus} IS NOT NULL THEN #{item.receivingStatus}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE receiving_status
|
|
|
|
+ END,
|
|
|
|
+ qw_user_key = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.qwUserKey} IS NOT NULL THEN #{item.qwUserKey}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE qw_user_key
|
|
|
|
+ END,
|
|
|
|
+ remark = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.remark} IS NOT NULL THEN #{item.remark}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE remark
|
|
|
|
+ END,
|
|
|
|
+ sort = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.sort} IS NOT NULL THEN #{item.sort}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE sort
|
|
END,
|
|
END,
|
|
real_send_time = NOW()
|
|
real_send_time = NOW()
|
|
WHERE id IN
|
|
WHERE id IN
|
|
@@ -254,6 +299,12 @@
|
|
</foreach>
|
|
</foreach>
|
|
ELSE send_time
|
|
ELSE send_time
|
|
END,
|
|
END,
|
|
|
|
+ qw_user_key = CASE
|
|
|
|
+ <foreach collection="list" item="item">
|
|
|
|
+ WHEN id = #{item.id} AND #{item.qwUserKey} IS NOT NULL THEN #{item.qwUserKey}
|
|
|
|
+ </foreach>
|
|
|
|
+ ELSE qw_user_key
|
|
|
|
+ END,
|
|
receiving_status = CASE
|
|
receiving_status = CASE
|
|
<foreach collection="list" item="item">
|
|
<foreach collection="list" item="item">
|
|
WHEN id = #{item.id} AND #{item.receivingStatus} IS NOT NULL THEN #{item.receivingStatus}
|
|
WHEN id = #{item.id} AND #{item.receivingStatus} IS NOT NULL THEN #{item.receivingStatus}
|
|
@@ -528,7 +579,7 @@
|
|
qw_userid, external_user_id,external_id, external_user_name, log_type,
|
|
qw_userid, external_user_id,external_id, external_user_name, log_type,
|
|
content_json, send_status, send_time, real_send_time, send_type,
|
|
content_json, send_status, send_time, real_send_time, send_type,
|
|
company_id, receiving_status, msg_id, sop_id, remark,
|
|
company_id, receiving_status, msg_id, sop_id, remark,
|
|
- corp_id, customer_id, fs_user_id,sort
|
|
|
|
|
|
+ corp_id, customer_id,fs_user_id,sort,qw_user_key
|
|
)
|
|
)
|
|
VALUES
|
|
VALUES
|
|
<foreach collection="qwSopLogs" item="log" separator=",">
|
|
<foreach collection="qwSopLogs" item="log" separator=",">
|
|
@@ -551,7 +602,8 @@
|
|
#{log.corpId},
|
|
#{log.corpId},
|
|
#{log.customerId},
|
|
#{log.customerId},
|
|
#{log.fsUserId},
|
|
#{log.fsUserId},
|
|
- #{log.sort}
|
|
|
|
|
|
+ #{log.sort},
|
|
|
|
+ #{log.qwUserKey}
|
|
)
|
|
)
|
|
</foreach>
|
|
</foreach>
|
|
</insert>
|
|
</insert>
|
|
@@ -562,7 +614,7 @@
|
|
qw_userid, external_user_id,external_id, external_user_name, log_type,
|
|
qw_userid, external_user_id,external_id, external_user_name, log_type,
|
|
content_json, send_status, send_time, real_send_time, send_type,
|
|
content_json, send_status, send_time, real_send_time, send_type,
|
|
company_id, receiving_status, msg_id, sop_id, remark,
|
|
company_id, receiving_status, msg_id, sop_id, remark,
|
|
- corp_id, customer_id, fs_user_id, expiration_time,sort,user_logs_id,take_records
|
|
|
|
|
|
+ corp_id, customer_id, fs_user_id, expiration_time,sort,user_logs_id,take_records,qw_user_key
|
|
)
|
|
)
|
|
VALUES
|
|
VALUES
|
|
<foreach collection="qwSopLogs" item="log" separator=",">
|
|
<foreach collection="qwSopLogs" item="log" separator=",">
|
|
@@ -588,7 +640,8 @@
|
|
#{log.expirationTime},
|
|
#{log.expirationTime},
|
|
#{log.sort},
|
|
#{log.sort},
|
|
#{log.userLogsId},
|
|
#{log.userLogsId},
|
|
- #{log.takeRecords}
|
|
|
|
|
|
+ #{log.takeRecords},
|
|
|
|
+ #{log.qwUserKey}
|
|
)
|
|
)
|
|
</foreach>
|
|
</foreach>
|
|
</insert>
|
|
</insert>
|