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 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 @@ - @@ -19,10 +18,14 @@ + + + + - 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