版本1.4.1 调压箱巡查

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

@@ -10,9 +10,13 @@ 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.GRegulatorBoxProcess;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
+import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxProcessBo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
+import com.ruoyi.gas.service.IGRegulatorBoxProcessService;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,11 +47,25 @@ public class GRegulatorBoxController extends BaseController {
 
     private final IGRegulatorBoxService iGRegulatorBoxService;
 
-    // 批量审核
+    @Autowired
+    private IGRegulatorBoxProcessService processService;
+
+    /**
+     * 批量审核
+     */
     @PostMapping("batchReview")
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGRegulatorBoxService.batchReview(bo));
     }
+
+    /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GRegulatorBoxProcessBo bo) {
+        return processService.queryPageList(bo);
+    }
+
     /**
      * 查询调压箱管理列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxProcessVo.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 GRegulatorBoxProcessVo {
+public class GRegulatorBoxProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -60,7 +60,7 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             GRegulatorBoxProcess processBo = new GRegulatorBoxProcess();
             processBo.setEmrId(item);
             processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getRemarks());
+            processBo.setProcessComments(bo.getProcessComments());
             processBo.setUserPost(bo.getPostNameArias());
             processList.add(processBo);
         });
@@ -72,21 +72,17 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
     }
 
     public void updateNetworkManage(Collection<GRegulatorBox> boxList) {
-        Collection<GRegulatorBox> todoList = new ArrayList<>();
         boxList.stream().forEach(obj->{
             QueryWrapper<GRegulatorBoxProcess> queryWrapper = new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", obj.getId());
             List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.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
@@ -213,7 +209,7 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             GRegulatorBoxProcessBo processBo = new GRegulatorBoxProcessBo();
             processBo.setEmrId(bo.getId());
             processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getRemark());
+            processBo.setProcessComments(bo.getProcessComments());
             processBo.setUserPost(bo.getPostNameArias());
             igRegulatorBoxProcessService.insertByBo(processBo);
         }
@@ -262,10 +258,12 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        igRegulatorBoxProcessService.remove(new QueryWrapper<GRegulatorBoxProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
 }