From 9bc4772475830bc05ccc5f693b377bd8a7d74586 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Sun, 26 Jan 2025 17:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-dependencies/pom.xml | 26 --------------- .../enterprise/EnterpriseController.java | 32 ++++++++++--------- .../admin/taglibrary/vo/TagLibraryRespVO.java | 4 +++ .../taglibrary/vo/TagLibrarySaveReqVO.java | 6 ++-- .../dataobject/taglibrary/TagLibraryDO.java | 2 ++ .../mysql/taglibrary/TagLibraryMapper.java | 2 +- 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 2f81c63..16350c5 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -525,7 +525,6 @@ com.google.inject guice - ${guice.version} @@ -583,11 +582,6 @@ - - com.github.binarywang - weixin-java-pay - ${weixin-java.version} - com.github.binarywang wx-java-mp-spring-boot-starter @@ -599,26 +593,6 @@ ${weixin-java.version} - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport.version} - - - com.alibaba - druid - - - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - ${mqtt.version} - - ch.qos.logback diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java index 63089a7..239c667 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java @@ -90,24 +90,26 @@ public class EnterpriseController { // @PreAuthorize("@ss.hasPermission('system:enterprise:query')") public CommonResult getEnterprise(@RequestParam("id") Long id) { EnterpriseDO enterprise = enterpriseService.getEnterprise(id); + if (enterprise != null) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(FileInfoDO::getDictType, 644l); + wrapper.eq(FileInfoDO::getDictData, 1l); + wrapper.eq(FileInfoDO::getUnitId, enterprise.getId()); + final List collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList()); - //获取企业图片 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(FileInfoDO::getDictType, 644l); - wrapper.eq(FileInfoDO::getDictData, 1l); - wrapper.eq(FileInfoDO::getUnitId, enterprise.getId()); - final List collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList()); - - if (!collect.isEmpty()) { - final List list = fileApi.listFile(collect); - enterprise.setFiles(list); + if (!collect.isEmpty()) { + final List list = fileApi.listFile(collect); + enterprise.setFiles(list); + } + + //获取资质 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EnterpriseQualificationDO::getEnterpriseId, enterprise.getId()); + final List enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper); + enterprise.setQualificationList(enterpriseQualificationList); } + //获取企业图片 - //获取资质 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(EnterpriseQualificationDO::getEnterpriseId, enterprise.getId()); - final List enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper); - enterprise.setQualificationList(enterpriseQualificationList); return success(BeanUtils.toBean(enterprise, EnterpriseRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java index 217fb8a..1b8e579 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java @@ -33,6 +33,10 @@ public class TagLibraryRespVO { @ExcelProperty("1、企业标签2、执法标签") private Integer tagType; + @Schema(description = "排序", example = "2") + @ExcelProperty("排序") + private Integer sort; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibrarySaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibrarySaveReqVO.java index 35a2f14..1be6466 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibrarySaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibrarySaveReqVO.java @@ -21,10 +21,12 @@ public class TagLibrarySaveReqVO { @Schema(description = "父标签的ID", example = "30648") private Integer parentId; - @Schema(description = "标签层级（一级、二级、三级）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "标签层级（一级、二级、三级）不能为空") + @Schema(description = "标签层级（一级、二级、三级）") private Integer tagLevel; + @Schema(description = "排序") + private Integer sort; + @Schema(description = "1、企业标签2、执法标签", example = "2") private Integer tagType; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taglibrary/TagLibraryDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taglibrary/TagLibraryDO.java index 3c002fc..442a934 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taglibrary/TagLibraryDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taglibrary/TagLibraryDO.java @@ -43,6 +43,8 @@ public class TagLibraryDO extends BaseDO { * 1、企业标签2、执法标签 */ private Integer tagType; + //排序 + private Integer sort; @TableField(exist = false) private List children = new ArrayList<>(); // 子标签列表 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java index c252e3e..d62d2f3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java @@ -24,7 +24,7 @@ public interface TagLibraryMapper extends BaseMapperX { .eqIfPresent(TagLibraryDO::getTagLevel, reqVO.getTagLevel()) .eqIfPresent(TagLibraryDO::getTagType, reqVO.getTagType()) .betweenIfPresent(TagLibraryDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(TagLibraryDO::getId)); + .orderByDesc(TagLibraryDO::getSort)); } }