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

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

@@ -121,9 +121,13 @@ public class ZEngineeringDangerousController extends BaseController {
         return R.ok(iZEngineeringDangerousService.queryEngineeringDangerous(id));
     }
 
+    /**
+     * 危险工程-下拉
+     *
+     */
     @SaCheckPermission("system:engineeringDangerous:list")
     @GetMapping("/nameAndIdList")
-    public List<Map<String, Object>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
-        return iZEngineeringDangerousService.selectEnginNameAndId(bo);
+    public R<List<Map<String, Object>>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
+        return R.ok(iZEngineeringDangerousService.selectEnginNameAndId(bo));
     }
 }

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

@@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
@@ -44,6 +45,19 @@ public class ZEngineeringInfrastructureController extends BaseController {
     private final IZEngineeringInfrastructureService iZEngineeringInfrastructureService;
 
     /**
+     * 查询基建工程下拉
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
+    @GetMapping("/select")
+    public R<List<ZEngineeringInfrastructureSelectVo>> select(ZEngineeringInfrastructureBo bo) {
+        try{
+            return R.ok(iZEngineeringInfrastructureService.select(bo));
+        }catch (Exception e){
+            return R.fail();
+        }
+    }
+
+    /**
      * 查询基建工程列表
      */
     @SaCheckPermission("zdsz:engineeringInfrastructure:list")

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

@@ -0,0 +1,36 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 基建工程视图对象 z_engineering_infrastructure
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringInfrastructureSelectVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+}

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 
 import java.util.Collection;
@@ -28,6 +29,11 @@ public interface IZEngineeringInfrastructureService {
     ZEngineeringInfrastructureVo queryByIdType(String id, String type);
 
     /**
+     * 查询基建工程下拉
+     */
+    List<ZEngineeringInfrastructureSelectVo> select(ZEngineeringInfrastructureBo bo);
+
+    /**
      * 查询基建工程列表
      */
     TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery);

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

@@ -12,6 +12,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
@@ -109,6 +110,21 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     }
 
     /**
+     * 查询基建工程下拉
+     */
+    @Override
+    public List<ZEngineeringInfrastructureSelectVo> select(ZEngineeringInfrastructureBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
+        List<ZEngineeringInfrastructureVo> result = baseMapper.selectVoList(lqw);
+        List<ZEngineeringInfrastructureSelectVo> list = new ArrayList();
+        for (ZEngineeringInfrastructureVo vo: result) {
+            ZEngineeringInfrastructureSelectVo select = BeanUtil.toBean(vo, ZEngineeringInfrastructureSelectVo.class);
+            list.add(select);
+        }
+        return list;
+    }
+
+    /**
      * 查询基建工程列表
      */
     @Override