设备维修审批申请流程新增管件、崩的审批流程

master/src/main/java/com/ruoyi/project/intact/controller/TApproveMaintenanceController.java

@@ -7,8 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.approve.damain.DevTask;
-import com.ruoyi.project.intact.domain.TIntactGyl;
-import com.ruoyi.project.intact.domain.TIntactYsj;
+import com.ruoyi.project.intact.domain.*;
 import com.ruoyi.project.intact.mapper.TApproveMaintenanceMapper;
 import com.ruoyi.project.intact.service.*;
 import com.ruoyi.project.sems.domain.*;
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.intact.domain.TApproveMaintenance;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -108,20 +106,20 @@ public class TApproveMaintenanceController extends BaseController
                         devList.add(ysjEntity);
                     }
                     break;
-//            case 3:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevDzsb dzsbEntity = tSpecdevDzsbService.getById(i);
-//                    devList.add(dzsbEntity);
-//                }
-//                break;
-//            case 4:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevGl glEntity = tSpecdevGlService.getById(i);
-//                    devList.add(glEntity);
-//                }
-//                break;
+            case 3:
+                for (String i : ids
+                ) {
+                    TIntactGj gjEntity = gjService.getById(i);
+                    devList.add(gjEntity);
+                }
+                break;
+            case 4:
+                for (String i : ids
+                ) {
+                    TIntactPump pumpEntity = pumpService.getById(i);
+                    devList.add(pumpEntity);
+                }
+                break;
                 default:
                     break;
             }
@@ -178,20 +176,20 @@ public class TApproveMaintenanceController extends BaseController
                     devList.add(ysjEntity);
                 }
                 break;
-//            case 3:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevDzsb dzsbEntity = tSpecdevDzsbService.getById(i);
-//                    devList.add(dzsbEntity);
-//                }
-//                break;
-//            case 4:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevGl glEntity = tSpecdevGlService.getById(i);
-//                    devList.add(glEntity);
-//                }
-//                break;
+            case 3:
+                for (String i : ids
+                ) {
+                    TIntactGj gjEntity = gjService.getById(i);
+                    devList.add(gjEntity);
+                }
+                break;
+            case 4:
+                for (String i : ids
+                ) {
+                    TIntactPump pumpEntity = pumpService.getById(i);
+                    devList.add(pumpEntity);
+                }
+                break;
             default:
                 break;
         }
@@ -240,24 +238,24 @@ public class TApproveMaintenanceController extends BaseController
                     ysjService.updateById(ysjEntity);
                 }
                 break;
-//            case 3:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevDzsb dzsbEntity = tSpecdevDzsbService.getById(i);
-//                    dzsbEntity.setApproveStatus(tApproveSpecModify.getApproveType()+ 19);
-//                    dzsbEntity.setApproveTime(new Date());
-//                    tSpecdevDzsbService.updateById(dzsbEntity);
-//                }
-//                break;
-//            case 4:
-//                for (String i : ids
-//                ) {
-//                    TSpecdevGl glEntity = tSpecdevGlService.getById(i);
-//                    glEntity.setApproveStatus(tApproveSpecModify.getApproveType()+ 19);
-//                    glEntity.setApproveTime(new Date());
-//                    tSpecdevGlService.updateById(glEntity);
-//                }
-//                break;
+            case 3:
+                for (String i : ids
+                ) {
+                    TIntactGj gjEntity = gjService.getById(i);
+//                    gjEntity.setApproveStatus(tApproveMaintenance.getApproveType()+ 19);
+                    gjEntity.setApproveTime(new Date());
+                    gjService.updateById(gjEntity);
+                }
+                break;
+            case 4:
+                for (String i : ids
+                ) {
+                    TIntactPump pumpEntity = pumpService.getById(i);
+//                    pumpEntity.setApproveStatus(t.getApproveType()+ 19);
+                    pumpEntity.setApproveTime(new Date());
+                    pumpService.updateById(pumpEntity);
+                }
+                break;
             default:
                 break;
         }
@@ -320,18 +318,24 @@ public class TApproveMaintenanceController extends BaseController
                     tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
                 }
                 break;
-//            case 3:
-//                for (String i : ids
-//                ) {
-//
-//                }
-//                break;
-//            case 4:
-//                for (String i : ids
-//                ) {
-//
-//                }
-//                break;
+            case 3:
+                for (String i : ids
+                ) {
+                    TIntactGj gjEntity = gjService.getById(i);
+                    gjEntity.setApproveStatus(0L);
+                    gjService.updateById(gjEntity);
+                    tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
+                }
+                break;
+            case 4:
+                for (String i : ids
+                ) {
+                    TIntactPump pumpEntity = pumpService.getById(i);
+                    pumpEntity.setApproveStatus(0L);
+                    pumpService.updateById(pumpEntity);
+                    tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
+                }
+                break;
             default:
                 break;
         }

