From 7c62754ee030d811c04d74fd1e2c951ff6be29e3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 19 Feb 2024 14:48:10 +0800
Subject: [PATCH] 修复商户配置报错
---
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 171 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 145 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 992a1d9..1ae4a7d 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -4,32 +4,36 @@
<!-- 通用查询映射结果 -->
<resultMap id="taskLabelReportingEventResultMap" type="org.springblade.modules.task.entity.TaskLabelReportingEventEntity">
- <result column="id" property="id"/>
- <result column="task_id" property="taskId"/>
- <result column="place_id" property="placeId"/>
- <result column="house_id" property="houseId"/>
- <result column="district_id" property="districtId"/>
- <result column="happen_time" property="happenTime"/>
- <result column="user_id" property="userId"/>
- <result column="image_urls" property="imageUrls"/>
- <result column="district_name" property="districtName"/>
- <result column="event_type" property="eventType"/>
- <result column="confirm_flag" property="confirmFlag"/>
- <result column="confirm_user_id" property="confirmUserId"/>
- <result column="confirm_time" property="confirmTime"/>
- <result column="localtion" property="localtion"/>
- <result column="confirm_notion" property="confirmNotion"/>
- <result column="owner" property="owner"/>
- <result column="phone_number" property="phoneNumber"/>
- <result column="house_name" property="houseName"/>
- <result column="task_name" property="taskName"/>
- <result column="transaction_object_tel" property="transactionObjectTel"/>
- <result column="transaction_money" property="transactionMoney"/>
- <result column="goods_nums" property="goodsNums"/>
- <result column="goods_image_urls" property="goodsImageUrls"/>
- <result column="transaction_object" property="transactionObject"/>
- <result column="transaction_process" property="transactionProcess"/>
- <result column="label_name" property="labelName"/>
+ <result property="id" column="id" />
+ <result property="taskId" column="task_id" />
+ <result property="placeId" column="place_id" />
+ <result property="districtName" column="district_name" />
+ <result property="happenTime" column="happen_time" />
+ <result property="userId" column="user_id" />
+ <result property="owner" column="owner" />
+ <result property="phoneNumber" column="phone_number" />
+ <result property="imageUrls" column="image_urls" />
+ <result property="localtion" column="localtion" />
+ <result property="eventType" column="event_type" />
+ <result property="confirmFlag" column="confirm_flag" />
+ <result property="confirmUserId" column="confirm_user_id" />
+ <result property="confirmTime" column="confirm_time" />
+ <result property="confirmNotion" column="confirm_notion" />
+ <result property="transactionObjectTel" column="transaction_object_tel" />
+ <result property="transactionMoney" column="transaction_money" />
+ <result property="goodsNums" column="goods_nums" />
+ <result property="goodsImageUrls" column="goods_image_urls" />
+ <result property="transactionObject" column="transaction_object" />
+ <result property="transactionProcess" column="transaction_process" />
+ <result property="labelName" column="label_name" />
+ <result property="source" column="source" />
+ <result property="createTime" column="create_time" />
+ <result property="createUser" column="create_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="idCard" column="id_card" />
+ <result property="receiptUrls" column="receipt_urls" />
</resultMap>
@@ -38,6 +42,121 @@
<if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
AND user_id = #{taskLabelReportingEvent.userId}
</if>
+ <if test="taskLabelReportingEvent.eventType != null and taskLabelReportingEvent.eventType != ''">
+ AND event_type = #{taskLabelReportingEvent.eventType}
+ </if>
+ </select>
+
+
+ <resultMap type="org.springblade.modules.task.dto.TaskLabelReportingEventDTO" id="TaskLabelReportingEventDTOResult">
+ <result property="id" column="id" />
+ <result property="taskId" column="task_id" />
+ <result property="placeId" column="place_id" />
+ <result property="districtName" column="district_name" />
+ <result property="happenTime" column="happen_time" />
+ <result property="userId" column="user_id" />
+ <result property="owner" column="owner" />
+ <result property="phoneNumber" column="phone_number" />
+ <result property="imageUrls" column="image_urls" />
+ <result property="localtion" column="localtion" />
+ <result property="eventType" column="event_type" />
+ <result property="confirmFlag" column="confirm_flag" />
+ <result property="confirmUserId" column="confirm_user_id" />
+ <result property="confirmTime" column="confirm_time" />
+ <result property="confirmNotion" column="confirm_notion" />
+ <result property="transactionObjectTel" column="transaction_object_tel" />
+ <result property="transactionMoney" column="transaction_money" />
+ <result property="goodsNums" column="goods_nums" />
+ <result property="goodsImageUrls" column="goods_image_urls" />
+ <result property="transactionObject" column="transaction_object" />
+ <result property="transactionProcess" column="transaction_process" />
+ <result property="labelName" column="label_name" />
+ <result property="source" column="source" />
+ <result property="createTime" column="create_time" />
+ <result property="createUser" column="create_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="idCard" column="id_card" />
+ <result property="receiptUrls" column="receipt_urls" />
+ </resultMap>
+
+ <sql id="selectTaskLabelReportingEvent">
+ select
+ id,
+ task_id,
+ place_id,
+ district_name,
+ happen_time,
+ user_id,
+ owner,
+ phone_number,
+ image_urls,
+ localtion,
+ event_type,
+ confirm_flag,
+ confirm_user_id,
+ confirm_time,
+ confirm_notion,
+ transaction_object_tel,
+ transaction_money,
+ goods_nums,
+ goods_image_urls,
+ transaction_object,
+ transaction_process,
+ label_name,
+ source,
+ create_time,
+ create_user,
+ update_time,
+ update_user,
+ is_deleted,
+ id_card,
+ receipt_urls
+ from
+ jczz_task_label_reporting_event
+ </sql>
+
+ <select id="selectTaskLabelReportingEventById" parameterType="long" resultMap="TaskLabelReportingEventDTOResult">
+ <include refid="selectTaskLabelReportingEvent"/>
+ where
+ id = #{id}
+ </select>
+
+ <select id="selectTaskLabelReportingEventList" parameterType="org.springblade.modules.task.dto.TaskLabelReportingEventDTO" resultMap="TaskLabelReportingEventDTOResult">
+ <include refid="selectTaskLabelReportingEvent"/>
+ <where>
+ <if test="id != null "> and id = #{id}</if>
+ <if test="taskId != null "> and task_id = #{taskId}</if>
+ <if test="placeId != null "> and place_id = #{placeId}</if>
+ <if test="districtName != null and districtName != ''"> and district_name = #{districtName}</if>
+ <if test="happenTime != null "> and happen_time = #{happenTime}</if>
+ <if test="userId != null "> and user_id = #{userId}</if>
+ <if test="owner != null and owner != ''"> and owner = #{owner}</if>
+ <if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
+ <if test="imageUrls != null and imageUrls != ''"> and image_urls = #{imageUrls}</if>
+ <if test="localtion != null and localtion != ''"> and localtion = #{localtion}</if>
+ <if test="eventType != null and eventType != ''"> and event_type = #{eventType}</if>
+ <if test="confirmFlag != null and confirmFlag != ''"> and confirm_flag = #{confirmFlag}</if>
+ <if test="confirmUserId != null "> and confirm_user_id = #{confirmUserId}</if>
+ <if test="confirmTime != null "> and confirm_time = #{confirmTime}</if>
+ <if test="confirmNotion != null and confirmNotion != ''"> and confirm_notion = #{confirmNotion}</if>
+ <if test="transactionObjectTel != null and transactionObjectTel != ''"> and transaction_object_tel = #{transactionObjectTel}</if>
+ <if test="transactionMoney != null "> and transaction_money = #{transactionMoney}</if>
+ <if test="goodsNums != null "> and goods_nums = #{goodsNums}</if>
+ <if test="goodsImageUrls != null and goodsImageUrls != ''"> and goods_image_urls = #{goodsImageUrls}</if>
+ <if test="transactionObject != null and transactionObject != ''"> and transaction_object = #{transactionObject}</if>
+ <if test="transactionProcess != null and transactionProcess != ''"> and transaction_process = #{transactionProcess}</if>
+ <if test="labelName != null and labelName != ''"> and label_name = #{labelName}</if>
+ <if test="source != null "> and source = #{source}</if>
+ <if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="createUser != null "> and create_user = #{createUser}</if>
+ <if test="updateTime != null "> and update_time = #{updateTime}</if>
+ <if test="updateUser != null "> and update_user = #{updateUser}</if>
+ <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
+ <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
+ <if test="receiptUrls != null and receiptUrls != ''"> and receipt_urls = #{receiptUrls}</if>
+ </where>
</select>
--
Gitblit v1.9.3