diff --git a/build.gradle b/build.gradle index 47cb8fd..85d1a7e 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ configure(allprojects) { project -> } jar { - apply plugin:'war' +// apply plugin:'war' from sourceSets.main.allJava manifest { attributes 'weaver-ecode-seconddev-id': rootProject.group + '-' + rootProject.name, diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/browser/OrderTypeBrowser.java similarity index 97% rename from secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java rename to secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/browser/OrderTypeBrowser.java index faf92c0..2878831 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/config/OrderTypeBrowser.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/browser/OrderTypeBrowser.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.qt.config; +package com.weaver.seconddev.qt.browser; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -108,7 +108,7 @@ public class OrderTypeBrowser extends AbstractWeaBrowserBaseService { Map browserData = getBrowserData(params); if (MapUtils.isNotEmpty(browserData)) { List list = (List) browserData.get(WeaBrowserConstant.BROWSER_RESULT_DATA); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list)) { for (int i = 0; i < list.size(); i++) { BrowserEntity browserEntity = new BrowserEntity(); Map userMap = (Map) list.get(i); diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java index cd92f08..8a0e1bd 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/constant/Constant.java @@ -15,4 +15,10 @@ public class Constant { */ public static final String MODULE = "qt"; + /** + *租户 + */ + public static final String TENANT_KEY = "tma3ktp1q7"; + + } 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 83421a7..7bf2f12 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 @@ -35,10 +35,7 @@ public class DemoFormDTO { labelId = 0, items = { @FormItem(itemType = WeaFormItemType.INPUT, required = true) - }, - group = "baseInfo", - layout = "one", - labelSpan = 10 + } ) private String bt; @@ -46,8 +43,7 @@ public class DemoFormDTO { label = "发起人", labelId = 0, items = { - @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = Constant.MODULE, - browserType = "resource", required = true) + @FormItem(itemType = WeaFormItemType.BROWSER, browserType = "resource", required = true) } ) private BaseDTO fqr; @@ -56,8 +52,7 @@ public class DemoFormDTO { label = "部门", labelId = 0, items = { - @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = Constant.MODULE, - browserType = "department", required = true) + @FormItem(itemType = WeaFormItemType.BROWSER, browserType = "department", required = true) } ) private BaseDTO bm; @@ -73,16 +68,6 @@ public class DemoFormDTO { private String gdlx; - @Form( - label = "EB浏览框", - labelId = 0, - items = { - @FormItem(itemType = WeaFormItemType.BROWSER, browserModule = Constant.MODULE, - browserType = "performance_grade_detail", required = true) - } - ) - private String ebllk; - @Form( label = "创建日期", labelId = 0, @@ -98,7 +83,7 @@ public class DemoFormDTO { label = "文档", labelId = 0, items = { - @FormItem(itemType = WeaFormItemType.UPLOAD, browserModule = Constant.MODULE) + @FormItem(itemType = WeaFormItemType.UPLOAD) } ) private String wd; diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/param/DemoQueryParam.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/param/DemoQueryParam.java index 53afb84..38cb82f 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/param/DemoQueryParam.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/entity/param/DemoQueryParam.java @@ -70,25 +70,6 @@ public class DemoQueryParam { @ApiModelProperty("身份证号码") private String idNo; - /** - * 是否允许查询身份证号码 - */ - @JsonIgnore - private boolean isSearchIdNo; - @ApiModelProperty("入职日期") - private List hiredate; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("导入校验字段 1.工号 2.身份证号码") - private Integer importCheckType; - - @ApiModelProperty("excel密码") - private String sharePassword; - - @ApiModelProperty("自定义列") - private List customColumns; } diff --git a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/mapper/DemoMapper.java b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/mapper/DemoMapper.java index 920c24e..fe0d026 100644 --- a/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/mapper/DemoMapper.java +++ b/secondev-qt-demo/src/main/java/com/weaver/seconddev/qt/mapper/DemoMapper.java @@ -1,11 +1,13 @@ package com.weaver.seconddev.qt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.weaver.seconddev.qt.entity.dto.DemoFormDTO; import com.weaver.seconddev.qt.entity.po.DemoPO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface DemoMapper extends BaseMapper { - + DemoFormDTO getDemoListDTO(@Param("id") Long id, @Param("tenantKey") String tenantKey); } \ No newline at end of file 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 a56925e..91818da 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,7 +9,6 @@ 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; @@ -19,10 +18,12 @@ import com.weaver.seconddev.qt.entity.param.DemoQueryParam; import com.weaver.seconddev.qt.entity.param.OrderTypeQueryParam; import com.weaver.seconddev.qt.enums.SQLStatusEnum; import com.weaver.seconddev.qt.exception.SqlRunTimeException; +import com.weaver.seconddev.qt.mapper.DemoMapper; import com.weaver.seconddev.qt.service.PageDemoService; import com.weaver.seconddev.qt.util.EntityUtil; import com.weaver.seconddev.qt.util.FormatUtil; import com.weaver.seconddev.qt.util.PageUtil; +import com.weaver.teams.security.context.TenantContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +37,9 @@ public class PageDemoServiceImpl implements PageDemoService { @Autowired private DataSetService dataSetService; + @Autowired + private DemoMapper demoMapper; + @Override public WeaSearchCondition getSearchCondition() { @@ -47,7 +51,7 @@ 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.shortname 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 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' "; @@ -94,32 +98,7 @@ public class PageDemoServiceImpl implements PageDemoService { public WeaForm getForm(Long id) { DemoFormDTO dataFormDTO = new DemoFormDTO(); if (id != null) { - 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; - ExecuteSqlEntity executeSqlEntity = new ExecuteSqlEntity(); - executeSqlEntity.setSql(Base64.encode(sql)); - executeSqlEntity.setGroupId("weaver-ebuilder-app-service"); - executeSqlEntity.setSourceType(SourceType.LOGIC); - - Map map = dataSetService.executeSql(executeSqlEntity); - SqlResponse sqlResponse = EntityUtil.map2Entity(map, DemoListDTO.class); - if (SQLStatusEnum.FAIL.getValue().equals(sqlResponse.getStatus())) { - throw new SqlRunTimeException(sqlResponse.getMessage()); - } - List list = sqlResponse.getRecords(); - 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()); + dataFormDTO = demoMapper.getDemoListDTO(id, TenantContext.getCurrentTenantKey()); } WeaForm weaForm = FormatUtil.getInstance().buildForm(DemoFormDTO.class, dataFormDTO); diff --git a/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml b/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml new file mode 100644 index 0000000..bb92ca8 --- /dev/null +++ b/secondev-qt-demo/src/main/resources/mapper/DemoMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + t.id,t.bt,t.cjrq,t.fqr,t.bm,t.wtms,t.wd,t.ebllk,e.username,d.name + + + +