From faec3b04b907a1c14c08f4c07854b1c11edbda4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 19 May 2025 14:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6v8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/weaver/seconddev/qt/entity/dto/DemoFormDTO.java   | 2 +-
 .../com/weaver/seconddev/qt/entity/dto/DemoListDTO.java   | 1 +
 .../seconddev/qt/service/impl/PageDemoServiceImpl.java    | 3 ++-
 secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml | 8 ++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoFormDTO.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoFormDTO.java
index e1ff761..3b25a27 100644
--- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoFormDTO.java
+++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoFormDTO.java
@@ -64,7 +64,7 @@ public class DemoFormDTO {
                     @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = Constant.MODULE, browserType = "orderTypeBrowser", required = true)
             }
     )
-    private String gdlx;
+    private BaseDTO gdlx;
 
 
     @Form(
diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java
index 7ebb6f1..4293f56 100644
--- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java
+++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/dto/DemoListDTO.java
@@ -30,6 +30,7 @@ public class DemoListDTO {
     private String bt;
 
     @TableColumn(label = "工单类型", labelId = 0, width = "150")
+    private String gdlxname;
     private String gdlx;
 
     @TableColumn(label = "创建日期", labelId = 0, width = "150")
diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java
index 1b34000..0a3a447 100644
--- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java
+++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/service/impl/PageDemoServiceImpl.java
@@ -52,9 +52,10 @@ public class PageDemoServiceImpl implements PageDemoService {
     @Override
     public WeaTable<DemoListDTO> list(DemoQueryParam queryParam) {
 
-        String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,ebllk,e.username,d.name as bmName from uf_gdjcxx t  " +
+        String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,ebllk,e.username,d.name as bmName,x.mc as gdlxname from uf_gdjcxx t  " +
                 "LEFT JOIN eteams.EMPLOYEE e ON e.id = t.fqr " +
                 "LEFT JOIN eteams.DEPARTMENT d ON d.id = e.department " +
+                "LEFT JOIN uf_gdlx x ON t.gdlx = x.id " +
                 "where t.TENANT_KEY = 'tma3ktp1q7' ";
 
         ExecuteSqlEntity executeSqlEntity = new ExecuteSqlEntity();
diff --git a/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml b/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml
index bb92ca8..824106d 100644
--- a/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml
+++ b/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml
@@ -5,7 +5,6 @@
     <resultMap id="baseMap" type="com.weaver.seconddev.qt.entity.dto.DemoFormDTO">
         <id column="id" property="id"/>
         <id column="bt" property="bt"/>
-        <id column="gdlx" property="gdlx"/>
         <id column="cjrq" property="cjrq"/>
         <id column="lc" property="lc"/>
         <id column="wtms" property="wtms"/>
@@ -19,10 +18,14 @@
             <id column="bm" property="id"/>
             <id column="name" property="name"/>
         </association>
+        <association property="gdlx" javaType="com.weaver.seconddev.qt.common.BaseDTO">
+            <id column="gdlx" property="id"/>
+            <id column="mc" property="name"/>
+        </association>
     </resultMap>
 
     <sql id="BaseColumn">
-        t.id,t.bt,t.cjrq,t.fqr,t.bm,t.wtms,t.wd,t.ebllk,e.username,d.name
+        t.id,t.bt,t.cjrq,t.fqr,t.bm,t.wtms,t.wd,t.ebllk,e.username,d.name,x.mc,t.gdlx,x.mc
     </sql>
 
     <select id="getDemoListDTO" resultMap="baseMap">
@@ -32,6 +35,7 @@
         uf_gdjcxx t
         LEFT JOIN {$publicdb}.EMPLOYEE e ON e.id = t.fqr
         LEFT JOIN {$publicdb}.DEPARTMENT d ON d.id = e.department
+        LEFT JOIN uf_gdlx x ON t.gdlx = x.id
         WHERE t.delete_type = 0
         and t.tenant_key = #{tenantKey}
         and t.id=#{id}