市政工程|工业工程 根据工程类型查询列表

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

@@ -0,0 +1,27 @@
+package com.ruoyi.zdsz.domain.vo;
+
+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.bo.ZEngineeringNodeBo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 工业工程|市政工程视图对象 z_engineering_industry
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringIndustryTypeVo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String name;
+}

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 
 import java.util.Collection;
@@ -48,5 +49,5 @@ public interface IZEngineeringIndustryService {
 
     ZEngineeringIndustryVo query(String id);
 
-    TableDataInfo<ZEngineeringIndustryVo> queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery);
+    TableDataInfo<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery);
 }

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

@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZFileBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
@@ -242,21 +243,20 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
-    public TableDataInfo<ZEngineeringIndustryVo> queryNameByType(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
+    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<ZEngineeringIndustryVo> voList = result.getRecords().stream()
+        List<ZEngineeringIndustryTypeVo> voList = result.getRecords().stream()
             .map(record -> {
-                ZEngineeringIndustryVo vo = new ZEngineeringIndustryVo();
+                ZEngineeringIndustryTypeVo vo = new ZEngineeringIndustryTypeVo();
                 vo.setId(record.getId());
-                vo.setEnginName(record.getEnginName());
+                vo.setName(record.getEnginName());
                 return vo;
             })
             .collect(Collectors.toList());
-
         return new TableDataInfo<>(voList, (int)result.getTotal());
     }