Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
@@ -119,7 +120,7 @@ public class ZEngineeringIndustryController extends BaseController {
      */
     @GetMapping("/queryNameByType")
     @SaCheckPermission("zdsz:engineeringIndustry:type")
-    public TableDataInfo queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
-        return iZEngineeringIndustryService.queryNameByType(bo, pageQuery);
+    public R<List<ZEngineeringIndustryTypeVo>> queryNameByType(ZEngineeringIndustryBo bo) {
+        return R.ok(iZEngineeringIndustryService.queryNameByType(bo));
     }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryTypeVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 
@@ -24,4 +25,9 @@ public class ZEngineeringIndustryTypeVo extends BaseEntity {
     private String id;
 
     private String name;
+
+    public ZEngineeringIndustryTypeVo(ZEngineeringIndustry zEngineeringIndustry) {
+        this.id = zEngineeringIndustry.getId();
+        this.name = zEngineeringIndustry.getEnginName();
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -49,5 +49,5 @@ public interface IZEngineeringIndustryService {
 
     ZEngineeringIndustryVo query(String id);
 
-    TableDataInfo<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery);
+    List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -3,7 +3,6 @@ package com.ruoyi.zdsz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -243,21 +242,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
-    public TableDataInfo<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
-        QueryWrapper<ZEngineeringIndustry> zEngineeringIndustryQueryWrapper = buildListByType(bo);
-
-        IPage<ZEngineeringIndustry> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        IPage<ZEngineeringIndustry> result = baseMapper.selectPage(page, zEngineeringIndustryQueryWrapper);
-
-        List<ZEngineeringIndustryTypeVo> voList = result.getRecords().stream()
-            .map(record -> {
-                ZEngineeringIndustryTypeVo vo = new ZEngineeringIndustryTypeVo();
-                vo.setId(record.getId());
-                vo.setName(record.getEnginName());
-                return vo;
-            })
+    public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo) {
+        QueryWrapper<ZEngineeringIndustry> zEngineeringIndustryTypeVoQueryWrapper = buildListByType(bo);
+        List<ZEngineeringIndustry> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryTypeVoQueryWrapper);
+        List<ZEngineeringIndustryTypeVo> zEngineeringIndustryTypeVos = zEngineeringIndustryVos.stream()
+            .map(ZEngineeringIndustryTypeVo::new)
             .collect(Collectors.toList());
-        return new TableDataInfo<>(voList, (int)result.getTotal());
+        return zEngineeringIndustryTypeVos;
     }
 
     private QueryWrapper<ZEngineeringIndustry> buildListByType(ZEngineeringIndustryBo bo) {