From cb8362c6be7f1489796ab88416013b723d6d1735 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:37:58 +0800
Subject: [PATCH] 返回字典字段

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml                |   25 ++++++++++++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java                  |   27 +++++++++++++
 ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml              |   21 +++++++++-
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java                |   18 +++++++++
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/ViolationsMapper.java          |    6 ++
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   10 +++--
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java            |    4 ++
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java              |    4 +-
 8 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index ffc2ad5..c607900 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -57,6 +57,12 @@
     @TableField("category")
     @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�")
     private Integer category;
+    /**
+     * 闂绫诲埆鏂囨湰
+     */
+    @TableField(value = "category_text",exist = false)
+    @ApiModelProperty(value = "闂绫诲埆鏂囨湰")
+    private String categoryText;
 
     /**
      * 鎵�灞炶閬�
@@ -64,6 +70,12 @@
     @TableField("street_id")
     @ApiModelProperty(value = "鎵�灞炶閬�")
     private Integer streetId;
+    /**
+     * 鎵�灞炶閬撴枃鏈�
+     */
+    @TableField(value = "street_text",exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�")
+    private String streetText;
 
     /**
      * 鎵�灞炵ぞ鍖�
@@ -71,6 +83,13 @@
     @TableField("community_id")
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
     private Integer communityId;
+
+    /**
+     * 鎵�灞炵ぞ鍖烘枃鏈�
+     */
+    @TableField(value = "community_text",exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
+    private String communityText;
 
     /**
      * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
@@ -108,6 +127,14 @@
     private Long createUser;
 
     /**
+     * 鐧昏浜烘枃鏈�
+     */
+    @TableField(value = "create_user_text",exist = false)
+    @ApiModelProperty(value = "鐧昏浜烘枃鏈�")
+    private String createUserText;
+
+
+    /**
      * 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)
      */
     @TableField("state")
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index 11bfd9a..3fc0fc2 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -78,10 +78,10 @@
     @ApiModelProperty(value = "璺濈")
     private Integer distance;
     /**
-     * 澶勭疆鏃ユ湡
+     * 澶勭疆闄愭椂
      */
     @TableField("dispose_date")
-    @ApiModelProperty(value = "澶勭疆鏃ユ湡")
+    @ApiModelProperty(value = "澶勭疆闄愭椂")
     private Date disposeDate;
     /**
      * 娲鹃仯鎰忚
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
index 826b2b9..988ddc5 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
@@ -117,4 +117,22 @@
     @ApiModelProperty(value = "瑙嗛鎶ヨid")
     private Integer videoAlarmReportId;
 
+    /**
+     * 澶х被鏂囨湰
+     */
+    @TableField(value = "category_text",exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
+    private String categoryText;
+    /**
+     * 灏忕被鏂囨湰
+     */
+    @TableField(value = "type_text",exist = false)
+    @ApiModelProperty(value = "灏忕被鏂囨湰")
+    private String typeText;
+    /**
+     * 浜嬩欢绛夌骇鏂囨湰
+     */
+    @TableField(value = "grade_text",exist = false)
+    @ApiModelProperty(value = "浜嬩欢绛夌骇鏂囨湰")
+    private String gradeText;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index 0554f76..727b5b5 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -6,6 +6,8 @@
 import com.ycl.bo.casePool.CasePoolViolationDO;
 import com.ycl.entity.caseHandler.BaseCase;
 
+import java.util.Map;
+
 /**
  * <p>
  * 妗堜欢鍩烘湰淇℃伅 Mapper 鎺ュ彛
@@ -18,4 +20,6 @@
     Page<CasePoolViolationDO> listViolationsPage(Page page, Integer state, Integer type, Integer resource);
 
     Page<CasePoolIllegalBuildingDO> listIllegalBuildingsPage(Page page, Integer state, Integer type, Integer resource);
+
+    BaseCase selectCondMap(Map map);
 }
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/ViolationsMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/ViolationsMapper.java
index c3c90e4..2e8c551 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/ViolationsMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/ViolationsMapper.java
@@ -1,7 +1,9 @@
 package com.ycl.mapper.caseHandler;
 
-import com.ycl.entity.caseHandler.Violations;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.caseHandler.Violations;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +15,6 @@
  */
 public interface ViolationsMapper extends BaseMapper<Violations> {
 
+    Violations selectCondMap(Map map);
+
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index e314840..5d020e7 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -219,15 +219,17 @@
     public BaseCaseDetail baseCaseDetail(String code) {
         BaseCaseDetail bcd = new BaseCaseDetail();
         //1.鏌ヨ妗堜欢鍩烘湰淇℃伅
-        QueryWrapper<BaseCase> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(BaseCase::getCode, code);
-        BaseCase baseCase = baseCaseMapper.selectOne(wrapper);
+        Map map = new HashMap();
+        map.put("code", code);
+        BaseCase baseCase = baseCaseMapper.selectCondMap(map);
         if (baseCase == null) {
             return null;
         }
         //鏌ヨ妗堜欢杩濊淇℃伅
         if (baseCase.getCategory() == 1) {
-            Violations violations = violationsMapper.selectById(baseCase.getId());
+            Map mapV = new HashMap();
+            mapV.put("id", baseCase.getId());
+            Violations violations = violationsMapper.selectCondMap(mapV);
             baseCase.setViolations(violations);
         } else {
             IllegalBuilding  illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index c11bccc..5f6896e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -22,6 +22,12 @@
         <result column="final_opinion" property="finalOpinion"/>
         <result column="create_time" property="createTime"/>
     </resultMap>
+    <resultMap type="com.ycl.entity.caseHandler.BaseCase" id="CondMapResultMap" extends="BaseResultMap">
+            <result column="category_text" property="categoryText" />
+            <result column="street_text" property="streetText" />
+            <result column="community_text" property="communityText" />
+            <result column="create_user_text" property="createUserText" />
+    </resultMap>
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
@@ -96,4 +102,23 @@
         </where>
 
     </select>
+
+
+    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+        SELECT
+            ubc.*,
+            udd.name category_text,
+            usr.region_name street_text,
+            usr2.region_name community_text,
+            ua.username create_user_text
+        FROM
+            ums_base_case ubc
+                LEFT  JOIN ums_data_dictionary udd on ubc.category = udd.id and udd.type_code = '01'
+                LEFT JOIN ums_sccg_region usr on ubc.street_id=usr.id
+                LEFT JOIN ums_sccg_region usr2 on ubc.community_id=usr2.id
+                LEFT JOIN ums_admin ua on ubc.create_user = ua.id
+        WHERE
+            ubc.`code`  = #{code}
+    </select>
+
 </mapper>
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
index 3fb21d4..d4bc27c 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
@@ -17,10 +17,27 @@
         <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">
+        <result column="category_text" property="categoryText" />
+        <result column="type_text" property="typeText" />
+        <result column="grade_text" property="gradeText" />
+    </resultMap>
     <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
     <sql id="Base_Column_List">
         id, category_id, type_id, grade_id, action_cause, link_shop, shop_name, car_number, description, informant, informant_phone_code, informant_id_card
     </sql>
-
+    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+        SELECT
+            uv.*,
+            udd.name category_text,
+            udd2.name type_text,
+            udd3.name grade_text
+        FROM
+            ums_violations uv
+                LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id and udd.type_code = '01'
+                LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd.type_code = '01'
+                LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd.type_code = '01'
+        WHERE
+            uv.`id` =  #{id}
+    </select>
 </mapper>

--
Gitblit v1.8.0