版本1.4.1 庭院管网

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GCourtyardNetworkManagementController.java

@@ -13,13 +13,11 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.obs.FileUtil;
-import com.ruoyi.gas.domain.bo.BatchReviewBo;
-import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
-import com.ruoyi.gas.domain.bo.GValvewellInspectionProcessBo;
-import com.ruoyi.gas.domain.bo.zipFileBo;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
 import com.ruoyi.gas.domain.vo.GValvewellInspectionProcessVo;
 import com.ruoyi.gas.service.IGCourtyardNetworkManagementService;
+import com.ruoyi.gas.service.IGCourtyardProcessService;
 import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import com.ruoyi.gas.utils.FileInstallUtils;
 import io.swagger.annotations.Api;
@@ -52,7 +50,7 @@ import java.util.List;
 public class GCourtyardNetworkManagementController extends BaseController {
 
     private final IGCourtyardNetworkManagementService iGCourtyardNetworkManagementService;
-    private final IGValvewellInspectionProcessService processService;
+    private final IGCourtyardProcessService processService;
    @Resource
     private  FileInstallUtils fileInstallUtils;
 
@@ -67,7 +65,7 @@ public class GCourtyardNetworkManagementController extends BaseController {
      * 查询审核明细
      */
     @GetMapping("/reviewList")
-    public TableDataInfo<GValvewellInspectionProcessVo> reviewList(@Validated(QueryGroup.class) GValvewellInspectionProcessBo bo) {
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GCourtyardProcessBo bo) {
         return processService.queryPageList(bo);
     }
 

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

@@ -9,6 +9,7 @@ public class BatchReviewBo {
 
     private List<Long> uids;
     private String processStatus;
+    private String processComments;
     private String remarks;
     //岗位
     private String postNameArias;

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,6 +32,8 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
 
     //岗位
     private String postNameArias;
+    //时间
+    private List<Date> createTimes;
 
     /**
      * 主键id

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GCourtyardProcessVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@ import java.util.Date;
 @Data
 @ApiModel("庭院网管巡查审核视图对象")
 @ExcelIgnoreUnannotated
-public class GCourtyardProcessVo {
+public class GCourtyardProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRoadSectionInspectionService.java

@@ -18,7 +18,6 @@ import java.util.List;
  */
 public interface IGRoadSectionInspectionService extends IServicePlus<GRoadSectionInspection, GRoadSectionInspectionVo> {
 
-	Boolean batchReview(BatchReviewBo bo);
 	/**
 	 * 查询单个
 	 * @return

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
 import com.ruoyi.gas.domain.GCourtyardProcess;
@@ -58,7 +59,7 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             GCourtyardProcess processBo = new GCourtyardProcess();
             processBo.setEmrId(item);
             processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getRemarks());
+            processBo.setProcessComments(bo.getProcessComments());
             processBo.setUserPost(bo.getPostNameArias());
             processList.add(processBo);
             boxList.add(gCourtyardNetworkManagement);
@@ -72,21 +73,17 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
 
 //    @Async
     public void updateNetworkManage(Collection<GCourtyardNetworkManagement> boxList) {
-        Collection<GCourtyardNetworkManagement> todoList = new ArrayList<>();
         boxList.stream().forEach(obj->{
             QueryWrapper<GCourtyardProcess> queryWrapper = new QueryWrapper<GCourtyardProcess>().eq("emr_id", obj.getId());
             List<GCourtyardProcess> listed = igCourtyardProcessService.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);
-        }
     }
 
 
@@ -203,6 +200,9 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             processBo.setProcessStatus(bo.getProcessStatus());
             processBo.setProcessComments(bo.getProcessComments());
             processBo.setUserPost(bo.getPostNameArias());
+//            processBo.setCreateBy(SecurityUtils.getUserId().toString());
+//            processBo.setCreateTime(new Date());
+            processBo.setUserPost(bo.getPostNameArias());
             igCourtyardProcessService.insertByBo(processBo);
         }
         if (piclist != null) {
@@ -250,10 +250,12 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        igCourtyardProcessService.remove(new QueryWrapper<GCourtyardProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
 }

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

@@ -36,18 +36,6 @@ import java.util.stream.Collectors;
 public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSectionInspectionMapper, GRoadSectionInspection, GRoadSectionInspectionVo> implements IGRoadSectionInspectionService {
 
     @Override
-    public Boolean batchReview(BatchReviewBo bo) {
-        Collection<GRoadSectionInspection> boxList = new ArrayList<>();
-        bo.getUids().forEach(item -> {
-            GRoadSectionInspection gRoadSectionInspection = new GRoadSectionInspection();
-            gRoadSectionInspection.setId(item);
-            gRoadSectionInspection.setProcessStatus(bo.getProcessStatus());
-            gRoadSectionInspection.setProcessComments(bo.getRemarks());
-            boxList.add(gRoadSectionInspection);
-        });
-        return updateBatchById(boxList);
-    }
-    @Override
     public GRoadSectionInspectionVo queryById(Long id) {
         GRoadSectionInspectionVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(voById.getId()));
@@ -178,7 +166,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 GRoadSectionInspection roadSectionInspection = new GRoadSectionInspection();
                 roadSectionInspection.setId(item);
                 roadSectionInspection.setProcessStatus(bo.getProcessStatus());
-                roadSectionInspection.setRemarks(bo.getRemarks());
+                roadSectionInspection.setProcessComments(bo.getRemarks());
                 list.add(roadSectionInspection);
             });
         }

ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -48,6 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.areaId != null and p.areaId != ''">
                 and c.area_id = #{p.areaId}
             </if>
+            <if test="p.createTimes != null and p.createTimes.size() > 1">
+                and a.create_time BETWEEN #{p.createTimes[0]} and #{p.createTimes[1]}
+            </if>
             <if test="p.processStatus != null and p.processStatus != ''">
                 <if test="p.processStatus != '-1'">
                     and a.process_status = #{p.processStatus}