From dd39d15b6b47679778df6a7041e7be01ddc3debd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 08 十二月 2022 16:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
index ca15c09..bb876fa 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
@@ -3,21 +3,21 @@
<mapper namespace="com.ycl.mapper.caseHandler.ViolationsMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.Violations">
+ <resultMap id="BaseResultMap" type="com.ycl.vo.casePool.ViolationsVO">
<id column="id" property="id" />
<result column="category_id" property="categoryId" />
<result column="type_id" property="typeId" />
<result column="grade_id" property="gradeId" />
<result column="action_cause" property="actionCause" />
<result column="link_shop" property="linkShop" />
- <result column="shop_name" property="shopName" />
+ <result column="store_name" property="shopName" />
<result column="car_number" property="carNumber" />
<result column="description" property="description" />
<result column="informant" property="informant" />
<result column="informant_phone_code" property="informantPhoneCode" />
<result column="informant_id_card" property="informantIdCard" />
</resultMap>
- <resultMap type="com.ycl.entity.caseHandler.Violations" id="CondMapResultMap" extends="BaseResultMap">
+ <resultMap type="com.ycl.vo.casePool.ViolationsVO" id="CondMapResultMap" extends="BaseResultMap">
<result column="category_text" property="categoryText" />
<result column="type_text" property="typeText" />
<result column="grade_text" property="gradeText" />
@@ -29,6 +29,7 @@
<select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
SELECT
uv.*,
+ t4.store_name ,
udd.name category_text,
udd2.name type_text,
udd3.name grade_text
@@ -37,6 +38,7 @@
LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id
LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id
LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id
+ LEFT JOIN ums_store_store_info t4 on t4.id=uv.shop_name
WHERE
uv.`id` = #{id}
</select>
--
Gitblit v1.8.0