工程详情

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGOrderController.java

@@ -0,0 +1,213 @@
+package com.ruoyi.yiqi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+//import com.ruoyi.gas.domain.bo.GOrderBo;
+//import com.ruoyi.gas.domain.vo.GOrderExportVoAnJian;
+//import com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu;
+//import com.ruoyi.gas.domain.vo.GOrderVo;
+//import com.ruoyi.gas.service.IGAreaService;
+//import com.ruoyi.gas.service.IGOrderService;
+import com.ruoyi.yiqi.entity.YqGOrder;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
+import com.ruoyi.yiqi.service.IYqGOrderService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 工程管理Controller
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Validated
+//@Api(value = "工程管理控制器", tags = {"工程管理管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/order")
+public class YqGOrderController extends BaseController {
+
+    @Resource
+    private final IYqGOrderService iGOrderService;
+//    private final YqBackup backup;
+
+//    @Autowired
+//    private IYqGAreaService areaService;
+
+    /**
+     * 查询工程管理列表
+     */
+//    @ApiOperation("查询工程管理列表")
+//    @PreAuthorize("@ss.hasPermi('gas:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo<YqGOrder> list(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.queryPageList(bo);
+    }
+
+    /**
+     * 导出工程管理列表
+     */
+//    @ApiOperation("导出工程管理列表")
+//    @PreAuthorize("@ss.hasPermi('gas:order:export')")
+    @Log(title = "工程管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated YqGOrder bo, HttpServletResponse response) {
+        List<YqGOrder> list = iGOrderService.getListExport(bo);
+        ExcelUtil.exportExcel(list, "工程管理", YqGOrder.class, response);
+    }
+
+    /**
+     * 获取工程管理详细信息
+     */
+//    @ApiOperation("获取工程管理详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:order:query')")
+    @GetMapping("/{id}")
+    public R<YqGOrder> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iGOrderService.getById(id));
+    }
+
+    @GetMapping("/getListAll")
+    public TableDataInfo<YqGOrder> getListAll(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListAll(bo);
+    }
+
+    /**
+     * 工程审核列表查询
+     * @param bo
+     * @return
+     */
+    @GetMapping("/getListExamine")
+    public TableDataInfo<YqGOrder> getListExamine(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListExamine(bo);
+    }
+
+    /**
+     * 管材类别统计
+     * @param id
+     * @return
+     */
+    @GetMapping("/getExaminePipeType")
+    public R getExaminePipeType(Long id) {
+        return R.ok(iGOrderService.getExaminePipeType(id));
+    }
+
+    /**
+     * 管材长度统计
+     * @param id
+     * @return
+     */
+    @GetMapping("/getExaminePipeLength")
+    public R getExaminePipeLength(Long id) {
+        return R.ok(iGOrderService.getExaminePipeLength(id));
+    }
+
+    /**
+     * 自闭阀类别统计
+     * @param id
+     * @return
+     */
+    @GetMapping("/getExamineValveType")
+    public R getExamineValveType(Long id) {
+        return R.ok(iGOrderService.getExamineValveType(id));
+    }
+
+    @GetMapping("/getOrderForStatus")
+    public R getOrderForStatus(Long houseId,String id) {
+        return R.ok(iGOrderService.getOrderForStatus(houseId,id));
+    }
+
+    /**
+     * 统计图点击跳转列表
+     * @param bo
+     * @return
+     */
+    @GetMapping("/getListByStatus")
+    public TableDataInfo<YqGOrder> getListByStatus(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListByStatus(bo);
+    }
+    @GetMapping("/backup")
+    public R backup() {
+//        backup.getbackup();
+        return R.ok();
+    }
+
+    /**
+     * 安检列表
+     * @param bo
+     * @return
+     */
+//    @PreAuthorize("@ss.hasPermi('gas:anjian:query')")
+    @GetMapping("/getListAnJian")
+    public TableDataInfo<YqGOrder> getListAnJian(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListAnJian(bo);
+    }
+
+    /**
+     * 安检导出
+     */
+//    @ApiOperation("安检导出")
+//    @PreAuthorize("@ss.hasPermi('gas:anjian:getListAnJianExport')")
+    @Log(title = "安检导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/getListAnJianExport")
+    public void getListAnJianExport(@Validated YqGOrder bo, HttpServletResponse response) {
+        List<YqGOrderExportVoAnJian> list = iGOrderService.getListAnJianExport(bo);
+        ExcelUtil.exportExcel(list, "安检导出", YqGOrderExportVoAnJian.class, response);
+    }
+
+    /**
+     * 维修列表
+     * @param bo
+     * @return
+     */
+//    @PreAuthorize("@ss.hasPermi('gas:weixiu:query')")
+    @GetMapping("/getListWeiXiu")
+    public TableDataInfo<YqGOrder> getListWeiXiu(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListWeiXiu(bo);
+    }
+
+    /**
+     * 维修导出
+     */
+//    @ApiOperation("维修导出")
+//    @PreAuthorize("@ss.hasPermi('gas:weixiu:getListWeiXiuExport')")
+    @Log(title = "维修导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/getListWeiXiuExport")
+    public void getListWeiXiuExport(@Validated YqGOrder bo, HttpServletResponse response) {
+        List<YqGOrderExportVoWeiXiu> list = iGOrderService.getListWeiXiuExport(bo);
+        ExcelUtil.exportExcel(list, "安检导出", YqGOrderExportVoWeiXiu.class, response);
+    }
+
+    /**
+     * 开栓列表
+     * @param bo
+     * @return
+     */
+//    @PreAuthorize("@ss.hasPermi('gas:kaisuan:query')")
+    @GetMapping("/getListKaiShuan")
+    public TableDataInfo<YqGOrder> getListKaiShuan(@Validated(QueryGroup.class) YqGOrder bo) {
+        return iGOrderService.getListKaiShuan(bo);
+    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGOtherEngineController.java

@@ -0,0 +1,81 @@
+package com.ruoyi.yiqi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+//import com.ruoyi.gas.domain.bo.GOtherEngineBo;
+//import com.ruoyi.gas.domain.vo.GOtherEngineVo;
+//import com.ruoyi.gas.service.IGOtherEngineService;
+import com.ruoyi.yiqi.entity.YqGOtherEngine;
+import com.ruoyi.yiqi.service.IYqGOtherEngineService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 其他工程Controller
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+@Validated
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/otherEngine")
+public class YqGOtherEngineController extends BaseController {
+
+    @Resource
+    private final IYqGOtherEngineService iGOtherEngineService;
+
+    /**
+     * 查询其他工程列表
+     */
+//    @ApiOperation("查询其他工程列表")
+//    @PreAuthorize("@ss.hasPermi('gas:otherEngine:list')")
+    @GetMapping("/list")
+    public TableDataInfo<YqGOtherEngine> list(@Validated(QueryGroup.class) YqGOtherEngine bo) {
+        return iGOtherEngineService.queryPageList(bo);
+    }
+
+    /**
+     * 导出其他工程列表
+     */
+//    @ApiOperation("导出其他工程列表")
+//    @PreAuthorize("@ss.hasPermi('gas:otherEngine:export')")
+//    @Log(title = "其他工程", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public void export(@Validated YqGOtherEngine bo, HttpServletResponse response) {
+//        List<YqGOtherEngine> list = iGOtherEngineService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "其他工程", YqGOtherEngine.class, response);
+//    }
+
+    /**
+     * 获取其他工程详细信息
+     */
+//    @ApiOperation("获取其他工程详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:otherEngine:query')")
+    @GetMapping("/{id}")
+    public R<YqGOtherEngine> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iGOtherEngineService.getById(id));
+    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGPipeLengthController.java

@@ -0,0 +1,85 @@
+package com.ruoyi.yiqi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+//import com.ruoyi.gas.domain.bo.GPipeLengthBo;
+//import com.ruoyi.gas.domain.vo.GPipeLengthVo;
+//import com.ruoyi.gas.service.IGPipeLengthService;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import com.ruoyi.yiqi.service.IYqGPipeLengthService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 管子长度Controller
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Validated
+//@Api(value = "管子长度控制器", tags = {"管子长度管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/pipeLength")
+public class YqGPipeLengthController extends BaseController {
+
+    private final IYqGPipeLengthService iGPipeLengthService;
+
+    /**
+     * 查询管子长度列表
+     */
+//    @ApiOperation("查询管子长度列表")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeLength:list')")
+    @GetMapping("/list")
+    public TableDataInfo<YqGPipeLength> list(@Validated(QueryGroup.class) YqGPipeLength bo) {
+        return iGPipeLengthService.queryPageList(bo);
+    }
+
+    /**
+     * 导出管子长度列表
+     */
+//    @ApiOperation("导出管子长度列表")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeLength:export')")
+//    @Log(title = "管子长度", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public void export(@Validated YqGPipeLength bo, HttpServletResponse response) {
+//        List<YqGPipeLength> list = iGPipeLengthService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "管子长度", YqGPipeLength.class, response);
+//    }
+
+    /**
+     * 获取管子长度详细信息
+     */
+//    @ApiOperation("获取管子长度详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeLength:query')")
+    @GetMapping("/{id}")
+    public R<YqGPipeLength> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iGPipeLengthService.queryById(id));
+    }
+
+//    @GetMapping("/getList")
+//    public AjaxResult getList() {
+//        return AjaxResult.success(iGPipeLengthService.list());
+//    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGPipeTypeController.java

