版本1.4.1 阀井目录修改

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GRegulatingBoxMaintenanceController.java

@@ -11,6 +11,7 @@ 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.BatchReviewBo;
+import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
 import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
 import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
@@ -42,13 +43,23 @@ import java.util.List;
 public class GRegulatingBoxMaintenanceController extends BaseController {
 
     private final IGRegulatingBoxMaintenanceService iGRegulatingBoxMaintenanceService;
+    @Autowired
+    private IGRegulatingBoxMaintenanceService maintenanceService;
 
-    // 批量审核
+    /**
+     * 批量审核
+     */
     @PostMapping("batchReview")
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGRegulatingBoxMaintenanceService.batchReview(bo));
     }
-
+    /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GRegulatingBoxMaintenanceBo bo) {
+        return maintenanceService.queryPageList(bo);
+    }
     /**
      * 查询调压箱维护列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GValveWellInspectionController.java

@@ -11,10 +11,13 @@ 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.BatchReviewBo;
+import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
+import com.ruoyi.gas.domain.bo.GValvewellInspectionProcessBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
 import com.ruoyi.gas.service.IGValveWellInspectionService;
+import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -43,11 +46,24 @@ import java.util.List;
 public class GValveWellInspectionController extends BaseController {
 
     private final IGValveWellInspectionService iGValveWellInspectionService;
+    @Autowired
+    private IGValvewellInspectionProcessService inspectionProcessService;
+
+    /**
+     * 批量审核
+     */
     @PostMapping("batchReview")
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGValveWellInspectionService.batchReview(bo));
     }
     /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GValvewellInspectionProcessBo bo) {
+        return inspectionProcessService.queryPageList(bo);
+    }
+    /**
      * 查询阀井巡查列表
      */
     @ApiOperation("查询阀井巡查列表")

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GValveWellPositionBo.java

@@ -10,6 +10,8 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 阀井位置业务对象 g_valve_well_position
@@ -99,4 +101,7 @@ public class GValveWellPositionBo extends BaseEntity {
     private String isXyxjcnkg;
     private String remarks;
 
+    //时间范围查询
+    private List<Date> createTimes;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -51,7 +51,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
             GMaintenanceProcess processBo = new GMaintenanceProcess();
             processBo.setEmrId(item);
             processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getRemarks());
+            processBo.setProcessComments(bo.getProcessComments());
             processBo.setUserPost(bo.getPostNameArias());
 
             processList.add(processBo);
@@ -64,26 +64,21 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
     }
 
     private void updateNetworkManage(Collection<GRegulatingBoxMaintenance> gRegulatingBoxMaintenances) {
-        Collection<GRegulatingBoxMaintenance> todoList = new ArrayList<>();
         gRegulatingBoxMaintenances.stream().forEach(obj->{
             QueryWrapper<GMaintenanceProcess> queryWrapper = new QueryWrapper<GMaintenanceProcess>().eq("emr_id", obj.getId());
             List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(queryWrapper);
             if (listed.stream().filter(o->o.getProcessStatus().equals("0")).count()==2) {
                 obj.setProcessStatus("0");
-                todoList.add(obj);
+                updateById(obj);
             }else if (listed.stream().anyMatch(o -> o.getProcessStatus().equals("1"))) {
                 obj.setProcessStatus("1");
-                todoList.add(obj);
+                updateById(obj);
             }
         });
-        if (!ObjectUtils.isEmpty(todoList)){
-            updateBatchById(todoList);
-        }
     }
 
     @Override
     public GRegulatingBoxMaintenanceVo queryById(Long id) {
-
         GRegulatingBoxMaintenanceVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(id));
         voById.setCreateByName(baseMapper.getName(voById.getCreateBy()));
@@ -242,10 +237,12 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
+        if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        igMaintenanceProcessService.remove(new QueryWrapper<GMaintenanceProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellPositionServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRegulatorBox;
 import com.ruoyi.gas.domain.GValveWellPosition;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
@@ -110,6 +111,10 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GValveWellPosition::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GValveWellPosition::getLatitude, bo.getLatitude());
         lqw.orderByDesc(GValveWellPosition::getCreateTime);
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(1));
+        }
         return lqw;
     }