From 474222c9a02af99f8d4b882c8ac3ae2b480ea850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 18 May 2025 20:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6v5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaver/seconddev/qt/common/BaseDTO.java | 4 ++++ .../seconddev/qt/entity/dto/DemoFormDTO.java | 7 +++---- .../qt/service/impl/PageDemoServiceImpl.java | 19 +++++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/common/BaseDTO.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/common/BaseDTO.java index 266a581..e37d05b 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/common/BaseDTO.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/common/BaseDTO.java @@ -1,6 +1,8 @@ package com.weaver.seconddev.qt.common; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; /** @@ -13,6 +15,8 @@ import lombok.experimental.Accessors; **/ @Data @Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor public class BaseDTO { private String id; 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 8439c67..83421a7 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 @@ -70,7 +70,7 @@ public class DemoFormDTO { browserType = "orderTypeBrowser", required = true) } ) - private BaseDTO gdlx; + private String gdlx; @Form( @@ -81,7 +81,7 @@ public class DemoFormDTO { browserType = "performance_grade_detail", required = true) } ) - private BaseDTO ebllk; + private String ebllk; @Form( label = "创建日期", @@ -107,8 +107,7 @@ public class DemoFormDTO { label = "流程", labelId = 0, items = { - @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = Constant.MODULE, - browserType = "department", required = true) + @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = "workflow/pathdef", browserType = "workflowPathBrowser", required = true) } ) private String lc; 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 d6faf84..a56925e 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 @@ -9,6 +9,7 @@ import com.weaver.ebuilder.datasource.api.entity.ExecuteSqlEntity; import com.weaver.ebuilder.datasource.api.enums.SourceType; import com.weaver.ebuilder.datasource.api.service.DataSetService; import com.weaver.framework.spring.annotation.AopClass; +import com.weaver.seconddev.qt.common.BaseDTO; import com.weaver.seconddev.qt.common.SqlResponse; import com.weaver.seconddev.qt.entity.dto.DemoFormDTO; import com.weaver.seconddev.qt.entity.dto.DemoListDTO; @@ -46,7 +47,7 @@ public class PageDemoServiceImpl implements PageDemoService { @Override public WeaTable list(DemoQueryParam queryParam) { - String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,e.username,d.shortname as bmName from uf_gdjcxx t " + + String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,ebllk,e.username,d.shortname as bmName from uf_gdjcxx t " + "LEFT JOIN eteams.EMPLOYEE e ON e.id = t.fqr " + "LEFT JOIN eteams.DEPARTMENT d ON d.id = e.department " + "where t.TENANT_KEY = 'tma3ktp1q7' "; @@ -91,9 +92,9 @@ public class PageDemoServiceImpl implements PageDemoService { @Override public WeaForm getForm(Long id) { - DemoListDTO dataFormDTO = new DemoListDTO(); + DemoFormDTO dataFormDTO = new DemoFormDTO(); if (id != null) { - String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,e.username,d.shortname as bmName from uf_gdjcxx t " + + String sql = "select t.id,t.bt,cjrq,fqr,bm,wtms,wd,ebllk,e.username,d.shortname as bmName from uf_gdjcxx t " + "LEFT JOIN eteams.EMPLOYEE e ON e.id = t.fqr " + "LEFT JOIN eteams.DEPARTMENT d ON d.id = e.department " + "where t.TENANT_KEY = 'tma3ktp1q7' and t.id= " + id; @@ -108,7 +109,17 @@ public class PageDemoServiceImpl implements PageDemoService { throw new SqlRunTimeException(sqlResponse.getMessage()); } List list = sqlResponse.getRecords(); - dataFormDTO = list.get(0); + DemoListDTO demoListDTO = list.get(0); + dataFormDTO.setBm(new BaseDTO(demoListDTO.getBm(), demoListDTO.getBmName())); + dataFormDTO.setBt(demoListDTO.getBt()); + dataFormDTO.setCjrq(demoListDTO.getCjrq()); + dataFormDTO.setFqr(new BaseDTO(demoListDTO.getFqr(), demoListDTO.getUsername())); + dataFormDTO.setGdlx(demoListDTO.getGdlx()); + dataFormDTO.setWd(demoListDTO.getWd()); + dataFormDTO.setWtms(demoListDTO.getWtms()); + dataFormDTO.setId(demoListDTO.getId()); + dataFormDTO.setLc(demoListDTO.getLc()); + dataFormDTO.setEbllk(demoListDTO.getLc()); } WeaForm weaForm = FormatUtil.getInstance().buildForm(DemoFormDTO.class, dataFormDTO);