master/src/main/java/com/ruoyi/project/intact/domain/TIntactGj.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.intact.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -265,7 +266,8 @@ public class TIntactGj extends BaseEntity
     private String archives;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+//    @Excel(name = "部门名称")
+    @TableField(exist = false)
     private String deptName;
 
     public void setDeptName(String deptName)

master/src/main/java/com/ruoyi/project/intact/domain/TIntactPump.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.intact.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -266,7 +267,8 @@ public class TIntactPump extends BaseEntity
     private String archives;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+//    @Excel(name = "部门名称")
+    @TableField(exist = false)
     private String deptName;
 
     public void setDeptName(String deptName)

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactGjMapper.java

@@ -3,8 +3,10 @@ package com.ruoyi.project.intact.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.domain.TIntactGyl;
 
 /**
  * 设备完整性管件台账Mapper接口
@@ -13,7 +15,7 @@ import com.ruoyi.project.intact.domain.TIntactGj;
  * @date 2022-06-22
  */
 @TableName("T_INTACT_GJ")
-public interface TIntactGjMapper 
+public interface TIntactGjMapper  extends BaseMapper<TIntactGj>
 {
     /**
      * 查询设备完整性管件台账

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactPumpMapper.java

@@ -3,7 +3,9 @@ package com.ruoyi.project.intact.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactGj;
 import com.ruoyi.project.intact.domain.TIntactPump;
 
 /**
@@ -13,7 +15,7 @@ import com.ruoyi.project.intact.domain.TIntactPump;
  * @date 2022-06-22
  */
 @TableName("T_INTACT_PUMP")
-public interface TIntactPumpMapper 
+public interface TIntactPumpMapper extends BaseMapper<TIntactPump>
 {
     /**
      * 查询设备完整性泵台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactGjService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.domain.TIntactGyl;
 
 /**
  * 设备完整性管件台账Service接口
@@ -9,7 +12,7 @@ import com.ruoyi.project.intact.domain.TIntactGj;
  * @author ruoyi
  * @date 2022-06-22
  */
-public interface ITIntactGjService 
+public interface ITIntactGjService extends IService<TIntactGj>
 {
     /**
      * 查询设备完整性管件台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactPumpService.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.intact.domain.TIntactGyl;
 import com.ruoyi.project.intact.domain.TIntactPump;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.project.intact.domain.TIntactPump;
  * @author ruoyi
  * @date 2022-06-22
  */
-public interface ITIntactPumpService 
+public interface ITIntactPumpService  extends IService<TIntactPump>
 {
     /**
      * 查询设备完整性泵台账

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactGjServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.mapper.TIntactGylMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactGjMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactGjService;
  * @date 2022-06-22
  */
 @Service
-public class TIntactGjServiceImpl implements ITIntactGjService
+public class TIntactGjServiceImpl extends ServiceImpl<TIntactGjMapper, TIntactGj> implements ITIntactGjService
 {
     @Autowired
     private TIntactGjMapper tIntactGjMapper;

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactPumpServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactPumpMapper;
@@ -14,7 +16,7 @@ import com.ruoyi.project.intact.service.ITIntactPumpService;
  * @date 2022-06-22
  */
 @Service
-public class TIntactPumpServiceImpl implements ITIntactPumpService
+public class TIntactPumpServiceImpl extends ServiceImpl<TIntactPumpMapper, TIntactPump> implements ITIntactPumpService
 {
     @Autowired
     private TIntactPumpMapper tIntactPumpMapper;

ui/src/views/intact/gj/index.vue

@@ -574,8 +574,8 @@
       <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
           <el-table-column label="档案" align="center" prop="archives" :show-overflow-tooltip="true" >
-       <template slot-scope="scope">  
-      
+       <template slot-scope="scope">
+
          <el-button icon="el-icon-folder" style="color:#6e96fa;"  @click="handleDoc(scope.row)"  ></el-button>
        </template>
       </el-table-column>
@@ -687,6 +687,21 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['intact:gj:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.approveTime != null"
+            type="text"
+            size="mini"
+            @click="hisApprove(scope.row,devType)"
+          > {{ $t('维修记录') }}<br>
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            @click="addAprrove(scope.row,devType)"
+          >{{ $t('提交维修申请') }}
+          </el-button>
+          <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
+          <his-approve v-if="hisAprroveVisible" ref="hisApprove" @refreshDataList="getList"></his-approve>
         </template>
       </el-table-column>
     </el-table>
@@ -1009,12 +1024,15 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import HisApprove from "../approve/tapprove-maintenance-his";
+import AddApprove from "../approve/tapprove-maintenance-add"
 
 export default {
   name: "Gj",
-  components: { Treeselect },
+  components: { Treeselect , AddApprove, HisApprove},
   data() {
     return {
+      devType: 3,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1159,6 +1177,8 @@ export default {
       },
       // 表单参数
       form: {},
+      addAprroveVisible: false,
+      hisAprroveVisible: false,
       // 表单校验
       rules: {
       }
@@ -1194,6 +1214,29 @@ export default {
     });
   },
   methods: {
+    addAprrove(row, type) {
+      var rows = row ? [row] : this.recordList.map(item => {
+        return item
+      })
+      for (let i = 0; i < rows.length; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      this.addAprroveVisible = true
+      this.$nextTick(() => {
+        this.$refs.addApprove.init(rows, type)
+      })
+    },
+    hisApprove(row, type) {
+      this.hisAprroveVisible = true
+      this.$nextTick(() => {
+        this.$refs.hisApprove.init(row, type)
+      })
+    },
     /** 查询设备完整性管件台账列表 */
     getList() {
       this.loading = true;

ui/src/views/intact/gyl/index.vue

@@ -973,7 +973,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import HisApprove from "../approve/tapprove-maintenance-his";
-import AddApprove from "../approve/tapprove-maintenance-add"
+import AddApprove from "../approve/tapprove-maintenance-add";
 
 export default {
   name: "Gyl",

ui/src/views/intact/pump/index.vue

@@ -696,6 +696,19 @@
             size="mini"
             @click="hisReform(scope.row)"
           >{{ $t('改造记录') }}</el-button>
+          <el-button
+            v-if="scope.row.approveTime != null"
+            type="text"
+            size="mini"
+            @click="hisApprove2(scope.row,devType2)"
+          > {{ $t('维修记录') }}<br>
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            @click="addAprrove2(scope.row,devType2)"
+          >{{ $t('提交维修申请') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -1070,6 +1083,8 @@
 
       <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
     <his-approve v-if="hisAprroveVisible" ref="hisApprove" @refreshDataList="getList"></his-approve>
+    <add-approve2 v-if="addAprroveVisible2" ref="addApprove2" @refreshDataList="getList"></add-approve2>
+    <his-approve2 v-if="hisAprroveVisible2" ref="hisApprove2" @refreshDataList="getList"></his-approve2>
     <his-check v-if="hisCheckVisible" ref="hisCheck" @refreshDataList="getList"></his-check>
     <HisReform v-if="hisReformVisible" ref="hisReformList" ></HisReform>
   </div>
@@ -1088,16 +1103,21 @@ import {mylistPlant} from "@/api/system/plant";
 import HisCheck from "../check/check"
 import {addModify} from "@/api/sems/his/modify";
 import HisReform from "./specGl-hisReform";
+import HisApprove2 from "../approve/tapprove-maintenance-his";
+import AddApprove2 from "../approve/tapprove-maintenance-add";
 
 export default {
   name: "Pump",
-  components: { Treeselect ,AddApprove,HisApprove,HisCheck,HisReform},
+  components: { Treeselect ,AddApprove,HisApprove,HisCheck,HisReform,AddApprove2,HisApprove2},
   data() {
     return {
       // 遮罩层
+      devType2: 4,
       loading: true,
        addAprroveVisible: false,
       hisAprroveVisible: false,
+      addAprroveVisible2: false,
+      hisAprroveVisible2: false,
       hisCheckVisible: false,
       // 选中数组
       ids: [],
@@ -1278,6 +1298,29 @@ export default {
     });
   },
   methods: {
+    addAprrove2(row, type) {
+      var rows = row ? [row] : this.recordList.map(item => {
+        return item
+      })
+      for (let i = 0; i < rows.length; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      this.addAprroveVisible2 = true
+      this.$nextTick(() => {
+        this.$refs.addApprove2.init(rows, type)
+      })
+    },
+    hisApprove2(row, type) {
+      this.hisAprroveVisible2 = true
+      this.$nextTick(() => {
+        this.$refs.hisApprove2.init(row, type)
+      })
+    },
     /** 查询设备完整性泵台账列表 */
     getList() {
       this.loading = true;