ly 2 жил өмнө
parent
commit
6fbc4fed80

+ 19 - 0
master/src/main/java/com/ruoyi/project/base/controller/TBasePointController.java

@@ -146,6 +146,25 @@ public class TBasePointController extends BaseController {
         return toAjax(tBasePointService.updateTBasePointByPointIds(tBasePoint));
     }
 
+    @PutMapping("/handleApproveAll")
+    public AjaxResult handleApproveAll(@RequestBody TBasePoint tBasePoint) {
+        long status = tBasePoint.getApproveStatus();
+        tBasePoint.setApproveStatus(null);
+        //查询需要审核数据
+        List<TBasePoint> list = tBasePointService.selectTBasePointList(tBasePoint);
+        List<Long> ids = new ArrayList<>();
+        for (TBasePoint t: list
+             ) {
+            ids.add(t.getPointId());
+        }
+        TBasePoint point = new TBasePoint();
+        point.setPointIds(ids.toArray(new Long[ids.size()]));
+        point.setApproveTime(new Date());
+        point.setApproveStatus(status);
+        tBasePointService.updateTBasePointByPointIds(point);
+        return AjaxResult.success();
+    }
+
     @PutMapping("/handleUpload")
     public AjaxResult handleUpload(@RequestBody TBasePoint tBasePoint) {
         tBasePoint.setUpdaterCode(getUserId());

+ 7 - 1
ui/src/api/base/point.js

@@ -50,7 +50,13 @@ export function handleApprove(data) {
     data: data
   })
 }
-
+export function handleApproveAll(data) {
+  return request({
+    url: '/base/point/handleApproveAll',
+    method: 'put',
+    data: data
+  })
+}
 export function handleUpload(data) {
   return request({
     url: '/base/point/handleUpload',

+ 30 - 2
ui/src/views/base/point/index.vue

@@ -168,6 +168,16 @@
         >送审
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-position"
+          size="mini"
+          @click="handleApproveAll(1)"
+        >全部送审
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -179,6 +189,16 @@
         >审核
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-s-check"
+          size="mini"
+          @click="handleApproveAll(2)"
+        >全部审核
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -609,13 +629,14 @@
 </template>
 
 <script>
-import {listPoint, getPoint, delPoint, addPoint, updatePoint, handleApprove, handleUpload} from "@/api/base/point";
+import {listPoint, getPoint, delPoint, addPoint, updatePoint, handleApprove,handleApproveAll, handleUpload} from "@/api/base/point";
 import {getAllPlantName} from "@/api/base/plant";
 import {getAllRegion} from "@/api/base/region";
 import {getAllDeviceByRegionId} from "@/api/base/device";
 import {MessageBox} from "element-ui";
 import {getToken} from "@/utils/auth";
 import PointDetail from "@/views/base/point/pointDetail";
+import {deepClone} from "@/utils";
 
 export default {
   name: "Point",
@@ -1125,7 +1146,7 @@ export default {
         this.getList();
       });
     },
-    handleApprove() {
+    handleApprove(status) {
       let data = {}
       data.pointIds = this.ids;
       data.approveStatus = 2;
@@ -1133,6 +1154,13 @@ export default {
         this.getList();
       });
     },
+    handleApproveAll(status) {
+       let data = deepClone(this.queryParams);
+       data.approveStatus = status
+      handleApproveAll(data).then(() => {
+        this.getList();
+      });
+    },
     habdleUpdload(title, flag) {
       this.doc.open = true;
       this.doc.title = title;