@@ -0,0 +1,85 @@
+package com.ruoyi.yiqi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+//import com.ruoyi.gas.domain.bo.GPipeTypeBo;
+//import com.ruoyi.gas.domain.vo.GPipeTypeVo;
+//import com.ruoyi.gas.service.IGPipeTypeService;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.service.IYqGPipeTypeService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 管子类别Controller
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Validated
+//@Api(value = "管子类别控制器", tags = {"管子类别管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/pipeType")
+public class YqGPipeTypeController extends BaseController {
+
+    private final IYqGPipeTypeService iGPipeTypeService;
+
+    /**
+     * 查询管子类别列表
+     */
+//    @ApiOperation("查询管子类别列表")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeType:list')")
+    @GetMapping("/list")
+    public TableDataInfo<YqGPipeType> list(@Validated(QueryGroup.class) YqGPipeType bo) {
+        return iGPipeTypeService.queryPageList(bo);
+    }
+
+    /**
+     * 导出管子类别列表
+     */
+//    @ApiOperation("导出管子类别列表")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeType:export')")
+//    @Log(title = "管子类别", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public void export(@Validated YqGPipeType bo, HttpServletResponse response) {
+//        List<YqGPipeType> list = iGPipeTypeService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "管子类别", YqGPipeType.class, response);
+//    }
+
+    /**
+     * 获取管子类别详细信息
+     */
+//    @ApiOperation("获取管子类别详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:pipeType:query')")
+    @GetMapping("/{id}")
+    public R<YqGPipeType> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iGPipeTypeService.queryById(id));
+    }
+
+//    @GetMapping("/getList")
+//    public AjaxResult getList() {
+//        return AjaxResult.success(iGPipeTypeService.list());
+//    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGValveController.java

@@ -0,0 +1,85 @@
+package com.ruoyi.yiqi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+//import com.ruoyi.gas.domain.bo.GValveBo;
+//import com.ruoyi.gas.domain.vo.GValveVo;
+//import com.ruoyi.gas.service.IGValveService;
+import com.ruoyi.yiqi.entity.YqGValve;
+import com.ruoyi.yiqi.service.IYqGValveService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 自闭阀类别Controller
+ *
+ * @author ruoyi
+ * @date 2021-12-08
+ */
+@Validated
+//@Api(value = "自闭阀类别控制器", tags = {"自闭阀类别管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/valve")
+public class YqGValveController extends BaseController {
+
+    private final IYqGValveService iGValveService;
+
+    /**
+     * 查询自闭阀类别列表
+     */
+//    @ApiOperation("查询自闭阀类别列表")
+//    @PreAuthorize("@ss.hasPermi('gas:valve:list')")
+    @GetMapping("/list")
+    public TableDataInfo<YqGValve> list(@Validated(QueryGroup.class) YqGValve bo) {
+        return iGValveService.queryPageList(bo);
+    }
+
+    /**
+     * 导出自闭阀类别列表
+     */
+//    @ApiOperation("导出自闭阀类别列表")
+//    @PreAuthorize("@ss.hasPermi('gas:valve:export')")
+//    @Log(title = "自闭阀类别", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public void export(@Validated YqGValve bo, HttpServletResponse response) {
+//        List<YqGValve> list = iGValveService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "自闭阀类别", YqGValve.class, response);
+//    }
+
+    /**
+     * 获取自闭阀类别详细信息
+     */
+//    @ApiOperation("获取自闭阀类别详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:valve:query')")
+    @GetMapping("/{id}")
+    public R<YqGValve> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iGValveService.queryById(id));
+    }
+
+//    @GetMapping("/getList")
+//    public R getList() {
+//        return R.ok(iGValveService.list());
+//    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqSysDictDataController.java

@@ -2,9 +2,12 @@ package com.ruoyi.yiqi.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.YqSysDictData;
+import com.ruoyi.yiqi.entity.YqSysDict;
 import com.ruoyi.yiqi.service.IYqSysDictDataService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
@@ -30,10 +33,20 @@ public class YqSysDictDataController extends BaseController {
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public R<List<YqSysDictData>> dictType(@PathVariable String dictType) {
+    public R<List> dictType(@PathVariable String dictType) {
         List<YqSysDictData> data = dictDataService.selectDictDataByType(dictType);
         if (ObjectUtils.isEmpty(data)) {
             data = new ArrayList<>();
+        }else {
+            List<YqSysDict> list = new ArrayList<>();
+            for (YqSysDictData dictData: data) {
+                YqSysDict dict = new YqSysDict();
+                BeanUtils.copyProperties(dictData, dict);
+                dict.setValue(dict.getDictValue());
+                dict.setLabel(dict.getDictLabel());
+                list.add(dict);
+            }
+            return R.ok(list);
         }
         return R.ok(data);
     }

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGCensusVo.java

@@ -0,0 +1,33 @@
+package com.ruoyi.yiqi.entity;
+
+
+/**
+ * 统计图
+ *
+ * @author ruoyi
+ * @date 2021-11-12
+ */
+
+public class YqGCensusVo {
+
+
+
+	private int value;
+	private String name;
+
+	public int getValue() {
+		return value;
+	}
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGDownloadVo.java

@@ -0,0 +1,29 @@
+package com.ruoyi.yiqi.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+//import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * 工程管理视图对象 g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+//@ApiModel("工程管理视图对象")
+@ExcelIgnoreUnannotated
+public class YqGDownloadVo {
+
+	private static final long serialVersionUID = 1L;
+
+	private String picUrl;
+
+	private String house;
+	private String unit;
+	private String building;
+	private String area;
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGEnginePhoto.java

@@ -0,0 +1,42 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 其他工程照片对象 g_engine_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_engine_photo")
+public class YqGEnginePhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 工程id
+     */
+    private Long engineId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOrder.java

@@ -0,0 +1,108 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工程管理对象 g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_order")
+public class YqGOrder extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    private String value;
+
+    private List<String> photoList;
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 订单号
+     */
+    private String orderNum;
+    /**
+     * 服务类别
+     * 字典 ：001 上门未遇 002 正常施工 003 不符合规定
+     * 非字典 004安检 005维修  006开栓
+     */
+    private String serviceType;
+
+    /**
+     * 工人id
+     */
+    private Long userId;
+
+    private Long areaId;
+    private String areaName;
+    private Long buildingId;
+    private String buildingName;
+    private Long unitId;
+    private String unitName;
+    /**
+     * 房屋id
+     */
+    private Long houseId;
+    private String houseName;
+    /**
+     * 管子长度
+     */
+    private String pipeLength;
+    private String valveType;
+
+    /**
+     * 管子类别
+     */
+    private String pipeType;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+    /**
+     * 审核状态
+     */
+    private String examineStatus;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 审核意见
+     */
+    private String reason;
+    private Date time;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+    @Version
+    private Integer version;
+    private String whether;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOrderExportVoAnJian.java

@@ -0,0 +1,86 @@
+package com.ruoyi.yiqi.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+/**
+ * 安检维修导出vo g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+//@ApiModel("安检维修导出vo")
+@ExcelIgnoreUnannotated
+public class YqGOrderExportVoAnJian {
+
+	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+
+    /**
+     * 主键id
+     */
+//	@ApiModelProperty("主键id")
+	private Long id;
+
+	@ExcelProperty(value = "工人")
+	private String userName;
+
+	@ExcelProperty(value = "房屋")
+	private String house;
+
+//	@ApiModelProperty("订单时间")
+	@ExcelProperty(value = "订单时间")
+	private String time;
+
+//	@ApiModelProperty("修改时间")
+	@ExcelProperty(value = "修改时间")
+	private String updateTime;
+
+	@ExcelProperty(value = "是否合格")
+	private String whether;
+    /**
+     * 备注
+     */
+//	@ApiModelProperty("备注")
+	@ExcelProperty(value = "备注")
+	private String remark;
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(Date time) {
+		this.time = DateToString(time);
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = DateToString(updateTime);
+	}
+
+	/**
+	 * date类型时间转String类型时间（设置时区）
+	 * @param time
+	 * @return
+	 */
+	public static String DateToString(Date time){
+		TimeZone timeZoneSH = TimeZone.getTimeZone("Asia/Shanghai");
+		SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+		outputFormat.setTimeZone(timeZoneSH);
+		return outputFormat.format(time);
+	}
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOrderExportVoWeiXiu.java

@@ -0,0 +1,84 @@
+package com.ruoyi.yiqi.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+/**
+ * 安检维修导出vo g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+//@ApiModel("安检维修导出vo")
+@ExcelIgnoreUnannotated
+public class YqGOrderExportVoWeiXiu {
+
+	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+
+    /**
+     * 主键id
+     */
+//	@ApiModelProperty("主键id")
+	private Long id;
+
+	@ExcelProperty(value = "工人")
+	private String userName;
+
+	@ExcelProperty(value = "房屋")
+	private String house;
+
+	@ExcelProperty(value = "订单时间")
+	private String time;
+	@ExcelProperty(value = "修改时间")
+//	@ApiModelProperty("修改时间")
+	private String updateTime;
+
+	@ExcelProperty(value = "是否维修")
+	private String whether;
+    /**
+     * 备注
+     */
+//	@ApiModelProperty("备注")
+	@ExcelProperty(value = "备注")
+	private String remark;
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(Date time) {
+		this.time = DateToString(time);
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = DateToString(updateTime);
+	}
+
+	/**
+	 * date类型时间转String类型时间（设置时区）
+	 * @param time
+	 * @return
+	 */
+	public static String DateToString(Date time){
+		TimeZone timeZoneSH = TimeZone.getTimeZone("Asia/Shanghai");
+		SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+		outputFormat.setTimeZone(timeZoneSH);
+		return outputFormat.format(time);
+	}
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOrderPhoto.java

@@ -0,0 +1,56 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 照片对象 g_order_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-17
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_order_photo")
+public class YqGOrderPhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    private String objectKey;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOtherEngine.java

@@ -0,0 +1,99 @@
+package com.ruoyi.yiqi.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 其他工程对象 g_other_engine
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_other_engine")
+public class YqGOtherEngine extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 是否完工
+     */
+    @ExcelProperty(value = "是否完工", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "engine_status")
+//    @ApiModelProperty("是否完工")
+    private String status;
+    @ExcelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty("创建时间")
+    private Date time;
+    @ExcelProperty(value = "修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty("修改时间")
+//    private Date updateTime;
+    private List<String> photo;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 工程名
+     */
+    private String name;
+    /**
+     * 项目类型
+     */
+    private String engineType;
+    /**
+     * 工程地址
+     */
+    private String address;
+    /**
+     * 备注
+     */
+    private String remark;
+//    /**
+//     * 是否完工
+//     */
+//    private String status;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private Date time;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+    private String nbSort;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGPipeLength.java

@@ -0,0 +1,51 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 管子长度对象 g_pipe_length
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_pipe_length")
+public class YqGPipeLength extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 管子长度
+     */
+    private String pipeLength;
+    /**
+     *
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGPipeType.java

@@ -0,0 +1,51 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 管子类别对象 g_pipe_type
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_pipe_type")
+public class YqGPipeType extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 管子类别
+     */
+    private String pipeType;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGValve.java

@@ -0,0 +1,51 @@
+package com.ruoyi.yiqi.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 自闭阀类别对象 g_valve
+ *
+ * @author ruoyi
+ * @date 2021-12-08
+ */
+@Data
+@Accessors(chain = true)
+@TableName("yq_g_valve")
+public class YqGValve extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 自闭阀类别
+     */
+    private String valveType;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 分页大小
+     */
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @TableField(exist = false)
+    private Integer pageNum;
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqSysDict.java

@@ -0,0 +1,18 @@
+package com.ruoyi.yiqi.entity;
+
+import com.ruoyi.common.core.domain.entity.YqSysDictData;
+import lombok.Data;
+
+@Data
+public class YqSysDict extends YqSysDictData {
+
+    /**
+     * 字典标签
+     */
+    private String label;
+
+    /**
+     * 字典键值
+     */
+    private String value;
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGEnginePhotoMapper.java

@@ -0,0 +1,26 @@
+package com.ruoyi.yiqi.mapper;
+
+//import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+//import com.ruoyi.gas.domain.GEnginePhoto;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGEnginePhoto;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 其他工程照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+public interface YqGEnginePhotoMapper extends BaseMapperPlus<YqGEnginePhotoMapper, YqGEnginePhoto, YqGEnginePhoto> {
+
+
+    Page<YqGEnginePhoto> getList(@Param("p") YqGEnginePhoto bo, Page<?> page);
+    YqGEnginePhoto getById(Long id);
+    List<String> getPhoto(Long engineId);
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGOrderMapper.java

@@ -0,0 +1,53 @@
+package com.ruoyi.yiqi.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+//import com.ruoyi.gas.domain.GOrder;
+//import com.ruoyi.gas.domain.bo.GOrderBo;
+//import com.ruoyi.gas.domain.vo.*;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGCensusVo;
+import com.ruoyi.yiqi.entity.YqGOrder;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 工程管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+public interface YqGOrderMapper extends BaseMapperPlus<YqGOrderMapper, YqGOrder, YqGOrder> {
+
+    Page<YqGOrder> getListAll(@Param("p") YqGOrder bo, Page<?> page);
+    List<YqGOrder> getListExport(@Param("p") YqGOrder bo);
+    Page<YqGOrder> getListExamine(@Param("p") YqGOrder bo, Page<?> page);
+
+    YqGOrder getById(Long id);
+    Long getByIdAndVersion(@Param("id")Long id,@Param("version")Integer version);
+
+    //小区订单完成数
+    int getCount(Long id);
+    List<YqGCensusVo> getExaminePipeType(Long id);
+    List<YqGCensusVo> getExaminePipeLength(Long id);
+    List<YqGCensusVo> getExamineValveType(Long id);
+    //订单选择房屋校验
+    YqGOrder getOrderForStatus(@Param("houseId")Long houseId,@Param("id")String id);
+    Page<YqGOrder> getListByStatus(@Param("p") YqGOrder bo, Page<?> page);
+    //安检列表
+    Page<YqGOrder> getListAnJian(@Param("p") YqGOrder bo, Page<?> page);
+    //安检导出
+    List<YqGOrderExportVoAnJian> getListAnJianExport(@Param("p") YqGOrder bo);
+    //维修列表
+    Page<YqGOrder> getListWeiXiu(@Param("p") YqGOrder bo, Page<?> page);
+    //维修导出
+    List<YqGOrderExportVoWeiXiu> getListWeiXiuExport(@Param("p") YqGOrder bo);
+    //开栓列表
+    Page<YqGOrder> getListKaiShuan(@Param("p") YqGOrder bo, Page<?> page);
+    YqGOrder getByHouseId(Long houseId);
+    int updateOrderByHouseId(@Param("houseId") Long houseId);
+    int updateHouseId(@Param("xhouseId") Long xhouseId,@Param("yhouseId") Long yhouseId);
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGOrderPhotoMapper.java

@@ -0,0 +1,26 @@
+package com.ruoyi.yiqi.mapper;
+
+//import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+//import com.ruoyi.gas.domain.GOrderPhoto;
+//import com.ruoyi.gas.domain.vo.GDownloadVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGDownloadVo;
+import com.ruoyi.yiqi.entity.YqGOrderPhoto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-17
+ */
+public interface YqGOrderPhotoMapper extends BaseMapperPlus<YqGOrderPhotoMapper, YqGOrderPhoto, YqGOrderPhoto> {
+
+    List<String> getPicUrl(Long orderId);
+
+    List<YqGDownloadVo> getAll(@Param(value = "ids") List<Long> list);
+
+    int deleteByUrl(@Param("orderId") Long orderId, @Param("list") List<String> list);
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGOtherEngineMapper.java

@@ -0,0 +1,27 @@
+package com.ruoyi.yiqi.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGOtherEngine;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import org.apache.ibatis.annotations.Param;
+
+public interface YqGOtherEngineMapper extends BaseMapperPlus<YqGOtherEngineMapper,YqGOtherEngine, YqGOtherEngine> {
+
+    Page<YqGOtherEngine> getList(@Param("p") YqGOtherEngine bo, Page<?> page);
+    YqGOtherEngine getById(Long id);
+//    default YqGPipeLength queryById(Long id) {
+//        return selectOne(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .eq(YqGPipeLength::getId, id)
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+//
+//    default List<YqGPipeLength> selectList() {
+//        return selectList(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGPipeLengthMapper.java

@@ -0,0 +1,29 @@
+package com.ruoyi.yiqi.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+public interface YqGPipeLengthMapper extends BaseMapperPlus<YqGPipeLengthMapper,YqGPipeLength, YqGPipeLength> {
+
+    Page<YqGPipeLength> getList(@Param("p") YqGPipeLength bo, Page<?> page);
+    YqGPipeLength getById(Long id);
+//    default YqGPipeLength queryById(Long id) {
+//        return selectOne(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .eq(YqGPipeLength::getId, id)
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+//
+//    default List<YqGPipeLength> selectList() {
+//        return selectList(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGPipeTypeMapper.java

@@ -0,0 +1,32 @@
+package com.ruoyi.yiqi.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.entity.YqGUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface YqGPipeTypeMapper extends BaseMapperPlus<YqGPipeTypeMapper,YqGPipeType, YqGPipeType> {
+
+    Page<YqGPipeType> getList(@Param("p") YqGPipeType bo, Page<?> page);
+    YqGPipeType getById(Long id);
+
+
+//    default YqGPipeType queryById(Long id) {
+//        return selectOne(
+//                new LambdaQueryWrapper<YqGPipeType>()
+//                        .eq(YqGPipeType::getId, id)
+//                        .orderByAsc(YqGPipeType::getPipeLength));
+//    }
+//
+//    default List<YqGPipeType> selectList() {
+//        return selectList(
+//                new LambdaQueryWrapper<YqGPipeType>()
+//                        .orderByAsc(YqGPipeType::getPipeLength));
+//    }
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/mapper/YqGValveMapper.java

@@ -0,0 +1,27 @@
+package com.ruoyi.yiqi.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import com.ruoyi.yiqi.entity.YqGValve;
+import org.apache.ibatis.annotations.Param;
+
+public interface YqGValveMapper extends BaseMapperPlus<YqGValveMapper, YqGValve, YqGValve> {
+
+    Page<YqGValve> getList(@Param("p") YqGValve bo, Page<?> page);
+    YqGValve getById(Long id);
+//    default YqGPipeLength queryById(Long id) {
+//        return selectOne(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .eq(YqGPipeLength::getId, id)
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+//
+//    default List<YqGPipeLength> selectList() {
+//        return selectList(
+//                new LambdaQueryWrapper<YqGPipeLength>()
+//                        .orderByAsc(YqGPipeLength::getPipeLength));
+//    }
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGOrderService.java

@@ -0,0 +1,117 @@
+package com.ruoyi.yiqi.service;
+
+//import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.gas.domain.GOrder;
+//import com.ruoyi.gas.domain.bo.YqGOrder;
+//import com.ruoyi.gas.domain.vo.GCensusVo;
+//import com.ruoyi.gas.domain.vo.GOrderExportVoAnJian;
+//import com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu;
+//import com.ruoyi.gas.domain.vo.YqGOrder;
+import com.ruoyi.yiqi.entity.YqGCensusVo;
+import com.ruoyi.yiqi.entity.YqGOrder;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
+import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工程管理Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+public interface IYqGOrderService {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	YqGOrder queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<YqGOrder> queryPageList(YqGOrder bo);
+
+	/**
+	 * 查询列表
+	 */
+//	List<YqGOrder> queryList(YqGOrder bo);
+
+//	/**
+//	 * 根据新增业务对象插入工程管理
+//	 * @param bo 工程管理新增业务对象
+//	 * @return
+//	 */
+//	Boolean insertByBo(YqGOrder bo);
+//
+//	/**
+//	 * 根据编辑业务对象修改工程管理
+//	 * @param bo 工程管理编辑业务对象
+//	 * @return
+//	 */
+//	Boolean updateByBo(YqGOrder bo);
+//	Boolean submitY(List<Long> ids,String reason,Integer[] version);
+//	Boolean submitN(List<Long> ids,String reason,Integer[] version);
+//
+//	/**
+//	 * 校验并删除数据
+//	 * @param ids 主键集合
+//	 * @param isValid 是否校验,true-删除前校验,false-不校验
+//	 * @return
+//	 */
+//	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	TableDataInfo<YqGOrder> getListAll(YqGOrder bo);
+	TableDataInfo<YqGOrder> getListExamine(YqGOrder bo);
+
+	YqGOrder getById(Long id);
+	Long getByIdAndVersion(Long id,Integer version);//乐观锁用查询修改时是否有条数
+	List<YqGCensusVo> getExaminePipeType(Long id);
+	List<YqGCensusVo> getExaminePipeLength(Long id);
+	List<YqGCensusVo> getExamineValveType(Long id);
+	Boolean getOrderForStatus(Long houseId,String id);
+	TableDataInfo<YqGOrder> getListByStatus(YqGOrder bo);
+
+	/**
+	 * 导出
+	 * @param bo
+	 * @return
+	 */
+	List<YqGOrder> getListExport(YqGOrder bo);
+
+	/**
+	 * 安检列表
+	 * @param bo
+	 * @return
+	 */
+	TableDataInfo<YqGOrder> getListAnJian(YqGOrder bo);
+
+	/**
+	 * 安检导出
+	 * @param bo
+	 * @return
+	 */
+	List<YqGOrderExportVoAnJian> getListAnJianExport(YqGOrder bo);
+
+	/**
+	 * 维修列表
+	 * @param bo
+	 * @return
+	 */
+	TableDataInfo<YqGOrder> getListWeiXiu(YqGOrder bo);
+	/**
+	 * 维修导出
+	 * @param bo
+	 * @return
+	 */
+	List<YqGOrderExportVoWeiXiu> getListWeiXiuExport(YqGOrder bo);
+
+	/**
+	 * 开栓列表
+	 * @param bo
+	 * @return
+	 */
+	TableDataInfo<YqGOrder> getListKaiShuan(YqGOrder bo);
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGOtherEngineService.java

@@ -0,0 +1,37 @@
+package com.ruoyi.yiqi.service;
+
+//import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.gas.domain.GOtherEngine;
+//import com.ruoyi.gas.domain.bo.YqGOtherEngine;
+//import com.ruoyi.gas.domain.vo.YqGOtherEngine;
+import com.ruoyi.yiqi.entity.YqGOtherEngine;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 其他工程Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+public interface IYqGOtherEngineService {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	YqGOtherEngine queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<YqGOtherEngine> queryPageList(YqGOtherEngine bo);
+
+//	/**
+//	 * 查询列表
+//	 */
+//	List<YqGOtherEngine> queryList(YqGOtherEngine bo);
+
+	YqGOtherEngine getById(Long id);
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGPipeLengthService.java

@@ -0,0 +1,41 @@
+package com.ruoyi.yiqi.service;
+
+//import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+//import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.gas.domain.GPipeLength;
+//import com.ruoyi.gas.domain.bo.GPipeLengthBo;
+//import com.ruoyi.gas.domain.vo.GPipeLengthVo;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+//import com.ruoyi.zdsz_p1.domain.bo.GPipeLengthBo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 管子长度Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+//public interface IGPipeLengthService extends IServicePlus<GPipeLength, GPipeLengthVo> {
+public interface IYqGPipeLengthService {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+    YqGPipeLength queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<YqGPipeLength> queryPageList(YqGPipeLength bo);
+
+	/**
+	 * 查询列表
+	 */
+//	List<YqGPipeLength> queryList(YqGPipeLength bo);
+
+
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGPipeTypeService.java

@@ -0,0 +1,36 @@
+package com.ruoyi.yiqi.service;
+
+//import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.gas.domain.GPipeType;
+//import com.ruoyi.gas.domain.bo.GPipeTypeBo;
+//import com.ruoyi.gas.domain.vo.GPipeTypeVo;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 管子类别Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+public interface IYqGPipeTypeService {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+    YqGPipeType queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<YqGPipeType> queryPageList(YqGPipeType bo);
+
+//	/**
+//	 * 查询列表
+//	 */
+//	List<YqGPipeType> queryList(YqGPipeType bo);
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGValveService.java

@@ -0,0 +1,36 @@
+package com.ruoyi.yiqi.service;
+
+//import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.gas.domain.GValve;
+//import com.ruoyi.gas.domain.bo.YqGValve;
+//import com.ruoyi.gas.domain.vo.YqGValve;
+import com.ruoyi.yiqi.entity.YqGValve;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 自闭阀类别Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-08
+ */
+public interface IYqGValveService {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	YqGValve queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<YqGValve> queryPageList(YqGValve bo);
+
+//	/**
+//	 * 查询列表
+//	 */
+//	List<YqGValve> queryList(YqGValve bo);
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGOrderServiceImpl.java

@@ -0,0 +1,231 @@
+package com.ruoyi.yiqi.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.common.enums.Constants;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+//import com.ruoyi.gas.domain.GOrder;
+//import com.ruoyi.gas.domain.GOrderPhoto;
+//import com.ruoyi.gas.domain.bo.GOrderBo;
+//import com.ruoyi.gas.domain.vo.*;
+//import com.ruoyi.gas.mapper.GOrderMapper;
+//import com.ruoyi.gas.mapper.GOrderPhotoMapper;
+//import com.ruoyi.gas.service.IGOrderService;
+import com.ruoyi.yiqi.entity.*;
+import com.ruoyi.yiqi.enums.Constants;
+import com.ruoyi.yiqi.mapper.YqGOrderMapper;
+import com.ruoyi.yiqi.mapper.YqGOrderPhotoMapper;
+import com.ruoyi.yiqi.service.IYqGOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 工程管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Service
+public class YqGOrderServiceImpl implements IYqGOrderService {
+    @Resource
+    private YqGOrderMapper gOrderMapper;
+    @Resource
+    private YqGOrderPhotoMapper gOrderPhotoMapper;
+
+    @Override
+    public YqGOrder queryById(Long id) {
+        return gOrderMapper.getById(id);
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> queryPageList(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+//        Page<YqGOrder> list = gOrderMapper.getList(bo, page);
+        Page<YqGOrder> list = gOrderMapper.getListAll(bo, page);
+        return PageUtils.buildDataInfo(list);
+
+
+//        PagePlus<YqGOrder, YqGOrder> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        return PageUtils.buildDataInfo(result);
+    }
+
+//    @Override
+//    public List<YqGOrder> queryList(YqGOrder bo) {
+//        return listVo(buildQueryWrapper(bo));
+//    }
+
+//    private LambdaQueryWrapper<YqGOrder> buildQueryWrapper(YqGOrder bo) {
+//        Map<String, Object> params = bo.getParams();
+//        LambdaQueryWrapper<YqGOrder> lqw = Wrappers.lambdaQuery();
+//        lqw.eq(StringUtils.isNotBlank(bo.getServiceType()), YqGOrder::getServiceType, bo.getServiceType());
+//        lqw.eq(bo.getUserId() != null, YqGOrder::getUserId, bo.getUserId());
+//        lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), YqGOrder::getOrderStatus, bo.getOrderStatus());
+//        lqw.eq(StringUtils.isNotBlank(bo.getExamineStatus()), YqGOrder::getExamineStatus, bo.getExamineStatus());
+//        return lqw;
+//    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListAll(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListAll(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListExamine(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListExamine(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public YqGOrder getById(Long id) {
+        YqGOrder vo = gOrderMapper.getById(id);
+        List<String> picUrl = gOrderPhotoMapper.getPicUrl(vo.getId());
+        if (picUrl.size() > 0) {
+            vo.setPhotoList(picUrl);
+        }
+        return vo;
+    }
+
+    @Override
+    public Long getByIdAndVersion(Long id,Integer version) {
+        return gOrderMapper.getByIdAndVersion(id,version);
+    }
+
+    @Override
+    public List<YqGCensusVo> getExaminePipeType(Long id) {
+        List<YqGCensusVo> list1 = gOrderMapper.getExaminePipeType(id);
+        List<YqGCensusVo> list = new ArrayList<>();
+        list1.forEach(i -> {
+            if (StringUtils.isNotEmpty(i.getName())) {
+                list.add(i);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public List<YqGCensusVo> getExaminePipeLength(Long id) {
+        List<YqGCensusVo> list1 = gOrderMapper.getExaminePipeLength(id);
+        List<YqGCensusVo> list = new ArrayList<>();
+        list1.forEach(i -> {
+            if (StringUtils.isNotEmpty(i.getName())) {
+                list.add(i);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public List<YqGCensusVo> getExamineValveType(Long id) {
+        List<YqGCensusVo> list1 = gOrderMapper.getExamineValveType(id);
+        List<YqGCensusVo> list = new ArrayList<>();
+        list1.forEach(i -> {
+            if (StringUtils.isNotEmpty(i.getName())) {
+                list.add(i);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public Boolean getOrderForStatus(Long houseId, String id) {
+        YqGOrder vo = gOrderMapper.getOrderForStatus(houseId, id);
+        if (vo == null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListByStatus(YqGOrder bo) {
+        if (Constants.Dict.EXAMINE_STATUS001.getItemName().equals(bo.getValue())) {
+            bo.setValue(Constants.Dict.EXAMINE_STATUS001.getItemValue());
+        }
+        if (Constants.Dict.EXAMINE_STATUS002.getItemName().equals(bo.getValue())) {
+            bo.setValue(Constants.Dict.EXAMINE_STATUS002.getItemValue());
+        }
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListByStatus(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public List<YqGOrder> getListExport(YqGOrder bo) {
+        return gOrderMapper.getListExport(bo);
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListAnJian(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListAnJian(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListWeiXiu(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListWeiXiu(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public TableDataInfo<YqGOrder> getListKaiShuan(YqGOrder bo) {
+        Page<YqGOrder> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOrder> list = gOrderMapper.getListKaiShuan(bo, page);
+        //查看照片
+        list.getRecords().forEach(i -> {
+            List<String> picUrl = gOrderPhotoMapper.getPicUrl(i.getId());
+            i.setPhotoList(picUrl);
+        });
+        return PageUtils.buildDataInfo(list);
+    }
+
+    @Override
+    public List<YqGOrderExportVoAnJian> getListAnJianExport(YqGOrder bo) {
+        return gOrderMapper.getListAnJianExport(bo);
+    }
+
+    @Override
+    public List<YqGOrderExportVoWeiXiu> getListWeiXiuExport(YqGOrder bo) {
+        return gOrderMapper.getListWeiXiuExport(bo);
+    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGOtherEngineServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.yiqi.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+//import com.ruoyi.gas.domain.GEnginePhoto;
+//import com.ruoyi.gas.domain.GOtherEngine;
+//import com.ruoyi.gas.domain.bo.GOtherEngineBo;
+//import com.ruoyi.gas.domain.vo.GOtherEngineVo;
+//import com.ruoyi.gas.mapper.GEnginePhotoMapper;
+//import com.ruoyi.gas.mapper.GOtherEngineMapper;
+//import com.ruoyi.gas.service.IGOtherEngineService;
+import com.ruoyi.yiqi.entity.YqGOtherEngine;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.mapper.YqGEnginePhotoMapper;
+import com.ruoyi.yiqi.mapper.YqGOtherEngineMapper;
+import com.ruoyi.yiqi.service.IYqGOtherEngineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 其他工程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-22
+ */
+@Service
+public class YqGOtherEngineServiceImpl implements IYqGOtherEngineService {
+
+    @Resource
+    private YqGOtherEngineMapper mapper;
+    @Resource
+    private YqGEnginePhotoMapper gEnginePhotoMapper;
+    @Override
+    public YqGOtherEngine queryById(Long id){
+        return mapper.getById(id);
+    }
+
+    @Override
+    public TableDataInfo<YqGOtherEngine> queryPageList(YqGOtherEngine bo) {
+        Page<YqGOtherEngine> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGOtherEngine> list = mapper.getList(bo, page);
+        list.getRecords().forEach(i->{
+            List<String> photo = gEnginePhotoMapper.getPhoto(i.getId());
+            i.setPhoto(photo);
+        });
+        return PageUtils.buildDataInfo(list);
+
+//
+//
+//        PagePlus<YqGOtherEngine, YqGOtherEngine> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        result.getRecordsVo().forEach(i->{
+//            List<String> photo = gEnginePhotoMapper.getPhoto(i.getId());
+//            i.setPhoto(photo);
+//        });
+//        return PageUtils.buildDataInfo(result);
+    }
+
+//    @Override
+//    public List<YqGOtherEngine> queryList(YqGOtherEngine bo) {
+//        return listVo(buildQueryWrapper(bo));
+//    }
+//
+//    private LambdaQueryWrapper<YqGOtherEngine> buildQueryWrapper(YqGOtherEngine bo) {
+//        Map<String, Object> params = bo.getParams();
+//        LambdaQueryWrapper<YqGOtherEngine> lqw = Wrappers.lambdaQuery();
+//        lqw.like(StringUtils.isNotBlank(bo.getName()), YqGOtherEngine::getName, bo.getName());
+//        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), YqGOtherEngine::getStatus, bo.getStatus());
+//        lqw.eq(StringUtils.isNotBlank(bo.getEngineType()), YqGOtherEngine::getEngineType, bo.getEngineType());
+//        lqw.orderByAsc(YqGOtherEngine::getNbSort);
+//        lqw.orderByDesc(YqGOtherEngine::getUpdateTime);
+//        return lqw;
+//    }
+    @Override
+    public YqGOtherEngine getById(Long id) {
+        YqGOtherEngine vo = queryById(id);
+        List<String> photo = gEnginePhotoMapper.getPhoto(vo.getId());
+        if (photo.size()>0){
+            vo.setPhoto(photo);
+        }
+        return vo;
+    }
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGPipeLengthServiceImpl.java

@@ -0,0 +1,71 @@
+package com.ruoyi.yiqi.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.yiqi.entity.YqGPipeLength;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.mapper.YqGPipeLengthMapper;
+import com.ruoyi.yiqi.mapper.YqSysDictDataMapper;
+import com.ruoyi.yiqi.service.IYqGPipeLengthService;
+//import com.ruoyi.zdsz_p1.domain.vo.GPipeLengthVo;
+//import com.ruoyi.zdsz_p1.service.IGPipeLengthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 管子长度Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Service
+//public class GPipeLengthServiceImpl extends ServicePlusImpl<GPipeLengthMapper, GPipeLength, GPipeLengthVo> implements IGPipeLengthService {
+public class YqGPipeLengthServiceImpl implements IYqGPipeLengthService {
+    @Resource
+    private YqGPipeLengthMapper mapper;
+    @Override
+    public YqGPipeLength queryById(Long id){
+        return mapper.getById(id);
+    }
+
+    @Override
+    public TableDataInfo<YqGPipeLength> queryPageList(YqGPipeLength bo) {
+        Page<YqGPipeLength> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGPipeLength> list = mapper.getList(bo, page);
+        return PageUtils.buildDataInfo(list);
+    }
+
+//    @Override
+//    public TableDataInfo<YqGPipeLength> queryPageList(YqGPipeLength bo, PageQuery pageQuery) {
+//
+//        Page<YqGPipeLength> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+//        Page<YqGPipeLength> list = mapper.selectList(bo, page);
+//
+//
+//        PagePlus<YqGPipeLength, YqGPipeLength> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        return PageUtils.buildDataInfo(result);
+//    }
+
+//    @Override
+//    public List<YqGPipeLength> queryList(YqGPipeLength bo) {
+//        return mapper.selectList();
+//    }
+//
+//    private LambdaQueryWrapper<YqGPipeLength> buildQueryWrapper(YqGPipeLength bo) {
+//        Map<String, Object> params = bo.getParams();
+//        LambdaQueryWrapper<YqGPipeLength> lqw = Wrappers.lambdaQuery();
+//        return lqw;
+//    }
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGPipeTypeServiceImpl.java

@@ -0,0 +1,69 @@
+package com.ruoyi.yiqi.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+//import com.ruoyi.gas.domain.GPipeType;
+//import com.ruoyi.gas.domain.bo.GPipeTypeBo;
+//import com.ruoyi.gas.domain.vo.GPipeTypeVo;
+//import com.ruoyi.gas.mapper.GPipeTypeMapper;
+//import com.ruoyi.gas.service.IGPipeTypeService;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.entity.YqGUser;
+import com.ruoyi.yiqi.mapper.YqGPipeLengthMapper;
+import com.ruoyi.yiqi.mapper.YqGPipeTypeMapper;
+import com.ruoyi.yiqi.service.IYqGPipeTypeService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 管子类别Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Service
+public class YqGPipeTypeServiceImpl  implements IYqGPipeTypeService {
+    @Autowired
+    private YqGPipeTypeMapper mapper;
+
+//    @Override
+//    Page<YqGPipeType> getList(@Param("p") YqGPipeType bo, Page<?> page);
+    @Override
+    public YqGPipeType queryById(Long id){
+        return mapper.getById(id);
+    }
+
+    @Override
+    public TableDataInfo<YqGPipeType> queryPageList(YqGPipeType bo) {
+        Page<YqGPipeType> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGPipeType> list = mapper.getList(bo, page);
+        return PageUtils.buildDataInfo(list);
+
+
+//        PagePlus<YqGPipeType, YqGPipeType> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        return PageUtils.buildDataInfo(result);
+    }
+
+//    @Override
+//    public List<YqGPipeType> queryList(YqGPipeType bo) {
+//        return listVo(buildQueryWrapper(bo));
+//    }
+//
+//    private LambdaQueryWrapper<YqGPipeType> buildQueryWrapper(YqGPipeType bo) {
+//        Map<String, Object> params = bo.getParams();
+//        LambdaQueryWrapper<YqGPipeType> lqw = Wrappers.lambdaQuery();
+//        return lqw;
+//    }
+
+}

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGValveServiceImpl.java

@@ -0,0 +1,64 @@
+package com.ruoyi.yiqi.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+//import com.ruoyi.gas.domain.GValve;
+//import com.ruoyi.gas.domain.bo.GValveBo;
+//import com.ruoyi.gas.domain.vo.GValveVo;
+//import com.ruoyi.gas.mapper.GValveMapper;
+//import com.ruoyi.gas.service.IGValveService;
+import com.ruoyi.yiqi.entity.YqGPipeType;
+import com.ruoyi.yiqi.entity.YqGValve;
+import com.ruoyi.yiqi.mapper.YqGValveMapper;
+import com.ruoyi.yiqi.mapper.YqSysDictDataMapper;
+import com.ruoyi.yiqi.service.IYqGValveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 自闭阀类别Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-08
+ */
+@Service
+public class YqGValveServiceImpl implements IYqGValveService {
+    @Resource
+    private YqGValveMapper mapper;
+    @Override
+    public YqGValve queryById(Long id){
+        return mapper.getById(id);
+    }
+
+    @Override
+    public TableDataInfo<YqGValve> queryPageList(YqGValve bo) {
+        Page<YqGValve> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<YqGValve> list = mapper.getList(bo, page);
+        return PageUtils.buildDataInfo(list);
+
+//        PagePlus<YqGValve, YqGValve> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        return PageUtils.buildDataInfo(result);
+    }
+
+//    @Override
+//    public List<YqGValve> queryList(YqGValve bo) {
+//        return listVo(buildQueryWrapper(bo));
+//    }
+
+//    private LambdaQueryWrapper<YqGValve> buildQueryWrapper(YqGValve bo) {
+//        Map<String, Object> params = bo.getParams();
+//        LambdaQueryWrapper<YqGValve> lqw = Wrappers.lambdaQuery();
+//        return lqw;
+//    }
+}

ruoyi-yiqi/src/main/resources/mapper/YqGEnginePhotoMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGEnginePhotoMapper">
+
+    <select id="getList" resultType="com.ruoyi.yiqi.entity.YqGEnginePhoto">
+        select *
+        from yq_g_engine_photo a
+        <where>
+            a.del_flag = '0'
+        </where>
+    </select>
+
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGEnginePhoto">
+        select *
+        from yq_g_engine_photo a
+        <where>
+            a.id = #{id}
+        </where>
+    </select>
+
+    <resultMap type="com.ruoyi.yiqi.entity.YqGEnginePhoto" id="GEnginePhotoResult">
+        <result property="id" column="id"/>
+        <result property="engineId" column="engine_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+<select id="getPhoto" resultType="java.lang.String">
+    select pic_url from yq_g_engine_photo
+    where engine_id = #{engineId}
+</select>
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGOrderMapper.xml

@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGOrderMapper">
+    <resultMap type="com.ruoyi.yiqi.entity.YqGOrder" id="GOrderResult">
+        <result property="id" column="id"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="serviceType" column="service_type"/>
+        <result property="userId" column="user_id"/>
+        <result property="houseId" column="house_id"/>
+        <result property="time" column="time"/>
+        <result property="pipeType" column="pipe_type"/>
+        <result property="pipeLength" column="pipe_length"/>
+        <result property="valveType" column="valve_type"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="examineStatus" column="examine_status"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="reason" column="reason"/>
+        <result property="version" column="version"/>
+    </resultMap>
+
+    <select id="getListAll" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select
+        if(CONCAT(
+        f.dict_label,
+        '-',
+        e.NAME,
+        '-',
+        d.NAME,
+        '-',
+        c.NAME,
+        '-',
+        b.NAME
+        ) is null,null,(select go.id from g_order go where go.house_id = a.house_id and go.del_flag='0' and go.service_type='004' order by go.time desc LIMIT 1)) as anjianId,
+        a.id as id,
+        a.service_type as serviceType,
+        u.name as userName,
+        a.pipe_type as pipeType,
+        a.pipe_length as pipeLength,
+        a.valve_type as valveType,
+        a.order_status as orderStatus,
+        a.examine_status as examineStatus,
+        a.remark as remark,
+        a.time as time,
+        a.whether as whether,
+        a.version as version,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and a.service_type not in ('004','005','006')
+
+        <if test="p.serviceType != null  and p.serviceType != ''">
+            and a.service_type = #{p.serviceType}
+        </if>
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.orderStatus != null  and p.orderStatus != ''">
+            and a.order_status = #{p.orderStatus}
+        </if>
+        <if test="p.examineStatus != null  and p.examineStatus != ''">
+            and a.examine_status = #{p.examineStatus}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by time desc
+    </select>
+    <select id="getListExport" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        a.service_type as serviceType,
+        u.name as userName,
+        a.pipe_type as pipeType,
+        a.pipe_length as pipeLength,
+        a.valve_type as valveType,
+        a.order_status as orderStatus,
+        a.examine_status as examineStatus,
+        a.remark as remark,
+        a.time as exportTime,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether,
+        a.version as version,
+        a.house_id as houseId,
+        a.reason as reason
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id  and e.del_flag = '0')
+        left join sys_dict_data f on e.district = f.dict_value
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and a.service_type not in ('004','005','006')
+        and f.dict_type='district'
+        <if test="p.serviceType != null  and p.serviceType != ''">
+            and a.service_type = #{p.serviceType}
+        </if>
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.orderStatus != null  and p.orderStatus != ''">
+            and a.order_status = #{p.orderStatus}
+        </if>
+        <if test="p.examineStatus != null  and p.examineStatus != ''">
+            and a.examine_status = #{p.examineStatus}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by time desc
+    </select>
+    <select id="getListExamine" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        a.service_type as serviceType,
+        u.name as userName,
+        a.pipe_type as pipeType,
+        a.pipe_length as pipeLength,
+        a.valve_type as valveType,
+        a.order_status as orderStatus,
+        a.examine_status as examineStatus,
+        a.remark as remark,
+        a.time as time,
+        a.whether as whether,
+        a.version as version,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id  and e.del_flag = '0')
+        left join sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0' and a.order_status = '001'
+        and a.service_type not in ('004','005','006')
+        <if test="p.serviceType != null  and p.serviceType != ''">
+            and a.service_type = #{p.serviceType}
+        </if>
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.orderStatus != null  and p.orderStatus != ''">
+            and a.order_status = #{p.orderStatus}
+        </if>
+        <if test="p.examineStatus != null  and p.examineStatus != ''">
+            and a.examine_status = #{p.examineStatus}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by time desc
+    </select>
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select * from g_order a
+                              left join g_house b on a.house_id = b.id
+                              left join g_unit c on b.unit_id = c.id
+                              left join g_building d on c.building_id = d.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+    <select id="getByIdAndVersion" resultType="java.lang.Long">
+        select count(*) from g_order
+        where id = #{id} and del_flag = '0' and version = #{version}
+    </select>
+    <select id="getCount" resultType="java.lang.Integer">
+        select count(DISTINCT o.house_id)
+        from g_order o
+                     left join g_house a on ( o.house_id = a.id and a.del_flag = '0')
+                     left join g_unit b on ( a.unit_id = b.id and b.del_flag = '0')
+                     left join g_building c on ( b.building_id = c.id and c.del_flag = '0')
+                     left join g_area d on ( c.area_id = d.id and d.del_flag = '0')
+        where d.id = #{id}
+          and o.del_flag = '0'
+          and o.order_status = '002'
+          and o.service_type = '002'
+    </select>
+    <select id="getExaminePipeType" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
+        select count(DISTINCT o.id) as value,
+            o.pipe_type as name
+        from g_order o
+                left join g_house a on ( o.house_id = a.id and a.del_flag = '0')
+                left join g_unit b on ( a.unit_id = b.id and b.del_flag = '0')
+                left join g_building c on ( b.building_id = c.id and c.del_flag = '0')
+                left join g_area d on ( c.area_id = d.id and d.del_flag = '0')
+        where o.service_type = '002'
+        and o.del_flag = '0'
+        <if test="id != null  and id != ''">
+            and d.id = #{id}
+        </if>
+        group by o.pipe_type
+    </select>
+    <select id="getExaminePipeLength" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
+        select count(DISTINCT o.id) as value,
+            o.pipe_length as name
+        from g_order o
+                left join g_house a on ( o.house_id = a.id and a.del_flag = '0')
+                left join g_unit b on ( a.unit_id = b.id  and b.del_flag = '0')
+                left join g_building c on ( b.building_id = c.id  and c.del_flag = '0')
+                left join g_area d on ( c.area_id = d.id  and d.del_flag = '0')
+        where
+        o.service_type = '002'
+          and o.del_flag = '0'
+        <if test="id != null  and id != ''">
+            and d.id = #{id}
+        </if>
+        group by o.pipe_length
+    </select>
+    <select id="getExamineValveType" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
+        select count(DISTINCT o.id) as value,
+        o.valve_type as name
+        from g_order o
+        left join g_house a on ( o.house_id = a.id and a.del_flag = '0')
+        left join g_unit b on ( a.unit_id = b.id and b.del_flag = '0')
+        left join g_building c on ( b.building_id = c.id and c.del_flag = '0')
+        left join g_area d on ( c.area_id = d.id and d.del_flag = '0')
+        where o.service_type = '002'
+        and o.del_flag = '0'
+        <if test="id != null  and id != ''">
+            and d.id = #{id}
+        </if>
+        group by o.valve_type
+    </select>
+    <select id="getOrderForStatus" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select * from g_order
+        where house_id= #{houseId}
+        and del_flag = '0'
+            and service_type ='002'
+            and
+       (( examine_status='001')
+       or (order_status = '001'))
+        <if test="id != null  and id!= ''">
+            and id != #{id}
+        </if>
+        limit 1
+    </select>
+    <select id="getListByStatus" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        a.service_type as serviceType,
+        u.name as userName,
+        a.pipe_type as pipeType,
+        a.pipe_length as pipeLength,
+        a.valve_type as valveType,
+        a.order_status as orderStatus,
+        a.examine_status as examineStatus,
+        a.remark as remark,
+        a.time as time,
+        a.whether as whether,
+        a.version as version,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on a.house_id = b.id
+        left join g_unit c on b.unit_id = c.id
+        left join g_building d on c.building_id = d.id
+        left join g_area e on d.area_id = e.id
+        left join sys_dict_data f on e.district = f.dict_value
+        where a.del_flag = '0'
+        and a.service_type not in ('004','005','006')
+        and f.dict_type='district'
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.workerId != null  and p.workerId != ''">
+            and a.user_id = #{p.workerId}
+        </if>
+        <if test="p.value != null  and p.value != ''">
+            and a.examine_status = #{p.value}
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by time desc
+    </select>
+    <select id="getListAnJian" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        u.name as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        a.whether as whether,
+        a.version as version,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join g_user u on a.user_id = u.id
+        left join sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
+        where a.del_flag = '0' and a.service_type ='004'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by a.update_time desc
+    </select>
+    <select id="getListAnJianExport" resultType="com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian">
+        select a.id as id,
+        u.name as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join g_user u on a.user_id = u.id
+        left join sys_dict_data f on e.district = f.dict_value
+        where a.del_flag = '0'
+        and a.service_type ='004'
+        and f.dict_type='district'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by a.update_time desc,userName
+    </select>
+    <select id="getListWeiXiu" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        u.name as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        a.whether as whether,
+        a.version as version,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join sys_dict_data f on ( e.district = f.dict_value AND f.dict_type='district')
+        left join g_user u on a.user_id = u.id
+        where a.service_type ='005' and a.del_flag = '0'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by a.update_time desc
+    </select>
+    <select id="getListWeiXiuExport" resultType="com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu">
+        select a.id as id,
+        u.name as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join sys_dict_data f on e.district = f.dict_value
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and a.service_type ='005'
+        and f.dict_type='district'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by a.update_time desc,userName
+    </select>
+    <select id="getListKaiShuan" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select a.id as id,
+        u.name as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
+        from g_order a
+        left join g_house b on ( a.house_id = b.id and b.del_flag = '0')
+        left join g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
+        left join g_building d on ( c.building_id = d.id and d.del_flag = '0')
+        left join g_area e on ( d.area_id = e.id and e.del_flag = '0')
+        left join sys_dict_data f on e.district = f.dict_value
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and a.service_type ='006'
+        and f.dict_type='district'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        <if test=" p.district != null">
+            and e.district = #{p.district}
+        </if>
+        order by a.update_time desc
+    </select>
+    <select id="getByHouseId" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+        select * from g_order
+        where house_id = #{houseId}
+            and service_type = "002"
+          and del_flag = '0'
+    </select>
+    <update id="updateOrderByHouseId" parameterType="java.lang.Long">
+        update g_order set examine_status='001', order_status='002' where house_id=#{houseId} and service_type='002'
+    </update>
+
+    <update id="updateHouseId" parameterType="java.lang.Long">
+        update g_order set house_id=#{xhouseId} where house_id=#{yhouseId}
+    </update>
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGOrderPhotoMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGOrderPhotoMapper">
+    <resultMap type="com.ruoyi.yiqi.entity.YqGOrderPhoto" id="GOrderPhotoResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="objectKey" column="object_key"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <select id="getPicUrl" resultType="java.lang.String">
+        select pic_url
+        from g_order_photo
+        where order_id = #{orderId}
+          and del_flag = '0'
+    </select>
+    <select id="getAll" resultType="com.ruoyi.yiqi.entity.YqGDownloadVo">
+        select a.pic_url as picUrl,
+        c.name as house,
+        d.name as unit,
+        e.name as building,
+        f.name as area
+        from g_order_photo a
+        left join g_order b on a.order_id = b.id
+        left join g_house c on b.house_id = c.id
+        left join g_unit d on c.unit_id = d.id
+        left join g_building e on d.building_id=e.id
+        left join g_area f on e.area_id = f.id
+        where b.id in
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and ((b.service_type = '002')or(b.service_type = '004')or(b.service_type = '005')or(b.service_type = '006'))
+        and b.del_flag = '0'
+    </select>
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_order_photo where order_id = #{orderId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGOtherEngineMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGOtherEngineMapper">
+
+    <select id="getList" resultType="com.ruoyi.yiqi.entity.YqGOtherEngine">
+        select *
+        from yq_g_other_engine a
+        <where>
+            a.del_flag = '0'
+        </where>
+    </select>
+
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGOtherEngine">
+        select *
+        from yq_g_other_engine a
+        <where>
+            a.id = #{id}
+        </where>
+    </select>
+
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGPipeLengthMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGPipeLengthMapper">
+    <resultMap type="com.ruoyi.yiqi.entity.YqGPipeLength" id="GOrderResult">
+        <result property="id" column="id"/>
+        <result property="pipeLength" column="pipe_length"/>
+<!--        <result property="remark" column="remark"/>-->
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+<!--        <result property="reason" column="reason"/>-->
+<!--        <result property="version" column="version"/>-->
+    </resultMap>
+
+    <select id="getList" resultType="com.ruoyi.yiqi.entity.YqGPipeLength">
+        select *
+        from yq_g_pipe_length a
+        <where>
+            a.del_flag = '0'
+        </where>
+    </select>
+
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGPipeLength">
+        select *
+        from yq_g_pipe_type a
+        <where>
+            a.id = #{id}
+        </where>
+    </select>
+
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGPipeTypeMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGPipeTypeMapper">
+    <resultMap type="com.ruoyi.yiqi.entity.YqGPipeType" id="GOrderResult">
+        <result property="id" column="id"/>
+        <result property="pipeType" column="pipe_type"/>
+<!--        <result property="remark" column="remark"/>-->
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+<!--        <result property="reason" column="reason"/>-->
+<!--        <result property="version" column="version"/>-->
+    </resultMap>
+
+    <select id="getList" resultType="com.ruoyi.yiqi.entity.YqGPipeType">
+        select *
+        from yq_g_pipe_type a
+        <where>
+            a.del_flag = '0'
+        </where>
+    </select>
+
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGPipeType">
+        select *
+        from yq_g_pipe_type a
+        <where>
+            a.id = #{id}
+        </where>
+    </select>
+
+</mapper>

ruoyi-yiqi/src/main/resources/mapper/YqGValveMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.yiqi.mapper.YqGValveMapper">
+
+    <select id="getList" resultType="com.ruoyi.yiqi.entity.YqGValve">
+        select *
+        from yq_g_valve a
+        <where>
+            a.del_flag = '0'
+        </where>
+    </select>
+
+    <select id="getById" resultType="com.ruoyi.yiqi.entity.YqGValve">
+        select *
+        from yq_g_valve a
+        <where>
+            a.id = #{id}
+        </where>
+    </select>
+
+</mapper>