Merge branch 'master' of http://47.114.101.16:7070/ssy/newcpms

 Conflicts:

	master/src/main/java/com/ruoyi/project/officeConvert/officeConvertController.java

	ui/src/api/system/dept.js

	ui/src/main.js

	ui/src/views/components/PlantProgList/index.vue

	ui/src/views/yulan/index.vue

master/src/main/java/com/ruoyi/common/thread/SpecDevCcThread.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevCc;
+import com.ruoyi.project.sems.service.ITSpecdevCcService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevCcThread implements Runnable {
+
+    private ITSpecdevCcService specdevCcService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevCcThread(ITSpecdevCcService specdevCcService) {
+        this.specdevCcService = specdevCcService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevCc> list = this.specdevCcService.list(new QueryWrapper<TSpecdevCc>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevCc t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevCcService.updateTSpecdevCc(t);
+        }
+        for (TSpecdevCc tSpecdevCc : list) {
+            for (TSpecdevCc specdevCc : list) {
+                if (tSpecdevCc.getId() == specdevCc.getId() || StringUtils.isEmpty(tSpecdevCc.getRegno())
+                        || StringUtils.isEmpty(specdevCc.getRegno())) {
+                    continue;
+                }
+                if (tSpecdevCc.getRegno().equals(specdevCc.getRegno()) && tSpecdevCc.getPlantCode().equals(specdevCc.getPlantCode())) {
+                    specdevCc.setIsRepeat(1L);
+                    this.specdevCcService.updateTSpecdevCc(specdevCc);
+                }
+            }
+        }
+    }
+}

master/src/main/java/com/ruoyi/common/thread/SpecDevDtThread.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevDt;
+import com.ruoyi.project.sems.service.ITSpecdevDtService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevDtThread implements Runnable {
+
+    private ITSpecdevDtService specdevDtService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevDtThread(ITSpecdevDtService specdevDtService) {
+        this.specdevDtService = specdevDtService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevDt> list = this.specdevDtService.list(new QueryWrapper<TSpecdevDt>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevDt t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevDtService.updateTSpecdevDt(t);
+        }
+        for (TSpecdevDt tSpecdevDt : list) {
+            for (TSpecdevDt specdevDt : list) {
+                if (tSpecdevDt.getId() == specdevDt.getId() || StringUtils.isEmpty(tSpecdevDt.getRegno())
+                        || StringUtils.isEmpty(specdevDt.getRegno())) {
+                    continue;
+                }
+                if (tSpecdevDt.getRegno().equals(specdevDt.getRegno()) && tSpecdevDt.getPlantCode().equals(specdevDt.getPlantCode())) {
+                    specdevDt.setIsRepeat(1L);
+                    this.specdevDtService.updateTSpecdevDt(specdevDt);
+                }
+            }
+        }
+    }
+}

master/src/main/java/com/ruoyi/common/thread/SpecDevDzsbThread.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevDzsb;
+import com.ruoyi.project.sems.service.ITSpecdevDzsbService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevDzsbThread implements Runnable {
+
+    private ITSpecdevDzsbService specdevDzsbService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevDzsbThread(ITSpecdevDzsbService specdevDzsbService) {
+        this.specdevDzsbService = specdevDzsbService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevDzsb> list = this.specdevDzsbService.list(new QueryWrapper<TSpecdevDzsb>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevDzsb t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevDzsbService.updateTSpecdevDzsb(t);
+        }
+        for (TSpecdevDzsb tSpecdevDzsb : list) {
+            for (TSpecdevDzsb specdevDzsb : list) {
+                if (tSpecdevDzsb.getId() == specdevDzsb.getId() || StringUtils.isEmpty(tSpecdevDzsb.getDevno())
+                        || StringUtils.isEmpty(specdevDzsb.getDevno())) {
+                    continue;
+                }
+                if (tSpecdevDzsb.getDevno().equals(specdevDzsb.getDevno()) && tSpecdevDzsb.getPlantCode().equals(specdevDzsb.getPlantCode())) {
+                    specdevDzsb.setIsRepeat(1L);
+                    this.specdevDzsbService.updateTSpecdevDzsb(specdevDzsb);
+                }
+            }
+        }
+    }
+}

master/src/main/java/com/ruoyi/common/thread/SpecDevGlThread.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevGl;
+import com.ruoyi.project.sems.service.ITSpecdevGlService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevGlThread implements Runnable {
+
+    private ITSpecdevGlService specdevGlService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevGlThread(ITSpecdevGlService specdevGlService) {
+        this.specdevGlService = specdevGlService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevGl t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevGlService.updateTSpecdevGl(t);
+        }
+        for (TSpecdevGl tSpecdevGl : list) {
+            for (TSpecdevGl specdevGl : list) {
+                if (tSpecdevGl.getId() == specdevGl.getId() || StringUtils.isEmpty(tSpecdevGl.getDevno())
+                        || StringUtils.isEmpty(specdevGl.getDevno())) {
+                    continue;
+                }
+                if (tSpecdevGl.getDevno().equals(specdevGl.getDevno()) && tSpecdevGl.getPlantCode().equals(specdevGl.getPlantCode())) {
+                    specdevGl.setIsRepeat(1L);
+                    this.specdevGlService.updateTSpecdevGl(specdevGl);
+                }
+            }
+        }
+    }
+}

master/src/main/java/com/ruoyi/common/thread/SpecDevYlgdThread.java

@@ -25,13 +25,19 @@ public class SpecDevYlgdThread implements Runnable {
         List<TSpecdevYlgd> list = this.specdevYlgdService.list(new QueryWrapper<TSpecdevYlgd>()
                 .eq("del_flag", 0).eq("status", "1"));
         logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevYlgd t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevYlgdService.updateTSpecdevYlgd(t);
+        }
         for (TSpecdevYlgd tSpecdevYlgd : list) {
             for (TSpecdevYlgd specdevYlgd : list) {
                 if (tSpecdevYlgd.getId() == specdevYlgd.getId() || StringUtils.isEmpty(tSpecdevYlgd.getDevno())
                         || StringUtils.isEmpty(specdevYlgd.getDevno())) {
                     continue;
                 }
-                if (tSpecdevYlgd.getDevno().equals(specdevYlgd.getDevno())) {
+                if (tSpecdevYlgd.getDevno().equals(specdevYlgd.getDevno()) && tSpecdevYlgd.getPlantCode().equals(specdevYlgd.getPlantCode())) {
                     specdevYlgd.setIsRepeat(1L);
                     this.specdevYlgdService.updateTSpecdevYlgd(specdevYlgd);
                 }

master/src/main/java/com/ruoyi/common/thread/SpecDevYlrqThread.java

@@ -31,13 +31,17 @@ public class SpecDevYlrqThread implements Runnable {
             tSpecdevYlrq.setIsRepeat(1L);
             this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
         }*/
+        for (TSpecdevYlrq t : list) {
+            t.setIsRepeat(0L);
+            this.specdevYlrqService.updateTSpecdevYlrq(t);
+        }
         for (TSpecdevYlrq tSpecdevYlrq : list) {
             for (TSpecdevYlrq specdevYlrq : list) {
                 if (tSpecdevYlrq.getId() == specdevYlrq.getId() || StringUtils.isEmpty(tSpecdevYlrq.getDevno())
                         || StringUtils.isEmpty(specdevYlrq.getDevno())) {
                     continue;
                 }
-                if (tSpecdevYlrq.getDevno().equals(specdevYlrq.getDevno())) {
+                if (tSpecdevYlrq.getDevno().equals(specdevYlrq.getDevno()) && tSpecdevYlrq.getPlantCode().equals(specdevYlrq.getPlantCode())) {
                     specdevYlrq.setIsRepeat(1L);
                     this.specdevYlrqService.updateTSpecdevYlrq(specdevYlrq);
                 }

master/src/main/java/com/ruoyi/common/thread/SpecOverLifeThead.java

@@ -19,7 +19,6 @@ public class SpecOverLifeThead implements Runnable {
     }
 
     /*
-    * 发送邮件
     */
     @Override
     public void run() {

master/src/main/java/com/ruoyi/common/thread/Trainning/MeetingInvitationMailThread.java

@@ -90,6 +90,7 @@ public class MeetingInvitationMailThread implements Runnable {
         //拼接html
         String html = start + prime + end;
         mailService.sendHtmlMail(email, "CPMS：您已受邀参加学员" + successorName + "的季度汇报 (" + feedbackYear + "年第" + feedbackSeason + "季度)", html);
+//        mailService.sendHtmlMail("lihuiisfish@163.com", "CPMS：您已受邀参加学员" + successorName + "的季度汇报 (" + feedbackYear + "年第" + feedbackSeason + "季度)", html);
     }
 
 }

master/src/main/java/com/ruoyi/common/thread/Trainning/PlanApproveMailThread.java

@@ -1,6 +1,8 @@
 package com.ruoyi.common.thread.Trainning;
 
 import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.project.system.domain.SysMessage;
+import com.ruoyi.project.system.service.ISysMessageService;
 import com.ruoyi.project.training.spec.domain.TStApprove;
 
 import java.util.Date;
@@ -14,8 +16,11 @@ public class PlanApproveMailThread implements Runnable {
     private String usernameEN;
     private TStApprove tApprove;
     private String sendType;
+    private SysMessage message;
+    private ISysMessageService sysMessageService;
 
-    public PlanApproveMailThread(String email, String apNo, String username, String usernameEN, IMailService mailService, TStApprove tApprove, String sendType) {
+    public PlanApproveMailThread(String email, String apNo, String username, String usernameEN, IMailService mailService, TStApprove tApprove,
+                                 ISysMessageService sysMessageService, SysMessage message,String sendType) {
         this.email = email;
         this.apNo = apNo;
         this.username = username;
@@ -23,13 +28,24 @@ public class PlanApproveMailThread implements Runnable {
         this.mailService = mailService;
         this.tApprove = tApprove;
         this.sendType = sendType;
+        this.sysMessageService = sysMessageService;
+        this.message = message;
     }
     /*
      * 发送邮件
      */
     @Override
     public void run() {
-        addApprove();
+        if (sendType.equals("0")) {
+            //申请
+            addApprove();
+        }else if (sendType.equals("1")){
+            //通过
+            approve1();
+        }else if (sendType.equals("2")){
+            approve2();
+        }
+        sysMessageService.insertSysMessage(message);
     }
 
     /*
@@ -81,4 +97,102 @@ public class PlanApproveMailThread implements Runnable {
         String html = start + prime + end;
         mailService.sendHtmlMail(email, "CPMS：您有一个新的待办任务 CPMS:You have a new to-do task (" + apNo + ")", html);
     }
+    /*
+     * 发送邮件
+     */
+    public void approve1() {
+        String devType = "";
+        String devTypeEN = "";
+        String approveType = "培养计划审核";
+        String approveTypeEN = "Training plan review";
+        //写html开始内容
+        String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                "<table cellpadding=\"0\" align=\"center\"" +
+                "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">CPMS管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">CPMS System</font></th></tr>";
+        //表html中间内容
+        String prime = "";
+        String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                "Dear usernameEN</font></font></h2>" +
+                "<p>您有一个申请任务已通过审批：<br>" +
+                "You have a new to-do task:<br>" +
+                "任务编号：<b>apNo</b><br>" +
+                "Task Number: <b>apNoEN</b><br>" +
+                "审批类型：<b>approveType</b><br>" +
+                "Application Category: <b>approveTypeEN</b><br>" +
+                "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">CPMS管理系统</a>查看。<br>" +
+                "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">CPMS</a> to handle it.</p>" +
+                "<p align=\"right\">date</p>" +
+                "<div style=\"width:700px;margin:0 auto;\">" +
+                "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by CPMS, please do not reply</p>" +
+                "</div></div></div></td></tr>";
+        String one = center.replaceFirst("username", username);
+        String two = one.replaceFirst("usernameEN", usernameEN);
+        String three = two.replaceFirst("devType", devType);
+        String four = three.replaceFirst("apNo", apNo);
+        String five = four.replaceFirst("apNoEN", apNo);
+        String six = five.replaceFirst("devTypeEN", devTypeEN);
+        String seven = six.replaceFirst("approveType", approveType);
+        String eight = seven.replaceFirst("approveTypeEN", approveTypeEN);
+        String result = eight.replaceFirst("date", String.valueOf(new Date()));
+        prime = prime + result;
+        //写html结尾内容
+        String end = "</tbody></table></div></body></html>";
+        //拼接html
+        String html = start + prime + end;
+        mailService.sendHtmlMail(email, "CPMS：您有一个申请任务已通过审批 CPMS:You have a new to-do task (" + apNo + ")", html);
+    }
+    /*
+     * 发送邮件
+     */
+    public void approve2() {
+        String devType = "";
+        String devTypeEN = "";
+        String approveType = "培养计划审核";
+        String approveTypeEN = "Training plan review";
+        //写html开始内容
+        String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                "<table cellpadding=\"0\" align=\"center\"" +
+                "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">CPMS管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">CPMS System</font></th></tr>";
+        //表html中间内容
+        String prime = "";
+        String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                "Dear usernameEN</font></font></h2>" +
+                "<p>您有一个申请任务未通过审批：<br>" +
+                "You have a new to-do task:<br>" +
+                "任务编号：<b>apNo</b><br>" +
+                "Task Number: <b>apNoEN</b><br>" +
+                "审批类型：<b>approveType</b><br>" +
+                "Application Category: <b>approveTypeEN</b><br>" +
+                "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">CPMS管理系统</a>查看。<br>" +
+                "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">CPMS</a> to handle it.</p>" +
+                "<p align=\"right\">date</p>" +
+                "<div style=\"width:700px;margin:0 auto;\">" +
+                "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by CPMS, please do not reply</p>" +
+                "</div></div></div></td></tr>";
+        String one = center.replaceFirst("username", username);
+        String two = one.replaceFirst("usernameEN", usernameEN);
+        String three = two.replaceFirst("devType", devType);
+        String four = three.replaceFirst("apNo", apNo);
+        String five = four.replaceFirst("apNoEN", apNo);
+        String six = five.replaceFirst("devTypeEN", devTypeEN);
+        String seven = six.replaceFirst("approveType", approveType);
+        String eight = seven.replaceFirst("approveTypeEN", approveTypeEN);
+        String result = eight.replaceFirst("date", String.valueOf(new Date()));
+        prime = prime + result;
+        //写html结尾内容
+        String end = "</tbody></table></div></body></html>";
+        //拼接html
+        String html = start + prime + end;
+        mailService.sendHtmlMail(email, "CPMS：您有一个申请任务未通过审批 CPMS:You have a new to-do task (" + apNo + ")", html);
+    }
 }

master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -212,7 +212,6 @@ public class ExcelUtils {
                     xr = lastR;
                 }
             }
-
         }
         return xr;
 

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -120,6 +120,14 @@ public class ActivitiConfig {
         DeploymentBuilder deploymentBuilder7 = repositoryService().createDeployment();
         Resource spec7 = resourceLoader.getResource("classpath:/processes/specTraining/specTrainingPlanProcess.bpmn"); //加载流程图资源文件
         deploymentBuilder7.enableDuplicateFiltering().addInputStream(spec7.getFilename(), spec7.getInputStream()).name("专项培训计划审核").deploy();//按流程id部署
+
+        DeploymentBuilder deploymentBuilder8 = repositoryService().createDeployment();
+        Resource spec8 = resourceLoader.getResource("classpath:/processes/maintenance.bpmn"); //加载流程图资源文件
+        deploymentBuilder8.enableDuplicateFiltering().addInputStream(spec8.getFilename(), spec8.getInputStream()).name("设备维修审核").deploy();//按流程id部署
+
+        DeploymentBuilder deploymentBuilder9 = repositoryService().createDeployment();
+        Resource spec9 = resourceLoader.getResource("classpath:/processes/intact/intactChangeApplicationProcess.bpmn"); //加载流程图资源文件
+        deploymentBuilder9.enableDuplicateFiltering().addInputStream(spec8.getFilename(), spec9.getInputStream()).name("设备变更申请流程").deploy();//按流程id部署
     }
 }
 

master/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java

@@ -31,7 +31,7 @@ public class ScheduleConfig
         // JobStore配置
         prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
         // 集群配置
-        prop.put("org.quartz.jobStore.isClustered", "true");
+        prop.put("org.quartz.jobStore.isClustered", "false");
         prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
         prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
         prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "false");

master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -2,9 +2,7 @@ package com.ruoyi.framework.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.sendEmail.IMailService;
-import com.ruoyi.common.thread.SpecDevYlgdThread;
-import com.ruoyi.common.thread.SpecDevYlrqThread;
-import com.ruoyi.common.thread.SpecOverLifeThead;
+import com.ruoyi.common.thread.*;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -108,16 +106,29 @@ public class TSpecdevAllTask extends BaseController {
         this.checkWarnFlagForDzsb(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlgd(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlrq(firstlevel, secondlevel, thirdlevel, sdf);
+        //
+        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(specdevYlrqService);
+        Thread t0 = new Thread(specOverLifeThead);
+        t0.start();
+        //
         SpecDevYlgdThread specDevYlgdThread = new SpecDevYlgdThread(specdevYlgdService);
         Thread t = new Thread(specDevYlgdThread);
         t.start();
-        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(specdevYlrqService);
-        Thread t3 = new Thread(specOverLifeThead);
-        t3.start();
-
         SpecDevYlrqThread specDevYlgrThread = new SpecDevYlrqThread(specdevYlrqService);
         Thread t2 = new Thread(specDevYlgrThread);
         t2.start();
+        SpecDevCcThread specDevCcThread = new SpecDevCcThread(specdevCcService);
+        Thread t3 = new Thread(specDevCcThread);
+        t3.start();
+        SpecDevDtThread specDevDtThread = new SpecDevDtThread(specdevDtService);
+        Thread t4 = new Thread(specDevDtThread);
+        t4.start();
+        SpecDevGlThread specDevGlThread = new SpecDevGlThread(specdevGlService);
+        Thread t5 = new Thread(specDevGlThread);
+        t5.start();
+        SpecDevDzsbThread specDevDzsbThread = new SpecDevDzsbThread(specdevDzsbService);
+        Thread t6 = new Thread(specDevDzsbThread);
+        t6.start();
     }
 
     private void checkWarnFlagForGl(Long firstlevel, Long secondlevel, Long thirdlevel, SimpleDateFormat sdf) {
@@ -135,7 +146,6 @@ public class TSpecdevAllTask extends BaseController {
         }
         for (TAlarmPrincipal o : userList) {
             //根据装置权限获取数据
-
             List<SysPlant> plantList = sysPlantService.selectSysPlantByDeptId(o.getDeptId());
             logger.info("部门id"+o.getDeptId() + "--部门：" + plantList.toString());
             List<String> plants = new ArrayList<>();
@@ -146,6 +156,7 @@ public class TSpecdevAllTask extends BaseController {
             List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
                     .eq("del_flag", 0).eq("status", "1")
                     .in("plant_code", plants)
+
             );
             //获取动态处理预警级别
             TAlarmtype tAlarmtype = this.tAlarmtypeService.selectTAlarmtypeById(this.alarmtype);
@@ -176,6 +187,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevGl);
                         continue;
                     }
+                    if (day > thirdlevel) {
+                        this.updateForGl(0l, tSpecdevGl);
+                        continue;
+                    }
                 }
             }
             glSendEmail(sdf, firstList, o, this.glWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -235,6 +250,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevCc);
                         continue;
                     }
+                    if (day > thirdlevel) {
+                        this.updateForCc(0L, tSpecdevCc);
+                        continue;
+                    }
                 }
             }
             ccSendEmail(sdf, firstList, o, this.ccWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -294,6 +313,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevDzsb);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForDzsb(0L, tSpecdevDzsb);
+                        continue;
+                    }
                 }
             }
             dzsbSendEmail(sdf, firstList, o, this.dzsbWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -353,6 +376,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevYlrq);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForYlrq(0L, tSpecdevYlrq);
+                        continue;
+                    }
                 }
             }
             ylrqSendEmail(sdf, firstList, o, this.ylrqWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -412,6 +439,11 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevYlgd);
                         continue;
                     }
+                    // 半年-一年 预警标识为1级
+                    if (day > thirdlevel ) {
+                        this.updateForYlgd(0L, tSpecdevYlgd);
+                        continue;
+                    }
                 }
             }
             ylgdSendEmail(sdf, firstList, o, this.ylgdWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -469,6 +501,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevDt);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForDt(0L, tSpecdevDt);
+                        continue;
+                    }
                 }
             }
             dtSendEmail(sdf, firstList, o, this.dtWarningContent(firstList, sdf), this.firstWarningLevel);

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -245,6 +245,9 @@ public class CommonController extends BaseController
         } else if( type.equals("newemployee") ) {
             downloadname = "新员工培训导入模板.xlsx";
             url = "static/template/training/newemployee.xlsx";
+        }else if( type.equals("companyLevelRecord") ) {
+            downloadname = "公司培训成绩导入模板.xlsx";
+            url = "static/template/training/companyLevelRecord.xlsx";
         } else if( type.equals("targetlist") ) {
             downloadname = "目标录入导入模板.xlsx";
             url = "static/template/plant/targetlist.xlsx";

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -17,6 +17,10 @@ import com.ruoyi.project.common.domain.TCommonfile;
 import com.ruoyi.project.common.service.ITCommonfileService;
 import com.ruoyi.project.ehs.domain.TApproveAccident;
 import com.ruoyi.project.ehs.service.ITApproveAccidentService;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.intact.domain.TIntactApprove;
+import com.ruoyi.project.intact.service.ITApproveMaintenanceService;
+import com.ruoyi.project.intact.service.ITIntactApproveService;
 import com.ruoyi.project.listener.*;
 import com.ruoyi.project.sems.domain.TApprove;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
@@ -97,6 +101,10 @@ public class TApproveDangerController extends BaseController
     private ITStApproveService tStApproveService;
     @Autowired
     private RepositoryService repositoryService;
+    @Autowired
+    private ITApproveMaintenanceService tApproveMaintenanceService;
+    @Autowired
+    private ITIntactApproveService tIntactApproveService;
     /**
      * 任务申请
      */
@@ -243,6 +251,14 @@ public class TApproveDangerController extends BaseController
                     TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
                     devProcess.setApproveObject(approve);
                     devProcess.setApNo(approve.getApNo());
+                }else if(pi.getProcessDefinitionName().equals("设备维修审批流程")){
+                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
+                    devProcess.setApproveObject(approve);
+                    devProcess.setApNo(approve.getApNo());
+                }else if(pi.getProcessDefinitionName().equals("设备变更申请")){
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    devProcess.setApproveObject(approve);
+                    devProcess.setApNo(approve.getApNo());
                 }
                 devProcess.setBusinessKey(pi.getBusinessKey());
                 devProcess.setProcessCreateTime(pi.getStartTime());
@@ -326,6 +342,16 @@ public class TApproveDangerController extends BaseController
                     logger.info("专项培训计划审核" +JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
+                }else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
+                    logger.info("设备维修审批流程" +JSON.toJSONString(approve));
+                    devTask.setApproveObj(approve);
+                    devTask.setApNo(approve.getApNo());
+                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    logger.info("设备变更申请" +JSON.toJSONString(approve));
+                    devTask.setApproveObj(approve);
+                    devTask.setApNo(approve.getApNo());
                 }
                 list.add(devTask);
             }
@@ -389,6 +415,18 @@ public class TApproveDangerController extends BaseController
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
+                }else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
+                    SysUser user = sysUserService.selectUserById(approve.getUserId());
+                    devProcess.setApNo(approve.getApNo());
+                    devProcess.setApName(user.getNickName());
+                    devProcess.setApproveObject(approve);
+                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    SysUser user = sysUserService.selectUserById(approve.getUserId());
+                    devProcess.setApNo(approve.getApNo());
+                    devProcess.setApName(user.getNickName());
+                    devProcess.setApproveObject(approve);
                 }else {
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());

master/src/main/java/com/ruoyi/project/inspection/controller/TInspectionRecordController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.project.inspection.controller;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.inspection.domain.TInspectionRecord;
+import com.ruoyi.project.inspection.service.ITInspectionRecordService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 巡检记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@RestController
+@RequestMapping("/inspection/record")
+public class TInspectionRecordController extends BaseController
+{
+    @Autowired
+    private ITInspectionRecordService tInspectionRecordService;
+
+    /**
+     * 查询巡检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInspectionRecord tInspectionRecord)
+    {
+        startPage();
+        List<TInspectionRecord> list = tInspectionRecordService.selectTInspectionRecordList(tInspectionRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:export')")
+    @Log(title = "巡检记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInspectionRecord tInspectionRecord)
+    {
+        List<TInspectionRecord> list = tInspectionRecordService.selectTInspectionRecordList(tInspectionRecord);
+        ExcelUtil<TInspectionRecord> util = new ExcelUtil<TInspectionRecord>(TInspectionRecord.class);
+        return util.exportExcel(list, "record");
+    }
+
+    /**
+     * 获取巡检记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tInspectionRecordService.selectTInspectionRecordById(id));
+    }
+
+    /**
+     * 新增巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:add')")
+    @Log(title = "巡检记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInspectionRecord tInspectionRecord)
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tInspectionRecord.setCreaterCode(userId.toString());
+        tInspectionRecord.setCreatedate(new Date());
+        return toAjax(tInspectionRecordService.insertTInspectionRecord(tInspectionRecord));
+    }
+
+    /**
+     * 修改巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:edit')")
+    @Log(title = "巡检记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInspectionRecord tInspectionRecord)
+    {
+        return toAjax(tInspectionRecordService.updateTInspectionRecord(tInspectionRecord));
+    }
+
+    /**
+     * 删除巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:record:remove')")
+    @Log(title = "巡检记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tInspectionRecordService.deleteTInspectionRecordByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/inspection/controller/TInspectionRecordRegionController.java

@@ -0,0 +1,181 @@
+package com.ruoyi.project.inspection.controller;
+
+import java.util.Date;
+
+import com.google.common.collect.Maps;
+
+import java.util.List;
+
+import com.ruoyi.project.inspection.domain.TInspectionRecord;
+import com.ruoyi.project.inspection.service.ITInspectionRecordService;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.domain.TIntactYsj;
+import com.ruoyi.project.intact.service.ITIntactGylService;
+import com.ruoyi.project.intact.service.ITIntactYsjService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.inspection.domain.TInspectionRecordRegion;
+import com.ruoyi.project.inspection.service.ITInspectionRecordRegionService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 区域巡检记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-23
+ */
+@RestController
+@RequestMapping("/inspection/region")
+public class TInspectionRecordRegionController extends BaseController {
+    @Autowired
+    private ITInspectionRecordRegionService tInspectionRecordRegionService;
+
+    @Autowired
+    private ITIntactGylService tIntactGylService;
+
+    @Autowired
+    private ITIntactYsjService tIntactYsjService;
+
+    @Autowired
+    private ITInspectionRecordService recordService;
+
+    /**
+     * 查询区域巡检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInspectionRecordRegion tInspectionRecordRegion) {
+        startPage();
+        List<TInspectionRecordRegion> list = tInspectionRecordRegionService.selectTInspectionRecordRegionList(tInspectionRecordRegion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出区域巡检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:export')")
+    @Log(title = "区域巡检记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInspectionRecordRegion tInspectionRecordRegion) {
+        List<TInspectionRecordRegion> list = tInspectionRecordRegionService.selectTInspectionRecordRegionList(tInspectionRecordRegion);
+        ExcelUtil<TInspectionRecordRegion> util = new ExcelUtil<TInspectionRecordRegion>(TInspectionRecordRegion.class);
+        return util.exportExcel(list, "region");
+    }
+
+    /**
+     * 获取区域巡检记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tInspectionRecordRegionService.selectTInspectionRecordRegionById(id));
+    }
+
+    /**
+     * 新增区域巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:add')")
+    @Log(title = "区域巡检记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInspectionRecordRegion tInspectionRecordRegion) {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tInspectionRecordRegion.setCreaterCode(userId.toString());
+        tInspectionRecordRegion.setCreatedate(new Date());
+        // 新增区域巡检记录
+        int i = tInspectionRecordRegionService.insertTInspectionRecordRegion(tInspectionRecordRegion);
+
+        // 新增设备巡检记录
+        TInspectionRecord record = new TInspectionRecord();
+        record.setRegion(tInspectionRecordRegion.getRegion());
+        record.setReason(tInspectionRecordRegion.getReason());
+        record.setInspectionTime(tInspectionRecordRegion.getInspectionTime());
+        record.setPastTime(tInspectionRecordRegion.getPastTime());
+        record.setPasterCode(tInspectionRecordRegion.getPasterCode());
+        record.setTreatment(tInspectionRecordRegion.getTreatment());
+        record.setDeptId(tInspectionRecordRegion.getDeptId());
+        record.setCreaterCode(userId.toString());
+        record.setCreatedate(new Date());
+        record.setRemarks(tInspectionRecordRegion.getRemarks());
+        record.setDeptName(tInspectionRecordRegion.getDeptName());
+        record.setRegionId(tInspectionRecordRegion.getId());
+
+        // 根据区域查询该区域下的所有工业炉设备
+        TIntactGyl gyl = new TIntactGyl();
+        gyl.setPosition(tInspectionRecordRegion.getRegion());
+        List<TIntactGyl> gyls = tIntactGylService.selectTIntactGylList(gyl);
+        gyls.forEach(item -> {
+            record.setDevname(item.getDevname());
+            record.setDevno(item.getDevno());
+            // 为该设备添加巡查记录
+            recordService.insertTInspectionRecord(record);
+        });
+
+        // 根据区域查询该区域下的所有压缩机设备
+        TIntactYsj ysj = new TIntactYsj();
+        ysj.setPosition(tInspectionRecordRegion.getRegion());
+        List<TIntactYsj> ysjs = tIntactYsjService.selectTIntactYsjList(ysj);
+        ysjs.forEach(item -> {
+            record.setDevname(item.getDevname());
+            record.setDevno(item.getDevno());
+            // 为该设备添加巡查记录
+            recordService.insertTInspectionRecord(record);
+        });
+
+        return toAjax(i);
+    }
+
+    /**
+     * 修改区域巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:edit')")
+    @Log(title = "区域巡检记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInspectionRecordRegion tInspectionRecordRegion) {
+        //获取操作人员ID
+        Long userId = getUserId();
+        // 根据区域id查询该区域下的所有已巡查的设备
+        List<TInspectionRecord> records = recordService.selectByRegionId(tInspectionRecordRegion.getId());
+        for (TInspectionRecord record : records) {
+            record.setUpdatedate(new Date());
+            record.setUpdaterCode(userId);
+            record.setReason(tInspectionRecordRegion.getReason());
+            record.setInspectionTime(tInspectionRecordRegion.getInspectionTime());
+            record.setPastTime(tInspectionRecordRegion.getPastTime());
+            record.setPasterCode(tInspectionRecordRegion.getPasterCode());
+            record.setTreatment(tInspectionRecordRegion.getTreatment());
+            record.setDeptId(tInspectionRecordRegion.getDeptId());
+            record.setRemarks(tInspectionRecordRegion.getRemarks());
+            // 修改该区域下的设备巡查信息
+            recordService.updateTInspectionRecord(record);
+        }
+        return toAjax(tInspectionRecordRegionService.updateTInspectionRecordRegion(tInspectionRecordRegion));
+    }
+
+    /**
+     * 删除区域巡检记录
+     */
+    @PreAuthorize("@ss.hasPermi('inspection:region:remove')")
+    @Log(title = "区域巡检记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        // 删除该区域下所有设备的巡查记录
+        recordService.deleteTInspectionRecordByRegionIds(ids);
+        // 删除该条记录
+        return toAjax(tInspectionRecordRegionService.deleteTInspectionRecordRegionByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/inspection/domain/TInspectionRecord.java

@@ -0,0 +1,293 @@
+package com.ruoyi.project.inspection.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 巡检记录对象 t_inspection_record
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+public class TInspectionRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 区域 */
+    @Excel(name = "区域")
+    private String region;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String reason;
+
+    /** 巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 消故时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "消故时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pastTime;
+
+    /** 消故人 */
+    @Excel(name = "消故人")
+    private String pasterCode;
+
+    /** 处理情况 */
+    @Excel(name = "处理情况")
+    private String treatment;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 部门名称 */
+    //@Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    @TableField(exist = false)
+    private String createyear;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 备注 */
+    @Excel(name = "区域巡检id")
+    private Long regionId;
+
+    public String getCreateyear() {
+        return createyear;
+    }
+
+    public void setCreateyear(String createyear) {
+        this.createyear = createyear;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setRegion(String region)
+    {
+        this.region = region;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+    public void setInspectionTime(Date inspectionTime)
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime()
+    {
+        return inspectionTime;
+    }
+    public void setPastTime(Date pastTime)
+    {
+        this.pastTime = pastTime;
+    }
+
+    public Date getPastTime()
+    {
+        return pastTime;
+    }
+    public void setPasterCode(String pasterCode)
+    {
+        this.pasterCode = pasterCode;
+    }
+
+    public String getPasterCode()
+    {
+        return pasterCode;
+    }
+    public void setTreatment(String treatment)
+    {
+        this.treatment = treatment;
+    }
+
+    public String getTreatment()
+    {
+        return treatment;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("region", getRegion())
+            .append("reason", getReason())
+            .append("inspectionTime", getInspectionTime())
+            .append("pastTime", getPastTime())
+            .append("pasterCode", getPasterCode())
+            .append("treatment", getTreatment())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("remarks", getRemarks())
+            .append("deptName", getDeptName())
+            .append("regionId", getRegionId())
+            .append("createyear", getCreateyear())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/inspection/domain/TInspectionRecordRegion.java

@@ -0,0 +1,268 @@
+package com.ruoyi.project.inspection.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 区域巡检记录对象 t_inspection_record_region
+ *
+ * @author ruoyi
+ * @date 2022-06-23
+ */
+public class TInspectionRecordRegion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 部门名称 */
+    //@Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 区域 */
+    @Excel(name = "区域")
+    private String region;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String reason;
+
+    /** 巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 消故时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "消故时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pastTime;
+
+    /** 消故人 */
+    @Excel(name = "消故人")
+    private String pasterCode;
+
+    /** 处理情况 */
+    @Excel(name = "处理情况")
+    private String treatment;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setRegion(String region)
+    {
+        this.region = region;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+    public void setInspectionTime(Date inspectionTime)
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime()
+    {
+        return inspectionTime;
+    }
+    public void setPastTime(Date pastTime)
+    {
+        this.pastTime = pastTime;
+    }
+
+    public Date getPastTime()
+    {
+        return pastTime;
+    }
+    public void setPasterCode(String pasterCode)
+    {
+        this.pasterCode = pasterCode;
+    }
+
+    public String getPasterCode()
+    {
+        return pasterCode;
+    }
+    public void setTreatment(String treatment)
+    {
+        this.treatment = treatment;
+    }
+
+    public String getTreatment()
+    {
+        return treatment;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("remarks", getRemarks())
+            .append("region", getRegion())
+            .append("reason", getReason())
+            .append("inspectionTime", getInspectionTime())
+            .append("pastTime", getPastTime())
+            .append("paster", getPasterCode())
+            .append("treatment", getTreatment())
+            .append("deptName", getDeptName())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/inspection/mapper/TInspectionRecordMapper.java

@@ -0,0 +1,86 @@
+package com.ruoyi.project.inspection.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.inspection.domain.TInspectionRecord;
+
+/**
+ * 巡检记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+public interface TInspectionRecordMapper 
+{
+    /**
+     * 查询巡检记录
+     * 
+     * @param id 巡检记录ID
+     * @return 巡检记录
+     */
+    public TInspectionRecord selectTInspectionRecordById(Long id);
+
+    /**
+     * 查询巡检记录列表
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 巡检记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TInspectionRecord> selectTInspectionRecordList(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 新增巡检记录
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    public int insertTInspectionRecord(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 修改巡检记录
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    public int updateTInspectionRecord(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 删除巡检记录
+     * 
+     * @param id 巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordById(Long id);
+
+    /**
+     * 批量删除巡检记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByIds(Long[] ids);
+
+    /**
+     * 根据区域巡查记录id查询设备巡查记录
+     * @param regionId
+     * @return
+     */
+    public List<TInspectionRecord> selectByRegionId(Long regionId);
+
+    /**
+     * 批量删除巡检记录
+     *
+     * @param regionIds 需要删除的巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByRegionIds(Long[] regionIds);
+
+    /**
+     * 删除巡检记录信息
+     *
+     * @param regionId 巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByRegionId(Long regionId);
+}

master/src/main/java/com/ruoyi/project/inspection/mapper/TInspectionRecordRegionMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.inspection.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.inspection.domain.TInspectionRecordRegion;
+
+/**
+ * 区域巡检记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-23
+ */
+public interface TInspectionRecordRegionMapper 
+{
+    /**
+     * 查询区域巡检记录
+     * 
+     * @param id 区域巡检记录ID
+     * @return 区域巡检记录
+     */
+    public TInspectionRecordRegion selectTInspectionRecordRegionById(Long id);
+
+    /**
+     * 查询区域巡检记录列表
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 区域巡检记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TInspectionRecordRegion> selectTInspectionRecordRegionList(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 新增区域巡检记录
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    public int insertTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 修改区域巡检记录
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    public int updateTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 删除区域巡检记录
+     * 
+     * @param id 区域巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordRegionById(Long id);
+
+    /**
+     * 批量删除区域巡检记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordRegionByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/inspection/service/ITInspectionRecordRegionService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.inspection.service;
+
+import java.util.List;
+import com.ruoyi.project.inspection.domain.TInspectionRecordRegion;
+
+/**
+ * 区域巡检记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-23
+ */
+public interface ITInspectionRecordRegionService 
+{
+    /**
+     * 查询区域巡检记录
+     * 
+     * @param id 区域巡检记录ID
+     * @return 区域巡检记录
+     */
+    public TInspectionRecordRegion selectTInspectionRecordRegionById(Long id);
+
+    /**
+     * 查询区域巡检记录列表
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 区域巡检记录集合
+     */
+    public List<TInspectionRecordRegion> selectTInspectionRecordRegionList(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 新增区域巡检记录
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    public int insertTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 修改区域巡检记录
+     * 
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    public int updateTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion);
+
+    /**
+     * 批量删除区域巡检记录
+     * 
+     * @param ids 需要删除的区域巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordRegionByIds(Long[] ids);
+
+    /**
+     * 删除区域巡检记录信息
+     * 
+     * @param id 区域巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordRegionById(Long id);
+}

master/src/main/java/com/ruoyi/project/inspection/service/ITInspectionRecordService.java

@@ -0,0 +1,85 @@
+package com.ruoyi.project.inspection.service;
+
+import java.util.List;
+import com.ruoyi.project.inspection.domain.TInspectionRecord;
+
+/**
+ * 巡检记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+public interface ITInspectionRecordService 
+{
+    /**
+     * 查询巡检记录
+     * 
+     * @param id 巡检记录ID
+     * @return 巡检记录
+     */
+    public TInspectionRecord selectTInspectionRecordById(Long id);
+
+    /**
+     * 查询巡检记录列表
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 巡检记录集合
+     */
+    public List<TInspectionRecord> selectTInspectionRecordList(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 新增巡检记录
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    public int insertTInspectionRecord(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 修改巡检记录
+     * 
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    public int updateTInspectionRecord(TInspectionRecord tInspectionRecord);
+
+    /**
+     * 批量删除巡检记录
+     * 
+     * @param ids 需要删除的巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByIds(Long[] ids);
+
+    /**
+     * 删除巡检记录信息
+     * 
+     * @param id 巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordById(Long id);
+
+    /**
+     * 根据区域巡查记录id查询设备巡查记录
+     * @param regionId
+     * @return
+     */
+    public List<TInspectionRecord> selectByRegionId(Long regionId);
+
+
+    /**
+     * 批量删除巡检记录
+     *
+     * @param regionIds 需要删除的巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByRegionIds(Long[] regionIds);
+
+    /**
+     * 删除巡检记录信息
+     *
+     * @param regionId 巡检记录ID
+     * @return 结果
+     */
+    public int deleteTInspectionRecordByRegionId(Long regionId);
+}

master/src/main/java/com/ruoyi/project/inspection/service/impl/TInspectionRecordRegionServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.inspection.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.inspection.mapper.TInspectionRecordRegionMapper;
+import com.ruoyi.project.inspection.domain.TInspectionRecordRegion;
+import com.ruoyi.project.inspection.service.ITInspectionRecordRegionService;
+
+/**
+ * 区域巡检记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-23
+ */
+@Service
+public class TInspectionRecordRegionServiceImpl implements ITInspectionRecordRegionService
+{
+    @Autowired
+    private TInspectionRecordRegionMapper tInspectionRecordRegionMapper;
+
+    /**
+     * 查询区域巡检记录
+     *
+     * @param id 区域巡检记录ID
+     * @return 区域巡检记录
+     */
+    @Override
+    public TInspectionRecordRegion selectTInspectionRecordRegionById(Long id)
+    {
+        return tInspectionRecordRegionMapper.selectTInspectionRecordRegionById(id);
+    }
+
+    /**
+     * 查询区域巡检记录列表
+     *
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 区域巡检记录
+     */
+    @Override
+    public List<TInspectionRecordRegion> selectTInspectionRecordRegionList(TInspectionRecordRegion tInspectionRecordRegion)
+    {
+        return tInspectionRecordRegionMapper.selectTInspectionRecordRegionList(tInspectionRecordRegion);
+    }
+
+    /**
+     * 新增区域巡检记录
+     *
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    @Override
+    public int insertTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion)
+    {
+        return tInspectionRecordRegionMapper.insertTInspectionRecordRegion(tInspectionRecordRegion);
+    }
+
+    /**
+     * 修改区域巡检记录
+     *
+     * @param tInspectionRecordRegion 区域巡检记录
+     * @return 结果
+     */
+    @Override
+    public int updateTInspectionRecordRegion(TInspectionRecordRegion tInspectionRecordRegion)
+    {
+        return tInspectionRecordRegionMapper.updateTInspectionRecordRegion(tInspectionRecordRegion);
+    }
+
+    /**
+     * 批量删除区域巡检记录
+     *
+     * @param ids 需要删除的区域巡检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectionRecordRegionByIds(Long[] ids)
+    {
+        return tInspectionRecordRegionMapper.deleteTInspectionRecordRegionByIds(ids);
+    }
+
+    /**
+     * 删除区域巡检记录信息
+     *
+     * @param id 区域巡检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectionRecordRegionById(Long id)
+    {
+        return tInspectionRecordRegionMapper.deleteTInspectionRecordRegionById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/inspection/service/impl/TInspectionRecordServiceImpl.java

@@ -0,0 +1,113 @@
+package com.ruoyi.project.inspection.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.inspection.mapper.TInspectionRecordMapper;
+import com.ruoyi.project.inspection.domain.TInspectionRecord;
+import com.ruoyi.project.inspection.service.ITInspectionRecordService;
+
+/**
+ * 巡检记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@Service
+public class TInspectionRecordServiceImpl implements ITInspectionRecordService
+{
+    @Autowired
+    private TInspectionRecordMapper tInspectionRecordMapper;
+
+    /**
+     * 查询巡检记录
+     *
+     * @param id 巡检记录ID
+     * @return 巡检记录
+     */
+    @Override
+    public TInspectionRecord selectTInspectionRecordById(Long id)
+    {
+        return tInspectionRecordMapper.selectTInspectionRecordById(id);
+    }
+
+    /**
+     * 查询巡检记录列表
+     *
+     * @param tInspectionRecord 巡检记录
+     * @return 巡检记录
+     */
+    @Override
+    public List<TInspectionRecord> selectTInspectionRecordList(TInspectionRecord tInspectionRecord)
+    {
+        return tInspectionRecordMapper.selectTInspectionRecordList(tInspectionRecord);
+    }
+
+    /**
+     * 新增巡检记录
+     *
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    @Override
+    public int insertTInspectionRecord(TInspectionRecord tInspectionRecord)
+    {
+        return tInspectionRecordMapper.insertTInspectionRecord(tInspectionRecord);
+    }
+
+    /**
+     * 修改巡检记录
+     *
+     * @param tInspectionRecord 巡检记录
+     * @return 结果
+     */
+    @Override
+    public int updateTInspectionRecord(TInspectionRecord tInspectionRecord)
+    {
+        return tInspectionRecordMapper.updateTInspectionRecord(tInspectionRecord);
+    }
+
+    /**
+     * 批量删除巡检记录
+     *
+     * @param ids 需要删除的巡检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectionRecordByIds(Long[] ids)
+    {
+        return tInspectionRecordMapper.deleteTInspectionRecordByIds(ids);
+    }
+
+    /**
+     * 删除巡检记录信息
+     *
+     * @param id 巡检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectionRecordById(Long id)
+    {
+        return tInspectionRecordMapper.deleteTInspectionRecordById(id);
+    }
+
+    /**
+     * 根据区域巡查记录id查询设备巡查记录
+     * @param regionId
+     * @return
+     */
+    @Override
+    public List<TInspectionRecord> selectByRegionId(Long regionId) {
+        return tInspectionRecordMapper.selectByRegionId(regionId);
+    }
+
+    @Override
+    public int deleteTInspectionRecordByRegionIds(Long[] regionIds) {
+        return tInspectionRecordMapper.deleteTInspectionRecordByRegionIds(regionIds);
+    }
+
+    @Override
+    public int deleteTInspectionRecordByRegionId(Long regionId) {
+        return tInspectionRecordMapper.deleteTInspectionRecordByRegionId(regionId);
+    }
+}

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

@@ -0,0 +1,378 @@
+package com.ruoyi.project.intact.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+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.*;
+import com.ruoyi.project.intact.mapper.TApproveMaintenanceMapper;
+import com.ruoyi.project.intact.service.*;
+import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.project.sems.his.domain.*;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.*;
+import org.activiti.engine.impl.identity.Authentication;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性维修申请Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-27
+ */
+@RestController
+@RequestMapping("/intact/maintenance")
+public class TApproveMaintenanceController extends BaseController
+{
+    @Autowired
+    private ITApproveMaintenanceService tApproveMaintenanceService;
+    @Autowired
+    private TApproveMaintenanceMapper maintenanceMapper;
+
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private HistoryService historyService;
+    @Autowired
+    private TaskService taskService;
+
+    @Autowired
+    private ITIntactGylService gylService;
+    @Autowired
+    private ITIntactYsjService ysjService;
+    @Autowired
+    private ITIntactGjService gjService;
+    @Autowired
+    private ITIntactPumpService pumpService;
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @RequestMapping("/hisApprovelist")
+    public AjaxResult hisApprovelist(@RequestParam Map<String, Object> params) {
+        String sql = params.get("devId") + " in (SELECT REGEXP_SUBSTR (DEV_ID, '[^,]+', 1,rownum) from dual connect by rownum<=LENGTH (DEV_ID) - LENGTH (regexp_replace(DEV_ID, ',', ''))+1 ) ";
+        if (StringUtils.isNotEmpty((String) params.get("devType"))){
+            sql+=" and dev_type="+params.get("devType")+" ";
+        }
+        if (StringUtils.isNotEmpty((String) params.get("createyear"))){
+            sql+=" and to_char(creattime,'yyyy')= "+params.get("createyear")+" ";
+        }
+        List<TApproveMaintenance> list = maintenanceMapper.selectList(new QueryWrapper<TApproveMaintenance>().apply(sql).orderByDesc("CREATTIME")
+        );
+        for (TApproveMaintenance t : list
+        ) {
+            SysUser userEntity = sysUserService.selectUserById(t.getUserId());
+            t.setUserName(userEntity.getNickName());
+        }
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 查询设备完整性维修申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:maintenance:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TApproveMaintenance tApproveMaintenance)
+    {
+        startPage();
+        List<TApproveMaintenance> list = tApproveMaintenanceService.selectTApproveMaintenanceList(tApproveMaintenance);
+        for (TApproveMaintenance tApprove : list) {
+            String[] ids;
+            ids = tApprove.getDevId().split(",");
+            List<Object> devList = new ArrayList<>();
+            switch (Integer.parseInt(tApprove.getDevType().toString())) {
+                case 1:
+                    for (String i : ids
+                    ) {
+                        TIntactGyl gylEntity = gylService.getById(i);
+                        devList.add(gylEntity);
+                    }
+                    break;
+                case 2:
+                    for (String i : ids
+                    ) {
+                        TIntactYsj ysjEntity = ysjService.getById(i);
+                        devList.add(ysjEntity);
+                    }
+                    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;
+            }
+            tApprove.setDevList(devList);
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性维修申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:maintenance:export')")
+    @Log(title = "设备完整性维修申请", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TApproveMaintenance tApproveMaintenance)
+    {
+        List<TApproveMaintenance> list = tApproveMaintenanceService.selectTApproveMaintenanceList(tApproveMaintenance);
+        ExcelUtil<TApproveMaintenance> util = new ExcelUtil<TApproveMaintenance>(TApproveMaintenance.class);
+        return util.exportExcel(list, "maintenance");
+    }
+
+    /**
+     * 获取设备完整性维修申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:maintenance:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tApproveMaintenanceService.selectTApproveMaintenanceById(id));
+    }
+
+    /**
+     * 获取特种设备变更申请详细信息
+     */
+    @GetMapping(value = "info/{id}")
+    public AjaxResult info(@PathVariable("id") Long id)
+    {
+        TApproveMaintenance tApprove = tApproveMaintenanceService.selectTApproveMaintenanceById(id);
+        String[] ids;
+        ids = tApprove.getDevId().split(",");
+        List<Object> devList = new ArrayList<>();
+        switch (Integer.parseInt(tApprove.getDevType().toString())) {
+            case 1:
+                for (String i : ids
+                ) {
+                    TIntactGyl gylEntity = gylService.getById(i);
+                    devList.add(gylEntity);
+                }
+                break;
+            case 2:
+                for (String i : ids
+                ) {
+                    TIntactYsj ysjEntity = ysjService.getById(i);
+                    devList.add(ysjEntity);
+                }
+                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;
+        }
+        tApprove.setDevList(devList);
+        return AjaxResult.success(tApprove);
+    }
+
+    /**
+     * 新增设备完整性维修申请
+     */
+//    @PreAuthorize("@ss.hasPermi('intact:maintenance:add')")
+    @Log(title = "设备完整性维修申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TApproveMaintenance tApproveMaintenance)
+    {
+        Long userid = getUserId();
+        tApproveMaintenance.setUserId(userid);
+//        tApproveSpecModify.setApNo(tApproveSpecModify.getHisId().toString());
+        //审批编号
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
+        String data = sdf.format(dt) + userid;
+        tApproveMaintenance.setApNo(data);
+        //
+        Authentication.setAuthenticatedUserId(userid.toString());
+        tApproveMaintenanceService.insertTApproveMaintenance(tApproveMaintenance);
+        long bussniseeKey = tApproveMaintenance.getId();
+        String[] ids;
+        ids = tApproveMaintenance.getDevId().split(",");
+        switch (Integer.parseInt(tApproveMaintenance.getDevType().toString())){
+            case 1:
+                for (String i : ids
+                ) {
+                    TIntactGyl gylEntity = gylService.getById(i);
+//                    gylEntity.setApproveStatus(tApproveMaintenance.getApproveType()+ 19);
+                    gylEntity.setApproveTime(new Date());
+                    gylService.updateById(gylEntity);
+                }
+                break;
+            case 2:
+                for (String i : ids
+                ) {
+                    TIntactYsj ysjEntity = ysjService.getById(i);
+//                    ylgdEntity.setApproveStatus(tApproveSpecModify.getApproveType() + 19);
+                    ysjEntity.setApproveTime(new Date());
+                    ysjService.updateById(ysjEntity);
+                }
+                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;
+        }
+        //开始工作流、监听
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("applyUser", userid.toString());
+        variables.put("wxjlusers", tApproveMaintenance.getWxjl());
+        //采用key来启动流程定义并设置流程变量，返回流程实例
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("maintenance", String.valueOf(bussniseeKey), variables);
+        logger.info("流程部署id：" + pi.getDeploymentId());
+        logger.info("流程定义id：" + pi.getProcessDefinitionId());
+        logger.info("流程实例id：" + pi.getProcessInstanceId());
+        tApproveMaintenance.setProcessId(pi.getProcessInstanceId());
+        tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
+        return AjaxResult.success();
+    }
+
+    @Log(title = "设备完整性维修审核处理", businessType = BusinessType.UPDATE)
+    @PutMapping("/handle")
+    public AjaxResult handle(@RequestBody DevTask devTask) {
+        //流程审批意见
+        String symbol= "";
+        if (devTask.getComment() != "") {
+            symbol = "，";
+        }
+        //使用任务服务完成任务(提交任务)
+        String taskId = devTask.getTaskId();
+        // 使用任务id,获取任务对象，获取流程实例id
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        //利用任务对象，获取流程实例id
+        String processInstancesId = task.getProcessInstanceId();
+        TApproveMaintenance tApproveMaintenance = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(devTask.getBusinessKey()));
+        if (devTask.getCondition().equals("1")) {
+            devTask.setComment("通过" + symbol + devTask.getComment());
+            tApproveMaintenance.setStatus(1L);
+            tApproveMaintenance.setEnddate(new Date());
+        }else if (devTask.getCondition().equals("0")) {
+            devTask.setComment("未通过" + symbol + devTask.getComment());
+            tApproveMaintenance.setStatus(2L);
+            tApproveMaintenance.setEnddate(new Date());
+        }
+        String[] ids;
+        ids = tApproveMaintenance.getDevId().split(",");
+        switch (Integer.parseInt(tApproveMaintenance.getDevType().toString())){
+            case 1://修改工业炉台账
+                for (String i : ids
+                ) {
+                    TIntactGyl gylEntity = gylService.getById(i);
+                    gylEntity.setApproveStatus(0L);
+                    gylService.updateById(gylEntity);
+                    tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
+                }
+                break;
+            case 2://修改压缩机台账
+                for (String i : ids
+                ) {
+                    TIntactYsj ysjEntity = ysjService.getById(i);
+                    ysjEntity.setApproveStatus(0L);
+                    ysjService.updateById(ysjEntity);
+                    tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance);
+                }
+                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;
+        }
+        Map<String, Object> param = new HashMap<>();
+        param.put("condition", devTask.getCondition());
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        TaskService taskService = processEngine.getTaskService();
+        //认领任务
+        processEngine.getTaskService()
+                .claim(taskId, getUserId().toString());
+        taskService.addComment(taskId, processInstancesId, devTask.getComment());
+        taskService.complete(taskId, param);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改设备完整性维修申请
+     */
+    @PreAuthorize("@ss.hasPermi('intact:maintenance:edit')")
+    @Log(title = "设备完整性维修申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TApproveMaintenance tApproveMaintenance)
+    {
+        return toAjax(tApproveMaintenanceService.updateTApproveMaintenance(tApproveMaintenance));
+    }
+
+    /**
+     * 删除设备完整性维修申请
+     */
+    @PreAuthorize("@ss.hasPermi('intact:maintenance:remove')")
+    @Log(title = "设备完整性维修申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tApproveMaintenanceService.deleteTApproveMaintenanceByIds(ids));
+    }
+}

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

@@ -0,0 +1,391 @@
+package com.ruoyi.project.intact.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.project.approve.damain.DevTask;
+import com.ruoyi.project.intact.domain.*;
+import com.ruoyi.project.intact.mapper.TIntactApproveMapper;
+import com.ruoyi.project.intact.service.*;
+import com.ruoyi.project.listener.semsApprove.*;
+import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.*;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.impl.identity.Authentication;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Comment;
+import org.activiti.engine.task.Task;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+import javax.annotation.Resource;
+
+/**
+ * 设备完整性申请Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-24
+ */
+@RestController
+@RequestMapping("/intact/approve")
+public class TIntactApproveController extends BaseController
+{
+    @Autowired
+    private ITIntactApproveService tIntactApproveService;
+    @Autowired
+    private RuntimeService runtimeService;
+    @Autowired
+    private HistoryService historyService;
+    @Autowired
+    private ITIntactGjService tIntactGjService;
+    @Autowired
+    private ITIntactGylService  tIntactGylService;
+    @Autowired
+    private ITIntactPumpService tIntactPumpService;
+    @Autowired
+    private ITIntactYsjService tIntactYsjService;
+    @Autowired
+    private TaskService taskService;
+    @Resource
+    private TIntactApproveMapper tIntactApproveMapper;
+    @Autowired
+    private ISysUserService sysUserService;
+    /**
+     * 查询设备完整性申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:approve:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactApprove tIntactApprove)
+    {
+        startPage();
+        List<TIntactApprove> list = tIntactApproveService.selectTIntactApproveList(tIntactApprove);
+        return getDataTable(list);
+    }
+
+    /**
+     * 历史申请列表
+     */
+    @RequestMapping("/hisApprovelist")
+    public AjaxResult hisTintactApprovelist(@RequestParam Map<String, Object> params) {
+        String sql = params.get("devId") + " in (SELECT REGEXP_SUBSTR (DEV_ID, '[^,]+', 1,rownum) from dual connect by rownum<=LENGTH (DEV_ID) - LENGTH (regexp_replace(DEV_ID, ',', ''))+1 )";
+        List<TIntactApprove> list = tIntactApproveMapper.selectList(new QueryWrapper<TIntactApprove>().apply(sql).orderByDesc("CREATTIME")
+        );
+        for (TIntactApprove t : list
+        ) {
+            SysUser userEntity = sysUserService.selectUserById(t.getUserId());
+            t.setUserName(userEntity.getNickName());
+        }
+        return AjaxResult.success(list);
+    }
+
+
+    /**
+     * 导出设备完整性申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:approve:export')")
+    @Log(title = "设备完整性申请", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactApprove tIntactApprove)
+    {
+        List<TIntactApprove> list = tIntactApproveService.selectTIntactApproveList(tIntactApprove);
+        ExcelUtil<TIntactApprove> util = new ExcelUtil<TIntactApprove>(TIntactApprove.class);
+        return util.exportExcel(list, "approve");
+    }
+
+    /**
+     * 获取设备完整性申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:approve:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactApproveService.selectTIntactApproveById(id));
+    }
+
+    /**
+     * 新增设备完整性申请
+     */
+
+    @Log(title = "设备完整性申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactApprove tIntactApprove)
+    {
+        logger.info(JSON.toJSONString(tIntactApprove));
+        Long userid = getUserId();
+        tIntactApprove.setUserId(userid);
+        //审批编号
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
+        String data = sdf.format(dt) + userid;
+        tIntactApprove.setApNo(data);
+        tIntactApproveService.insertTIntactApprove(tIntactApprove);
+       /* if (tIntactApprove.getFiles().size() > 0) {
+            for (TApproverFile t : tIntactApprove.getFiles()
+            ) {
+                t.setApproveId(tIntactApprove.getId());
+                t.setFileType(1l);
+                tIntactApproveService.save(t);
+            }    设备变更提交文件，暂时不用
+        }*/
+        String[] ids = tIntactApprove.getDevId().split(",");
+        switch (Integer.parseInt(tIntactApprove.getDevType().toString())) {
+            case 1:
+                for (String i : ids
+                ) {
+                    TIntactPump pumpEntity = tIntactPumpService.getById(i);
+                    pumpEntity.setApproveStatus(tIntactApprove.getApproveType());
+                    pumpEntity.setApproveTime(new Date());
+                    tIntactPumpService.updateById(pumpEntity);
+                }
+                break;
+            case 2:
+                for (String i : ids
+                ) {
+                    TIntactGj gjEntity = tIntactGjService.getById(i);
+                    gjEntity.setApproveStatus(tIntactApprove.getApproveType());
+                    gjEntity.setApproveTime(new Date());
+                    tIntactGjService.updateById(gjEntity);
+                }
+                break;
+            case 3:
+                for (String i : ids
+                ) {
+                    TIntactYsj ysjEntity = tIntactYsjService.getById(i);
+                    ysjEntity.setApproveStatus(tIntactApprove.getApproveType());
+                    ysjEntity.setApproveTime(new Date());
+                    tIntactYsjService.updateById(ysjEntity);
+                }
+                break;
+            case 4:
+                for (String i : ids
+                ) {
+                    TIntactGyl gylEntity = tIntactGylService.getById(i);
+                    gylEntity.setApproveStatus(tIntactApprove.getApproveType());
+                    gylEntity.setApproveTime(new Date());
+                    tIntactGylService.updateById(gylEntity);
+                }
+                break;
+
+        }
+        long bussniseeKey = tIntactApprove.getId();
+        Authentication.setAuthenticatedUserId(userid.toString());
+        //开始工作流、监听
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("applyUser", userid.toString());
+        variables.put("gyzjusers", tIntactApprove.getGyzj().toString());
+     /*   variables.put("specEndSucessListener", new SpecEndSucessListener());
+        variables.put("specEndFaileListener", new SpecEndFaileListener());
+        variables.put("gyzjTaskCreateListener", new GyzjTaskCreateListener());
+        variables.put("ctmTaskCreateListener", new CtmTaskCreateListener());*/
+
+        //采用key来启动流程定义并设置流程变量，返回流程实例
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("intactChangeApplicationProcess", String.valueOf(bussniseeKey), variables);
+        logger.info("流程部署id：" + pi.getDeploymentId());
+        logger.info("流程定义id：" + pi.getProcessDefinitionId());
+        logger.info("流程实例id：" + pi.getProcessInstanceId());
+        tIntactApprove.setProcessId(pi.getProcessInstanceId());
+        tIntactApproveService.updateTIntactApprove(tIntactApprove);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 任务详情
+     */
+    @RequestMapping("/info/{id}")
+//    @RequiresPermissions("approve:tapprove:info")
+    public AjaxResult info(@PathVariable("id") Long id) {
+        TIntactApprove tIntactApprove = tIntactApproveService.selectTIntactApproveById(id);
+      /*  List<TApproverFile> files = tApproverFileService.list(new QueryWrapper<TApproverFile>().eq("APPROVE_ID", id).eq("FILE_TYPE", 1));
+        tApprove.setFiles(files);
+        List<TApproverFile> govfiles = tApproverFileService.list(new QueryWrapper<TApproverFile>().eq("APPROVE_ID", id).eq("FILE_TYPE", 2));
+        tApprove.setGovFiles(govfiles);*/
+        String[] ids = null;
+        if (tIntactApprove.getApproveType() == 7) {
+            ids = tIntactApprove.getReportId().split(",");
+        }else if (tIntactApprove.getApproveType() == 8) {
+            ids = tIntactApprove.getMonthId().split(",");
+        }else {
+            ids = tIntactApprove.getDevId().split(",");
+        }
+        List<Object> devList = new ArrayList<>();
+        if (tIntactApprove.getDevType() != null && tIntactApprove.getApproveType() != 7) {
+            switch (Integer.parseInt(tIntactApprove.getDevType().toString())) {
+                case 1:
+                    for (String i : ids
+                    ) {
+                        TIntactPump pumpEntity = tIntactPumpService.getById(i);
+                        devList.add(pumpEntity);
+                    }
+                    break;
+                case 2:
+                    for (String i : ids
+                    ) {
+                        TIntactGj gjEntity = tIntactGjService.getById(i);
+                        devList.add(gjEntity);
+                    }
+                    break;
+                case 3:
+                    for (String i : ids
+                    ) {
+                        TIntactYsj dysjEntity = tIntactYsjService.getById(i);
+                        devList.add(dysjEntity);
+                    }
+                    break;
+                case 4:
+                    for (String i : ids
+                    ) {
+                        TIntactGyl gylntity = tIntactGylService.getById(i);
+                        devList.add(gylntity);
+                    }
+                    break;
+
+            }
+        }
+      /*  switch (Integer.parseInt(tIntactApprove.getApproveType().toString())) {
+            case 7:
+                switch (tIntactApprove.getDevType().toString()) {
+                    case "1":
+                        for (String i : ids
+                        ) {
+                            TReportYlrq reportYlrqEntity = tReportYlrqService.selectTReportYlrqById(Long.parseLong(i));
+                            reportYlrqEntity.setDevEntity(tSpecdevYlrqService.getById(reportYlrqEntity.getDevId()));
+                            devList.add(reportYlrqEntity);
+                        }
+                        break;
+                    case "2":
+                        for (String i : ids
+                        ) {
+                            TReportYlgd reportYlgdEntity = tReportYlgdService.selectTReportYlgdById(Long.parseLong(i));
+                            reportYlgdEntity.setDevEntity(tSpecdevYlgdService.getById(reportYlgdEntity.getDevId()));
+                            devList.add(reportYlgdEntity);
+                        }
+                }
+                break;
+            case 8:
+                for (String i : ids
+                ) {
+                    TReportMonth reportMonthEntity = tReportMonthService.selectTReportMonthById(Long.parseLong(i));
+                    devList.add(reportMonthEntity);
+                    tApprove.setDevType(0l);
+                }
+        }*/
+        tIntactApprove.setDevList(devList);
+        return AjaxResult.success(tIntactApprove);
+    }
+
+    /**
+     * 审核处理
+     */
+    @Log(title = "设备完整性变更提交审核处理", businessType = BusinessType.UPDATE)
+    @PutMapping("/handle")
+    public AjaxResult handle(@RequestBody DevTask devTask) {
+        Map<String, Object> param = new HashMap<>();
+        //流程审批意见
+        String symbol= "";
+        if (devTask.getComment() != "") {
+            symbol = "，";
+        }
+        if (devTask.getCondition().equals("1")) {
+            /* devTask.setComment("通过" + symbol + devTask.getComment());*/
+            devTask.setComment("批准" + symbol + devTask.getComment());
+        }else if (devTask.getCondition().equals("0")) {
+            devTask.setComment("未通过" + symbol + devTask.getComment());
+        }
+        //使用任务服务完成任务(提交任务)
+        String taskId = devTask.getTaskId();
+        // 使用任务id,获取任务对象，获取流程实例id
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        //利用任务对象，获取流程实例id
+        String processInstancesId = task.getProcessInstanceId();
+        System.out.println(processInstancesId);
+        //年度报告申请检查人员会签判断
+        if (task.getName().equals("维修经理")) {
+            //获取当前任务流转列表
+            HistoricTaskInstanceQuery htiq = historyService.createHistoricTaskInstanceQuery();
+            List<HistoricTaskInstance> htiLists = htiq.processInstanceId(processInstancesId).finished().orderByHistoricTaskInstanceEndTime().asc().list();
+            List<DevTask> devTaskList = new ArrayList<>();
+            if (htiLists.size() > 0) {
+                for (HistoricTaskInstance hi : htiLists
+                ) {
+                    List<Comment> commentList = taskService.getTaskComments(hi.getId());
+                    DevTask dev = new DevTask();
+                    if (commentList.size() > 0) {
+                        dev.setComment(commentList.get(0).getFullMessage());
+                    }
+                    devTaskList.add(dev);
+                }
+            }
+            if (devTaskList.size() == 2) {
+                for (DevTask d : devTaskList) {
+                    if (d.getComment().substring(0, 1).equals("未")) {
+                        devTask.setCondition("0");
+                    }
+                }
+            }
+        }
+        param.put("condition", devTask.getCondition());
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        TaskService taskService = processEngine.getTaskService();
+        //认领任务
+        processEngine.getTaskService()//
+                .claim(taskId, getUserId().toString());
+//        Authentication.setAuthenticatedUserId("cmc"); // 添加批注时候的审核人
+        taskService.addComment(taskId, processInstancesId, devTask.getComment());
+        //业务监听处理
+//        tApproveService.handleApprove(task ,devTask);
+        taskService.complete(taskId, param);
+
+        //添加回执信息
+        if (devTask.getGovFiles().size() > 0) {
+            HistoricProcessInstance pi = processEngine.getHistoryService()
+                    .createHistoricProcessInstanceQuery().processInstanceId(processInstancesId).singleResult();
+            String approveId = pi.getBusinessKey();
+            TIntactApprove approveEntity = tIntactApproveService.selectTIntactApproveById(Long.parseLong(approveId));
+            approveEntity.setGovDate(devTask.getGovDate());
+            tIntactApproveService.updateTIntactApprove(approveEntity);
+           /* for (TApproverFile t : devTask.getGovFiles()
+            ) {
+                t.setApproveId(Long.parseLong(approveId));
+                t.setFileType(2l);
+                tApproverFileService.save(t);
+            }*/
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改设备完整性申请
+     */
+    @PreAuthorize("@ss.hasPermi('intact:approve:edit')")
+    @Log(title = "设备完整性申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactApprove tIntactApprove)
+    {
+        return toAjax(tIntactApproveService.updateTIntactApprove(tIntactApprove));
+    }
+
+    /**
+     * 删除设备完整性申请
+     */
+    @PreAuthorize("@ss.hasPermi('intact:approve:remove')")
+    @Log(title = "设备完整性申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactApproveService.deleteTIntactApproveByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.intact.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.service.ITIntactGjService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性管件台账Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@RestController
+@RequestMapping("/intact/gj")
+public class TIntactGjController extends BaseController
+{
+    @Autowired
+    private ITIntactGjService tIntactGjService;
+
+    /**
+     * 查询设备完整性管件台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactGj tIntactGj)
+    {
+        startPage();
+        List<TIntactGj> list = tIntactGjService.selectTIntactGjList(tIntactGj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性管件台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:export')")
+    @Log(title = "设备完整性管件台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactGj tIntactGj)
+    {
+        List<TIntactGj> list = tIntactGjService.selectTIntactGjList(tIntactGj);
+        ExcelUtil<TIntactGj> util = new ExcelUtil<TIntactGj>(TIntactGj.class);
+        return util.exportExcel(list, "gj");
+    }
+
+    /**
+     * 获取设备完整性管件台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactGjService.selectTIntactGjById(id));
+    }
+
+    /**
+     * 新增设备完整性管件台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:add')")
+    @Log(title = "设备完整性管件台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactGj tIntactGj)
+    {
+        return toAjax(tIntactGjService.insertTIntactGj(tIntactGj));
+    }
+
+    /**
+     * 修改设备完整性管件台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:edit')")
+    @Log(title = "设备完整性管件台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactGj tIntactGj)
+    {
+        return toAjax(tIntactGjService.updateTIntactGj(tIntactGj));
+    }
+
+    /**
+     * 删除设备完整性管件台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:remove')")
+    @Log(title = "设备完整性管件台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactGjService.deleteTIntactGjByIds(ids));
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.project.intact.controller;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.service.ITIntactGylService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性工业炉台账Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@RestController
+@RequestMapping("/intact/gyl")
+public class TIntactGylController extends BaseController
+{
+    @Autowired
+    private ITIntactGylService tIntactGylService;
+
+    /**
+     * 查询设备完整性工业炉台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactGyl tIntactGyl)
+    {
+        startPage();
+        List<TIntactGyl> list = tIntactGylService.selectTIntactGylList(tIntactGyl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性工业炉台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:export')")
+    @Log(title = "设备完整性工业炉台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactGyl tIntactGyl)
+    {
+        List<TIntactGyl> list = tIntactGylService.selectTIntactGylList(tIntactGyl);
+        ExcelUtil<TIntactGyl> util = new ExcelUtil<TIntactGyl>(TIntactGyl.class);
+        return util.exportExcel(list, "gyl");
+    }
+
+    /**
+     * 获取设备完整性工业炉台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactGylService.selectTIntactGylById(id));
+    }
+
+    /**
+     * 新增设备完整性工业炉台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:add')")
+    @Log(title = "设备完整性工业炉台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactGyl tIntactGyl)
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tIntactGyl.setCreaterCode(userId.toString());
+        tIntactGyl.setCreatedate(new Date());
+        return toAjax(tIntactGylService.insertTIntactGyl(tIntactGyl));
+    }
+
+    /**
+     * 修改设备完整性工业炉台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:edit')")
+    @Log(title = "设备完整性工业炉台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactGyl tIntactGyl)
+    {
+        return toAjax(tIntactGylService.updateTIntactGyl(tIntactGyl));
+    }
+
+    /**
+     * 删除设备完整性工业炉台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gyl:remove')")
+    @Log(title = "设备完整性工业炉台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactGylService.deleteTIntactGylByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.project.intact.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.intact.service.ITIntactPumpService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性泵台账Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@RestController
+@RequestMapping("/intact/pump")
+public class TIntactPumpController extends BaseController
+{
+    @Autowired
+    private ITIntactPumpService tIntactPumpService;
+
+    /**
+     * 查询设备完整性泵台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactPump tIntactPump)
+    {
+        startPage();
+        List<TIntactPump> list = tIntactPumpService.selectTIntactPumpList(tIntactPump);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性泵台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:export')")
+    @Log(title = "设备完整性泵台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactPump tIntactPump)
+    {
+        List<TIntactPump> list = tIntactPumpService.selectTIntactPumpList(tIntactPump);
+        ExcelUtil<TIntactPump> util = new ExcelUtil<TIntactPump>(TIntactPump.class);
+        return util.exportExcel(list, "pump");
+    }
+
+    /**
+     * 获取设备完整性泵台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactPumpService.selectTIntactPumpById(id));
+    }
+
+    /**
+     * 新增设备完整性泵台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:add')")
+    @Log(title = "设备完整性泵台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactPump tIntactPump)
+    {
+        return toAjax(tIntactPumpService.insertTIntactPump(tIntactPump));
+    }
+
+    /**
+     * 修改设备完整性泵台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:edit')")
+    @Log(title = "设备完整性泵台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactPump tIntactPump)
+    {
+        return toAjax(tIntactPumpService.updateTIntactPump(tIntactPump));
+    }
+
+    /**
+     * 删除设备完整性泵台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:remove')")
+    @Log(title = "设备完整性泵台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactPumpService.deleteTIntactPumpByIds(ids));
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.project.intact.controller;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.intact.domain.TIntactYsj;
+import com.ruoyi.project.intact.service.ITIntactYsjService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性压缩机台账Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@RestController
+@RequestMapping("/intact/ysj")
+public class TIntactYsjController extends BaseController
+{
+    @Autowired
+    private ITIntactYsjService tIntactYsjService;
+
+    /**
+     * 查询设备完整性压缩机台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactYsj tIntactYsj)
+    {
+        startPage();
+        List<TIntactYsj> list = tIntactYsjService.selectTIntactYsjList(tIntactYsj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性压缩机台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:export')")
+    @Log(title = "设备完整性压缩机台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactYsj tIntactYsj)
+    {
+        List<TIntactYsj> list = tIntactYsjService.selectTIntactYsjList(tIntactYsj);
+        ExcelUtil<TIntactYsj> util = new ExcelUtil<TIntactYsj>(TIntactYsj.class);
+        return util.exportExcel(list, "ysj");
+    }
+
+    /**
+     * 获取设备完整性压缩机台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactYsjService.selectTIntactYsjById(id));
+    }
+
+    /**
+     * 新增设备完整性压缩机台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:add')")
+    @Log(title = "设备完整性压缩机台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactYsj tIntactYsj)
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tIntactYsj.setCreaterCode(userId.toString());
+        tIntactYsj.setCreatedate(new Date());
+        return toAjax(tIntactYsjService.insertTIntactYsj(tIntactYsj));
+    }
+
+    /**
+     * 修改设备完整性压缩机台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:edit')")
+    @Log(title = "设备完整性压缩机台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactYsj tIntactYsj)
+    {
+        return toAjax(tIntactYsjService.updateTIntactYsj(tIntactYsj));
+    }
+
+    /**
+     * 删除设备完整性压缩机台账
+     */
+    @PreAuthorize("@ss.hasPermi('intact:ysj:remove')")
+    @Log(title = "设备完整性压缩机台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactYsjService.deleteTIntactYsjByIds(ids));
+    }
+}

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

@@ -0,0 +1,286 @@
+package com.ruoyi.project.intact.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性维修申请对象 t_approve_maintenance
+ *
+ * @author ruoyi
+ * @date 2022-06-27
+ */
+public class TApproveMaintenance extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 申请人id */
+    @Excel(name = "申请人id")
+    private Long userId;
+
+    /** 设备ids */
+    @Excel(name = "设备ids")
+    private String devId;
+
+    /** 设备类型： */
+    @Excel(name = "设备类型：")
+    private Long devType;
+
+    /** 审批类型 */
+    @Excel(name = "审批类型")
+    private Long approveType;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 附件url */
+    @Excel(name = "附件url")
+    private String fileUrls;
+
+    /** 申请状态 0:审批中 1-通过 2-拒绝 */
+    @Excel(name = "申请状态 0:审批中 1-通过 2-拒绝")
+    private Long status;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date creattime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date enddate;
+
+    /** 流程id */
+    @Excel(name = "流程id")
+    private String processId;
+
+    /** 申请编号（唯一） */
+    @Excel(name = "申请编号", readConverterExp = "唯=一")
+    private String apNo;
+
+    /** 报告ids */
+    @Excel(name = "报告ids")
+    private String reportId;
+
+    /** 月报告ids */
+    @Excel(name = "月报告ids")
+    private String monthId;
+
+    /** 删除标识 */
+    private Long delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    @TableField(exist = false)
+    private Long wxjl;
+
+    @TableField(exist = false)
+    private String  userName;
+
+    @TableField(exist = false)
+    private List<Object> devList;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public List<Object> getDevList() {
+        return devList;
+    }
+
+    public void setDevList(List<Object> devList) {
+        this.devList = devList;
+    }
+
+    public Long getWxjl() {
+        return wxjl;
+    }
+
+    public void setWxjl(Long wxjl) {
+        this.wxjl = wxjl;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setDevId(String devId)
+    {
+        this.devId = devId;
+    }
+
+    public String getDevId()
+    {
+        return devId;
+    }
+    public void setDevType(Long devType)
+    {
+        this.devType = devType;
+    }
+
+    public Long getDevType()
+    {
+        return devType;
+    }
+    public void setApproveType(Long approveType)
+    {
+        this.approveType = approveType;
+    }
+
+    public Long getApproveType()
+    {
+        return approveType;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setFileUrls(String fileUrls)
+    {
+        this.fileUrls = fileUrls;
+    }
+
+    public String getFileUrls()
+    {
+        return fileUrls;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setCreattime(Date creattime)
+    {
+        this.creattime = creattime;
+    }
+
+    public Date getCreattime()
+    {
+        return creattime;
+    }
+    public void setEnddate(Date enddate)
+    {
+        this.enddate = enddate;
+    }
+
+    public Date getEnddate()
+    {
+        return enddate;
+    }
+    public void setProcessId(String processId)
+    {
+        this.processId = processId;
+    }
+
+    public String getProcessId()
+    {
+        return processId;
+    }
+    public void setApNo(String apNo)
+    {
+        this.apNo = apNo;
+    }
+
+    public String getApNo()
+    {
+        return apNo;
+    }
+    public void setReportId(String reportId)
+    {
+        this.reportId = reportId;
+    }
+
+    public String getReportId()
+    {
+        return reportId;
+    }
+    public void setMonthId(String monthId)
+    {
+        this.monthId = monthId;
+    }
+
+    public String getMonthId()
+    {
+        return monthId;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("devId", getDevId())
+            .append("devType", getDevType())
+            .append("approveType", getApproveType())
+            .append("content", getContent())
+            .append("fileUrls", getFileUrls())
+            .append("status", getStatus())
+            .append("creattime", getCreattime())
+            .append("enddate", getEnddate())
+            .append("processId", getProcessId())
+            .append("apNo", getApNo())
+            .append("reportId", getReportId())
+            .append("monthId", getMonthId())
+            .append("delFlag", getDelFlag())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,432 @@
+package com.ruoyi.project.intact.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.project.sems.domain.TApproverFile;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性申请对象 t_intact_approve
+ *
+ * @author ruoyi
+ * @date 2022-06-24
+ */
+public class TIntactApprove extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 申请人id */
+    @Excel(name = "申请人id")
+    private Long userId;
+
+    /** 设备ids */
+    @Excel(name = "设备ids")
+    private String devId;
+
+    /** 设备类型： */
+    @Excel(name = "设备类型：")
+    private Long devType;
+
+    /** 审批类型 */
+    @Excel(name = "审批类型")
+    private Long approveType;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 附件url */
+    @Excel(name = "附件url")
+    private String fileUrls;
+
+    /** 回执url */
+    @Excel(name = "回执url")
+    private String reUrls;
+
+    /** 申请状态 0:审批中 1-通过 2-拒绝 */
+    @Excel(name = "申请状态 0:审批中 1-通过 2-拒绝")
+    private Long status;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date creattime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endtime;
+
+    /** 流程id */
+    @Excel(name = "流程id")
+    private String processId;
+
+    /** 政府回执时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "政府回执时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date govDate;
+
+    /** 延期日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "延期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date delayDate;
+
+    /** 延期原因 */
+    @Excel(name = "延期原因")
+    private String delayReason;
+
+    /** 延期措施 */
+    @Excel(name = "延期措施")
+    private String delayMeasure;
+
+    /** 延期安全声明 */
+    @Excel(name = "延期安全声明")
+    private String delayNotice;
+
+    /** 申请编号（唯一） */
+    @Excel(name = "申请编号", readConverterExp = "唯=一")
+    private String apNo;
+
+    /** 检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkDate;
+
+    /** 报告ids */
+    @Excel(name = "报告ids")
+    private String reportId;
+
+    /** 月报告ids */
+    @Excel(name = "月报告ids")
+    private String monthId;
+
+    /** 删除标识 */
+    private Long delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    @TableField(exist = false)
+    private List<Object> devList;
+
+    @TableField(exist = false)
+    private List<TIntactApprove> files;
+
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 审核人员
+     */
+    @TableField(exist = false)
+    private Long auditor;
+
+    /**
+     * 审批人员
+     */
+    @TableField(exist = false)
+    private Long approver;
+    /**
+     * 工艺总监
+     */
+    @TableField(exist = false)
+    private Long gyzj;
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setDevId(String devId)
+    {
+        this.devId = devId;
+    }
+
+    public String getDevId()
+    {
+        return devId;
+    }
+    public void setDevType(Long devType)
+    {
+        this.devType = devType;
+    }
+
+    public Long getDevType()
+    {
+        return devType;
+    }
+    public void setApproveType(Long approveType)
+    {
+        this.approveType = approveType;
+    }
+
+    public Long getApproveType()
+    {
+        return approveType;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setFileUrls(String fileUrls)
+    {
+        this.fileUrls = fileUrls;
+    }
+
+    public String getFileUrls()
+    {
+        return fileUrls;
+    }
+    public void setReUrls(String reUrls)
+    {
+        this.reUrls = reUrls;
+    }
+
+    public String getReUrls()
+    {
+        return reUrls;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setCreattime(Date creattime)
+    {
+        this.creattime = creattime;
+    }
+
+    public Date getCreattime()
+    {
+        return creattime;
+    }
+    public void setEndtime(Date endtime)
+    {
+        this.endtime = endtime;
+    }
+
+    public Date getEndtime()
+    {
+        return endtime;
+    }
+    public void setProcessId(String processId)
+    {
+        this.processId = processId;
+    }
+
+    public String getProcessId()
+    {
+        return processId;
+    }
+    public void setGovDate(Date govDate)
+    {
+        this.govDate = govDate;
+    }
+
+    public Date getGovDate()
+    {
+        return govDate;
+    }
+    public void setDelayDate(Date delayDate)
+    {
+        this.delayDate = delayDate;
+    }
+
+    public Date getDelayDate()
+    {
+        return delayDate;
+    }
+    public void setDelayReason(String delayReason)
+    {
+        this.delayReason = delayReason;
+    }
+
+    public String getDelayReason()
+    {
+        return delayReason;
+    }
+    public void setDelayMeasure(String delayMeasure)
+    {
+        this.delayMeasure = delayMeasure;
+    }
+
+    public String getDelayMeasure()
+    {
+        return delayMeasure;
+    }
+    public void setDelayNotice(String delayNotice)
+    {
+        this.delayNotice = delayNotice;
+    }
+
+    public String getDelayNotice()
+    {
+        return delayNotice;
+    }
+    public void setApNo(String apNo)
+    {
+        this.apNo = apNo;
+    }
+
+    public String getApNo()
+    {
+        return apNo;
+    }
+    public void setCheckDate(Date checkDate)
+    {
+        this.checkDate = checkDate;
+    }
+
+    public Date getCheckDate()
+    {
+        return checkDate;
+    }
+    public void setReportId(String reportId)
+    {
+        this.reportId = reportId;
+    }
+
+    public String getReportId()
+    {
+        return reportId;
+    }
+    public void setMonthId(String monthId)
+    {
+        this.monthId = monthId;
+    }
+
+    public String getMonthId()
+    {
+        return monthId;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public List<Object> getDevList() {
+        return devList;
+    }
+
+    public void setDevList(List<Object> devList) {
+        this.devList = devList;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public List<TIntactApprove> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<TIntactApprove> files) {
+        this.files = files;
+    }
+
+    public Long getAuditor() {
+        return auditor;
+    }
+
+    public void setAuditor(Long auditor) {
+        this.auditor = auditor;
+    }
+
+    public Long getApprover() {
+        return approver;
+    }
+
+    public void setApprover(Long approver) {
+        this.approver = approver;
+    }
+
+    public Long getGyzj() {
+        return gyzj;
+    }
+
+    public void setGyzj(Long gyzj) {
+        this.gyzj = gyzj;
+    }
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("devId", getDevId())
+            .append("devType", getDevType())
+            .append("approveType", getApproveType())
+            .append("content", getContent())
+            .append("fileUrls", getFileUrls())
+            .append("reUrls", getReUrls())
+            .append("status", getStatus())
+            .append("creattime", getCreattime())
+            .append("endtime", getEndtime())
+            .append("processId", getProcessId())
+            .append("govDate", getGovDate())
+            .append("delayDate", getDelayDate())
+            .append("delayReason", getDelayReason())
+            .append("delayMeasure", getDelayMeasure())
+            .append("delayNotice", getDelayNotice())
+            .append("apNo", getApNo())
+            .append("checkDate", getCheckDate())
+            .append("reportId", getReportId())
+            .append("monthId", getMonthId())
+            .append("delFlag", getDelFlag())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,878 @@
+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;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性管件台账对象 t_intact_gj
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@TableName("T_INTACT_GJ")
+public class TIntactGj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 部门名称 */
+    @TableField(exist = false)
+    private String deptName;
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .toString();
+    }
+}

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

@@ -0,0 +1,779 @@
+package com.ruoyi.project.intact.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性工业炉台账对象 t_intact_gyl
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public class TIntactGyl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 提交日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "提交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 制造单位 */
+    @Excel(name = "制造单位")
+    private String createUnit;
+
+    /** 燃烧方式 */
+    @Excel(name = "燃烧方式")
+    private String burnMode;
+
+    /** 燃烧种类 */
+    @Excel(name = "燃烧种类")
+    private String burnKind;
+
+    /** 额度出力 */
+    @Excel(name = "额度出力")
+    private String ratedPower;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 操作压力 */
+    @Excel(name = "操作压力")
+    private String optPressure;
+
+    /** 操作温度 */
+    @Excel(name = "操作温度")
+    private String optTemp;
+
+    /** 检测单位 */
+    @Excel(name = "检测单位")
+    private String checkUnit;
+
+    /** 检查结论 */
+    @Excel(name = "检查结论")
+    private String checkConclusion;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String model;
+
+    /** 水处理方式 */
+    @Excel(name = "水处理方式")
+    private String waterMode;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
+    /** 本次外部检测日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "本次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outWarnDate;
+
+    /** 下次外部检测日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outNextWarnDate;
+
+    /** 外部检验结论 */
+    @Excel(name = "外部检验结论")
+    private String outCheckConclusion;
+
+    /** 外部检验编号 */
+    @Excel(name = "外部检验编号")
+    private String outReportNo;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 是否重复 */
+    @Excel(name = "是否重复")
+    private Long isRepeat;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private String deviceSize;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 数据表文件号 */
+    @Excel(name = "数据表文件号")
+    private String dataNo;
+
+    /** 计算书文件号 */
+    @Excel(name = "计算书文件号")
+    private String bookNo;
+
+    /** 厂家 */
+    @Excel(name = "厂家")
+    private String manufactor;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    @TableField(exist = false)
+    private String archives;
+
+    /** 部门名称 */
+    //@Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setCreateUnit(String createUnit)
+    {
+        this.createUnit = createUnit;
+    }
+
+    public String getCreateUnit()
+    {
+        return createUnit;
+    }
+    public void setBurnMode(String burnMode)
+    {
+        this.burnMode = burnMode;
+    }
+
+    public String getBurnMode()
+    {
+        return burnMode;
+    }
+    public void setBurnKind(String burnKind)
+    {
+        this.burnKind = burnKind;
+    }
+
+    public String getBurnKind()
+    {
+        return burnKind;
+    }
+    public void setRatedPower(String ratedPower)
+    {
+        this.ratedPower = ratedPower;
+    }
+
+    public String getRatedPower()
+    {
+        return ratedPower;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setModel(String model)
+    {
+        this.model = model;
+    }
+
+    public String getModel()
+    {
+        return model;
+    }
+    public void setWaterMode(String waterMode)
+    {
+        this.waterMode = waterMode;
+    }
+
+    public String getWaterMode()
+    {
+        return waterMode;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setOutWarnDate(Date outWarnDate)
+    {
+        this.outWarnDate = outWarnDate;
+    }
+
+    public Date getOutWarnDate()
+    {
+        return outWarnDate;
+    }
+    public void setOutNextWarnDate(Date outNextWarnDate)
+    {
+        this.outNextWarnDate = outNextWarnDate;
+    }
+
+    public Date getOutNextWarnDate()
+    {
+        return outNextWarnDate;
+    }
+    public void setOutCheckConclusion(String outCheckConclusion)
+    {
+        this.outCheckConclusion = outCheckConclusion;
+    }
+
+    public String getOutCheckConclusion()
+    {
+        return outCheckConclusion;
+    }
+    public void setOutReportNo(String outReportNo)
+    {
+        this.outReportNo = outReportNo;
+    }
+
+    public String getOutReportNo()
+    {
+        return outReportNo;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(String deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public String getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setDataNo(String dataNo)
+    {
+        this.dataNo = dataNo;
+    }
+
+    public String getDataNo()
+    {
+        return dataNo;
+    }
+    public void setBookNo(String bookNo)
+    {
+        this.bookNo = bookNo;
+    }
+
+    public String getBookNo()
+    {
+        return bookNo;
+    }
+    public void setManufactor(String manufactor)
+    {
+        this.manufactor = manufactor;
+    }
+
+    public String getManufactor()
+    {
+        return manufactor;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("createUnit", getCreateUnit())
+            .append("burnMode", getBurnMode())
+            .append("burnKind", getBurnKind())
+            .append("ratedPower", getRatedPower())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("checkUnit", getCheckUnit())
+            .append("checkConclusion", getCheckConclusion())
+            .append("model", getModel())
+            .append("waterMode", getWaterMode())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("outWarnDate", getOutWarnDate())
+            .append("outNextWarnDate", getOutNextWarnDate())
+            .append("outCheckConclusion", getOutCheckConclusion())
+            .append("outReportNo", getOutReportNo())
+            .append("engineer", getEngineer())
+            .append("type", getType())
+            .append("isRepeat", getIsRepeat())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("medium", getMedium())
+            .append("leakageMode", getLeakageMode())
+            .append("dataNo", getDataNo())
+            .append("bookNo", getBookNo())
+            .append("manufactor", getManufactor())
+            .append("deptName", getDeptName())
+            .append("archives", getArchives())
+            .toString();
+    }
+}

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

@@ -0,0 +1,879 @@
+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;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备完整性泵台账对象 t_intact_pump
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@TableName("T_INTACT_PUMP")
+public class TIntactPump extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 部门名称 */
+    @TableField(exist = false)
+    private String deptName;
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .toString();
+    }
+}

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

@@ -0,0 +1,408 @@
+package com.ruoyi.project.intact.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性压缩机台账对象 t_intact_ysj
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public class TIntactYsj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private String deviceSize;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 操作压力 */
+    @Excel(name = "操作压力")
+    private String optPressure;
+
+    /** 操作温度 */
+    @Excel(name = "操作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 数据表文件号 */
+    @Excel(name = "数据表文件号")
+    private String dataNo;
+
+    /** 计算书文件号 */
+    @Excel(name = "计算书文件号")
+    private String bookNo;
+
+    /** 厂家 */
+    @Excel(name = "厂家")
+    private String manufactor;
+
+    /** 删除标识 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 部门名称 */
+    //@Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
+
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(String deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public String getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setDataNo(String dataNo)
+    {
+        this.dataNo = dataNo;
+    }
+
+    public String getDataNo()
+    {
+        return dataNo;
+    }
+    public void setBookNo(String bookNo)
+    {
+        this.bookNo = bookNo;
+    }
+
+    public String getBookNo()
+    {
+        return bookNo;
+    }
+    public void setManufactor(String manufactor)
+    {
+        this.manufactor = manufactor;
+    }
+
+    public String getManufactor()
+    {
+        return manufactor;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("leakageMode", getLeakageMode())
+            .append("dataNo", getDataNo())
+            .append("bookNo", getBookNo())
+            .append("manufactor", getManufactor())
+            .append("remark", getRemark())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("archives", getArchives())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/controller/TIntactHiGjController.java

@@ -0,0 +1,120 @@
+package com.ruoyi.project.intact.his.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.service.ITIntactHiGjService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性-管件台账变更历史记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@RestController
+@RequestMapping("/his/gj")
+public class TIntactHiGjController extends BaseController
+{
+    @Autowired
+    private ITIntactHiGjService tIntactHiGjService;
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactHiGj tIntactHiGj)
+    {
+        startPage();
+        List<TIntactHiGj> list = tIntactHiGjService.selectTIntactHiGjList(tIntactHiGj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性-管件台账变更历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:export')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactHiGj tIntactHiGj)
+    {
+        List<TIntactHiGj> list = tIntactHiGjService.selectTIntactHiGjList(tIntactHiGj);
+        ExcelUtil<TIntactHiGj> util = new ExcelUtil<TIntactHiGj>(TIntactHiGj.class);
+        return util.exportExcel(list, "gj");
+    }
+
+    /**
+     * 获取设备完整性-管件台账变更历史记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactHiGjService.selectTIntactHiGjById(id));
+    }
+
+
+    /**
+     * 获取管件台账历史改造历史
+     */
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
+    @GetMapping(value = "/reform/{devId}")
+    public AjaxResult getReform(@PathVariable("devId") Long devId)
+    {
+
+        return AjaxResult.success(tIntactHiGjService.selectTIntactHiGjByReform(devId));
+    }
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:add')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactHiGj tIntactHiGj)
+    {
+        tIntactHiGjService.deleteTIntactHiGjByDevId(tIntactHiGj.getId());
+        tIntactHiGj.setDevId(tIntactHiGj.getId());
+        tIntactHiGj.setHiType((long)1);
+        tIntactHiGjService.insertTIntactHiGj(tIntactHiGj);
+        return AjaxResult.success("id" , tIntactHiGj.getId());
+    }
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:edit')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactHiGj tIntactHiGj)
+    {
+        return toAjax(tIntactHiGjService.updateTIntactHiGj(tIntactHiGj));
+    }
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:remove')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactHiGjService.deleteTIntactHiGjByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/controller/TIntactHiPumpController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.project.intact.his.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.service.ITIntactHiPumpService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性泵台账历史记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@RestController
+@RequestMapping("/his/pump")
+public class TIntactHiPumpController extends BaseController
+{
+    @Autowired
+    private ITIntactHiPumpService tIntactHiPumpService;
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactHiPump tIntactHiPump)
+    {
+        startPage();
+        List<TIntactHiPump> list = tIntactHiPumpService.selectTIntactHiPumpList(tIntactHiPump);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性泵台账历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:export')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactHiPump tIntactHiPump)
+    {
+        List<TIntactHiPump> list = tIntactHiPumpService.selectTIntactHiPumpList(tIntactHiPump);
+        ExcelUtil<TIntactHiPump> util = new ExcelUtil<TIntactHiPump>(TIntactHiPump.class);
+        return util.exportExcel(list, "pump");
+    }
+
+    /**
+     * 获取设备完整性泵台账历史记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactHiPumpService.selectTIntactHiPumpById(id));
+    }
+
+
+    /**
+     * 获取泵台账历史改造历史
+     */
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
+    @GetMapping(value = "/reform/{devId}")
+    public AjaxResult getReform(@PathVariable("devId") Long devId)
+    {
+
+        return AjaxResult.success(tIntactHiPumpService.selectTIntactHiPumpByReform(devId));
+    }
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:add')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactHiPump tIntactHiPump)
+    {
+
+        tIntactHiPumpService.deleteTIntactHiPumpByDevId(tIntactHiPump.getId());
+        tIntactHiPump.setDevId(tIntactHiPump.getId());
+        tIntactHiPump.setHiType((long)1);
+        tIntactHiPumpService.insertTIntactHiPump(tIntactHiPump);
+        return AjaxResult.success("id" , tIntactHiPump.getId());
+    }
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:edit')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactHiPump tIntactHiPump)
+    {
+        return toAjax(tIntactHiPumpService.updateTIntactHiPump(tIntactHiPump));
+    }
+
+    /**
+     * 删除设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:remove')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactHiPumpService.deleteTIntactHiPumpByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/domain/TIntactHiGj.java

@@ -0,0 +1,888 @@
+package com.ruoyi.project.intact.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性-管件台账变更历史记录对象 t_intacthi_gj
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public class TIntactHiGj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long devId;
+
+    /** 状态0:改造,1:修改 */
+    @Excel(name = "状态0:改造,1:修改")
+    private Long hiType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+    public void setDevId(Long devId)
+    {
+        this.devId = devId;
+    }
+
+    public Long getDevId()
+    {
+        return devId;
+    }
+    public void setHiType(Long hiType)
+    {
+        this.hiType = hiType;
+    }
+
+    public Long getHiType()
+    {
+        return hiType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .append("devId", getDevId())
+            .append("hiType", getHiType())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/domain/TIntactHiPump.java

@@ -0,0 +1,888 @@
+package com.ruoyi.project.intact.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性泵台账历史记录对象 t_intactHi_pump
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public class TIntactHiPump extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long devId;
+
+    /** 状态0:改造,1:修改 */
+    @Excel(name = "状态0:改造,1:修改")
+    private Long hiType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+    public void setDevId(Long devId)
+    {
+        this.devId = devId;
+    }
+
+    public Long getDevId()
+    {
+        return devId;
+    }
+    public void setHiType(Long hiType)
+    {
+        this.hiType = hiType;
+    }
+
+    public Long getHiType()
+    {
+        return hiType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .append("devId", getDevId())
+            .append("hiType", getHiType())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/mapper/TIntactHiGjMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+
+
+/**
+ * 设备完整性-管件台账变更历史记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface TIntactHiGjMapper 
+{
+    /**
+     * 查询设备完整性-管件台账变更历史记录
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    public TIntactHiGj selectTIntactHiGjById(Long id);
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 设备完整性-管件台账变更历史记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactHiGj> selectTIntactHiGjList(TIntactHiGj tIntactHiGj);
+
+
+    //查询改造记录
+    public List<TIntactHiGj> selectTIntactHiGjByReform(Long devId);
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiGjById(Long id);
+
+    /**
+     * 批量删除设备完整性-管件台账变更历史记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactHiGjByIds(Long[] ids);
+
+    //设备id删除
+    public int deleteTIntactHiGjByDevId(Long devId);
+}

master/src/main/java/com/ruoyi/project/intact/his/mapper/TIntactHiPumpMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
+
+/**
+ * 设备完整性泵台账历史记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface TIntactHiPumpMapper extends BaseMapper<TIntactHiPump>
+{
+    /**
+     * 查询设备完整性泵台账历史记录
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 设备完整性泵台账历史记录
+     */
+    public TIntactHiPump selectTIntactHiPumpById(Long id);
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 设备完整性泵台账历史记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactHiPump> selectTIntactHiPumpList(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+    //查询改造记录
+    public List<TIntactHiPump> selectTIntactHiPumpByReform(Long devId);
+
+    /**
+     * 删除设备完整性泵台账历史记录
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpById(Long id);
+
+    /**
+     * 批量删除设备完整性泵台账历史记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpByIds(Long[] ids);
+
+    public int deleteTIntactHiPumpByDevId(Long devId);
+}

master/src/main/java/com/ruoyi/project/intact/his/service/ITIntactHiGjService.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.service;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+
+import java.util.List;
+
+/**
+ * 设备完整性-管件台账变更历史记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface ITIntactHiGjService 
+{
+    /**
+     * 查询设备完整性-管件台账变更历史记录
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    public TIntactHiGj selectTIntactHiGjById(Long id);
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 设备完整性-管件台账变更历史记录集合
+     */
+    public List<TIntactHiGj> selectTIntactHiGjList(TIntactHiGj tIntactHiGj);
+
+    public  List<TIntactHiGj> selectTIntactHiGjByReform(Long devId);
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 批量删除设备完整性-管件台账变更历史记录
+     * 
+     * @param ids 需要删除的设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiGjByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录信息
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+
+    public int deleteTIntactHiGjById(Long id);
+    /**
+     * 根据devid删除特种设备压力容器的台账历史信息
+     * @param devId
+     * @return
+     */
+    public int deleteTIntactHiGjByDevId(Long devId);
+}

master/src/main/java/com/ruoyi/project/intact/his/service/ITIntactHiPumpService.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.service;
+
+import java.util.List;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
+
+/**
+ * 设备完整性泵台账历史记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface ITIntactHiPumpService 
+{
+    /**
+     * 查询设备完整性泵台账历史记录
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 设备完整性泵台账历史记录
+     */
+    public TIntactHiPump selectTIntactHiPumpById(Long id);
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 设备完整性泵台账历史记录集合
+     */
+    public List<TIntactHiPump> selectTIntactHiPumpList(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+
+    public  List<TIntactHiPump> selectTIntactHiPumpByReform(Long devId);
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 批量删除设备完整性泵台账历史记录
+     * 
+     * @param ids 需要删除的设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性泵台账历史记录信息
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpById(Long id);
+
+    /**
+     * 根据devid删除特种设备压力容器的台账历史信息
+     * @param devId
+     * @return
+     */
+    public int deleteTIntactHiPumpByDevId(Long devId);
+}

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

@@ -0,0 +1,111 @@
+package com.ruoyi.project.intact.his.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.mapper.TIntactHiGjMapper;
+import com.ruoyi.project.intact.his.service.ITIntactHiGjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备完整性-管件台账变更历史记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@Service
+public class TIntactHiGjServiceImpl implements ITIntactHiGjService
+{
+    @Autowired
+    private TIntactHiGjMapper tIntactHiGjMapper;
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录
+     *
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    @Override
+    public TIntactHiGj selectTIntactHiGjById(Long id)
+    {
+        return tIntactHiGjMapper.selectTIntactHiGjById(id);
+    }
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    @Override
+    public List<TIntactHiGj> selectTIntactHiGjList(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.selectTIntactHiGjList(tIntactHiGj);
+    }
+
+
+    @Override
+    public List<TIntactHiGj> selectTIntactHiGjByReform(Long devId) {
+        return tIntactHiGjMapper.selectTIntactHiGjByReform(devId);
+    }
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactHiGj(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.insertTIntactHiGj(tIntactHiGj);
+    }
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactHiGj(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.updateTIntactHiGj(tIntactHiGj);
+    }
+
+    /**
+     * 批量删除设备完整性-管件台账变更历史记录
+     *
+     * @param ids 需要删除的设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiGjByIds(Long[] ids)
+    {
+        return tIntactHiGjMapper.deleteTIntactHiGjByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录信息
+     *
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+
+    @Override
+    public int deleteTIntactHiGjById(Long id)
+    {
+        return tIntactHiGjMapper.deleteTIntactHiGjById(id);
+    }
+    /**
+     * 通过devId删除修改记录
+     * @param devId
+     * @return
+     */
+    @Override
+    public int deleteTIntactHiGjByDevId(Long devId) {
+        return tIntactHiGjMapper.deleteTIntactHiGjByDevId(devId);
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.ruoyi.project.intact.his.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.mapper.TIntactHiPumpMapper;
+import com.ruoyi.project.intact.his.service.ITIntactHiPumpService;
+import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 设备完整性泵台账历史记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@Service
+public class TIntactHiPumpServiceImpl implements ITIntactHiPumpService
+{
+    @Autowired
+    private TIntactHiPumpMapper tIntactHiPumpMapper;
+
+    /**
+     * 查询设备完整性泵台账历史记录
+     *
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 设备完整性泵台账历史记录
+     */
+    @Override
+    public TIntactHiPump selectTIntactHiPumpById(Long id)
+    {
+        return tIntactHiPumpMapper.selectTIntactHiPumpById(id);
+    }
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 设备完整性泵台账历史记录
+     */
+    @Override
+    public List<TIntactHiPump> selectTIntactHiPumpList(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.selectTIntactHiPumpList(tIntactHiPump);
+    }
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactHiPump(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.insertTIntactHiPump(tIntactHiPump);
+    }
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactHiPump(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.updateTIntactHiPump(tIntactHiPump);
+    }
+
+    @Override
+    public List<TIntactHiPump> selectTIntactHiPumpByReform(Long devId) {
+        return tIntactHiPumpMapper.selectTIntactHiPumpByReform(devId);
+    }
+
+    /**
+     * 批量删除设备完整性泵台账历史记录
+     *
+     * @param ids 需要删除的设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiPumpByIds(Long[] ids)
+    {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性泵台账历史记录信息
+     *
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiPumpById(Long id)
+    {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpById(id);
+    }
+
+    /**
+     * 通过devId删除修改记录
+     * @param devId
+     * @return
+     */
+    @Override
+    public int deleteTIntactHiPumpByDevId(Long devId) {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpByDevId(devId);
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.ruoyi.project.intact.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.sems.domain.TApprove;
+
+/**
+ * 设备完整性维修申请Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-27
+ */
+public interface TApproveMaintenanceMapper extends BaseMapper<TApproveMaintenance>
+{
+    /**
+     * 查询设备完整性维修申请
+     * 
+     * @param id 设备完整性维修申请ID
+     * @return 设备完整性维修申请
+     */
+    public TApproveMaintenance selectTApproveMaintenanceById(Long id);
+
+    /**
+     * 查询设备完整性维修申请列表
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 设备完整性维修申请集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TApproveMaintenance> selectTApproveMaintenanceList(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 新增设备完整性维修申请
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    public int insertTApproveMaintenance(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 修改设备完整性维修申请
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    public int updateTApproveMaintenance(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 删除设备完整性维修申请
+     * 
+     * @param id 设备完整性维修申请ID
+     * @return 结果
+     */
+    public int deleteTApproveMaintenanceById(Long id);
+
+    /**
+     * 批量删除设备完整性维修申请
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTApproveMaintenanceByIds(Long[] ids);
+}

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

@@ -0,0 +1,66 @@
+package com.ruoyi.project.intact.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactApprove;
+import com.ruoyi.project.sems.domain.TApprove;
+
+/**
+ * 设备完整性申请Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-24
+ */
+public interface TIntactApproveMapper extends BaseMapper<TIntactApprove>
+{
+    /**
+     * 查询设备完整性申请
+     * 
+     * @param id 设备完整性申请ID
+     * @return 设备完整性申请
+     */
+    public TIntactApprove selectTIntactApproveById(Long id);
+
+    /**
+     * 查询设备完整性申请列表
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 设备完整性申请集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactApprove> selectTIntactApproveList(TIntactApprove tIntactApprove);
+
+    /**
+     * 新增设备完整性申请
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    public int insertTIntactApprove(TIntactApprove tIntactApprove);
+
+    /**
+     * 修改设备完整性申请
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    public int updateTIntactApprove(TIntactApprove tIntactApprove);
+
+    /**
+     * 删除设备完整性申请
+     * 
+     * @param id 设备完整性申请ID
+     * @return 结果
+     */
+    public int deleteTIntactApproveById(Long id);
+
+    /**
+     * 批量删除设备完整性申请
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactApproveByIds(Long[] ids);
+}

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

@@ -0,0 +1,69 @@
+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.TIntactApprove;
+import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+
+/**
+ * 设备完整性管件台账Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@TableName("T_INTACT_GJ")
+public interface TIntactGjMapper  extends BaseMapper<TIntactGj>
+{
+    /**
+     * 查询设备完整性管件台账
+     * 
+     * @param id 设备完整性管件台账ID
+     * @return 设备完整性管件台账
+     */
+    public TIntactGj selectTIntactGjById(Long id);
+
+    /**
+     * 查询设备完整性管件台账列表
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 设备完整性管件台账集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactGj> selectTIntactGjList(TIntactGj tIntactGj);
+
+    /**
+     * 新增设备完整性管件台账
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    public int insertTIntactGj(TIntactGj tIntactGj);
+
+    /**
+     * 修改设备完整性管件台账
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    public int updateTIntactGj(TIntactGj tIntactGj);
+
+    /**
+     * 删除设备完整性管件台账
+     * 
+     * @param id 设备完整性管件台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGjById(Long id);
+
+    /**
+     * 批量删除设备完整性管件台账
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactGjByIds(Long[] ids);
+}

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

@@ -0,0 +1,66 @@
+package com.ruoyi.project.intact.mapper;
+
+import java.util.List;
+
+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接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface TIntactGylMapper extends BaseMapper<TIntactGyl>
+{
+    /**
+     * 查询设备完整性工业炉台账
+     * 
+     * @param id 设备完整性工业炉台账ID
+     * @return 设备完整性工业炉台账
+     */
+    public TIntactGyl selectTIntactGylById(Long id);
+
+    /**
+     * 查询设备完整性工业炉台账列表
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 设备完整性工业炉台账集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactGyl> selectTIntactGylList(TIntactGyl tIntactGyl);
+
+    /**
+     * 新增设备完整性工业炉台账
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    public int insertTIntactGyl(TIntactGyl tIntactGyl);
+
+    /**
+     * 修改设备完整性工业炉台账
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    public int updateTIntactGyl(TIntactGyl tIntactGyl);
+
+    /**
+     * 删除设备完整性工业炉台账
+     * 
+     * @param id 设备完整性工业炉台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGylById(Long id);
+
+    /**
+     * 批量删除设备完整性工业炉台账
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactGylByIds(Long[] ids);
+}

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

@@ -0,0 +1,68 @@
+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.TIntactApprove;
+import com.ruoyi.project.intact.domain.TIntactPump;
+
+/**
+ * 设备完整性泵台账Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@TableName("T_INTACT_PUMP")
+public interface TIntactPumpMapper  extends BaseMapper<TIntactPump>
+{
+    /**
+     * 查询设备完整性泵台账
+     * 
+     * @param id 设备完整性泵台账ID
+     * @return 设备完整性泵台账
+     */
+    public TIntactPump selectTIntactPumpById(Long id);
+
+    /**
+     * 查询设备完整性泵台账列表
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 设备完整性泵台账集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactPump> selectTIntactPumpList(TIntactPump tIntactPump);
+
+    /**
+     * 新增设备完整性泵台账
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    public int insertTIntactPump(TIntactPump tIntactPump);
+
+    /**
+     * 修改设备完整性泵台账
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    public int updateTIntactPump(TIntactPump tIntactPump);
+
+    /**
+     * 删除设备完整性泵台账
+     * 
+     * @param id 设备完整性泵台账ID
+     * @return 结果
+     */
+    public int deleteTIntactPumpById(Long id);
+
+    /**
+     * 批量删除设备完整性泵台账
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactPumpByIds(Long[] ids);
+}

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

@@ -0,0 +1,66 @@
+package com.ruoyi.project.intact.mapper;
+
+import java.util.List;
+
+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.TIntactYsj;
+
+/**
+ * 设备完整性压缩机台账Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface TIntactYsjMapper extends BaseMapper<TIntactYsj>
+{
+    /**
+     * 查询设备完整性压缩机台账
+     * 
+     * @param id 设备完整性压缩机台账ID
+     * @return 设备完整性压缩机台账
+     */
+    public TIntactYsj selectTIntactYsjById(Long id);
+
+    /**
+     * 查询设备完整性压缩机台账列表
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 设备完整性压缩机台账集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactYsj> selectTIntactYsjList(TIntactYsj tIntactYsj);
+
+    /**
+     * 新增设备完整性压缩机台账
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    public int insertTIntactYsj(TIntactYsj tIntactYsj);
+
+    /**
+     * 修改设备完整性压缩机台账
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    public int updateTIntactYsj(TIntactYsj tIntactYsj);
+
+    /**
+     * 删除设备完整性压缩机台账
+     * 
+     * @param id 设备完整性压缩机台账ID
+     * @return 结果
+     */
+    public int deleteTIntactYsjById(Long id);
+
+    /**
+     * 批量删除设备完整性压缩机台账
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactYsjByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.intact.service;
+
+import java.util.List;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+
+/**
+ * 设备完整性维修申请Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-27
+ */
+public interface ITApproveMaintenanceService 
+{
+    /**
+     * 查询设备完整性维修申请
+     * 
+     * @param id 设备完整性维修申请ID
+     * @return 设备完整性维修申请
+     */
+    public TApproveMaintenance selectTApproveMaintenanceById(Long id);
+
+    /**
+     * 查询设备完整性维修申请列表
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 设备完整性维修申请集合
+     */
+    public List<TApproveMaintenance> selectTApproveMaintenanceList(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 新增设备完整性维修申请
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    public int insertTApproveMaintenance(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 修改设备完整性维修申请
+     * 
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    public int updateTApproveMaintenance(TApproveMaintenance tApproveMaintenance);
+
+    /**
+     * 批量删除设备完整性维修申请
+     * 
+     * @param ids 需要删除的设备完整性维修申请ID
+     * @return 结果
+     */
+    public int deleteTApproveMaintenanceByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性维修申请信息
+     * 
+     * @param id 设备完整性维修申请ID
+     * @return 结果
+     */
+    public int deleteTApproveMaintenanceById(Long id);
+}

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

@@ -0,0 +1,64 @@
+package com.ruoyi.project.intact.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.intact.domain.TIntactApprove;
+import com.ruoyi.project.sems.domain.TApprove;
+
+/**
+ * 设备完整性申请Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-24
+ */
+public interface ITIntactApproveService  extends IService<TIntactApprove>
+{
+    /**
+     * 查询设备完整性申请
+     * 
+     * @param id 设备完整性申请ID
+     * @return 设备完整性申请
+     */
+    public TIntactApprove selectTIntactApproveById(Long id);
+
+    /**
+     * 查询设备完整性申请列表
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 设备完整性申请集合
+     */
+    public List<TIntactApprove> selectTIntactApproveList(TIntactApprove tIntactApprove);
+
+    /**
+     * 新增设备完整性申请
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    public int insertTIntactApprove(TIntactApprove tIntactApprove);
+
+    /**
+     * 修改设备完整性申请
+     * 
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    public int updateTIntactApprove(TIntactApprove tIntactApprove);
+
+    /**
+     * 批量删除设备完整性申请
+     * 
+     * @param ids 需要删除的设备完整性申请ID
+     * @return 结果
+     */
+    public int deleteTIntactApproveByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性申请信息
+     * 
+     * @param id 设备完整性申请ID
+     * @return 结果
+     */
+    public int deleteTIntactApproveById(Long id);
+}

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

@@ -0,0 +1,65 @@
+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.TIntactPump;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+
+/**
+ * 设备完整性管件台账Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+public interface ITIntactGjService extends IService<TIntactGj>
+{
+    /**
+     * 查询设备完整性管件台账
+     * 
+     * @param id 设备完整性管件台账ID
+     * @return 设备完整性管件台账
+     */
+    public TIntactGj selectTIntactGjById(Long id);
+
+    /**
+     * 查询设备完整性管件台账列表
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 设备完整性管件台账集合
+     */
+    public List<TIntactGj> selectTIntactGjList(TIntactGj tIntactGj);
+
+    /**
+     * 新增设备完整性管件台账
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    public int insertTIntactGj(TIntactGj tIntactGj);
+
+    /**
+     * 修改设备完整性管件台账
+     * 
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    public int updateTIntactGj(TIntactGj tIntactGj);
+
+    /**
+     * 批量删除设备完整性管件台账
+     * 
+     * @param ids 需要删除的设备完整性管件台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGjByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性管件台账信息
+     * 
+     * @param id 设备完整性管件台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGjById(Long id);
+}

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

@@ -0,0 +1,64 @@
+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;
+
+/**
+ * 设备完整性工业炉台账Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface ITIntactGylService extends IService<TIntactGyl>
+{
+    /**
+     * 查询设备完整性工业炉台账
+     * 
+     * @param id 设备完整性工业炉台账ID
+     * @return 设备完整性工业炉台账
+     */
+    public TIntactGyl selectTIntactGylById(Long id);
+
+    /**
+     * 查询设备完整性工业炉台账列表
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 设备完整性工业炉台账集合
+     */
+    public List<TIntactGyl> selectTIntactGylList(TIntactGyl tIntactGyl);
+
+    /**
+     * 新增设备完整性工业炉台账
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    public int insertTIntactGyl(TIntactGyl tIntactGyl);
+
+    /**
+     * 修改设备完整性工业炉台账
+     * 
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    public int updateTIntactGyl(TIntactGyl tIntactGyl);
+
+    /**
+     * 批量删除设备完整性工业炉台账
+     * 
+     * @param ids 需要删除的设备完整性工业炉台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGylByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性工业炉台账信息
+     * 
+     * @param id 设备完整性工业炉台账ID
+     * @return 结果
+     */
+    public int deleteTIntactGylById(Long id);
+}

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

@@ -0,0 +1,64 @@
+package com.ruoyi.project.intact.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+
+/**
+ * 设备完整性泵台账Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+public interface ITIntactPumpService extends IService<TIntactPump>
+{
+    /**
+     * 查询设备完整性泵台账
+     * 
+     * @param id 设备完整性泵台账ID
+     * @return 设备完整性泵台账
+     */
+    public TIntactPump selectTIntactPumpById(Long id);
+
+    /**
+     * 查询设备完整性泵台账列表
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 设备完整性泵台账集合
+     */
+    public List<TIntactPump> selectTIntactPumpList(TIntactPump tIntactPump);
+
+    /**
+     * 新增设备完整性泵台账
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    public int insertTIntactPump(TIntactPump tIntactPump);
+
+    /**
+     * 修改设备完整性泵台账
+     * 
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    public int updateTIntactPump(TIntactPump tIntactPump);
+
+    /**
+     * 批量删除设备完整性泵台账
+     * 
+     * @param ids 需要删除的设备完整性泵台账ID
+     * @return 结果
+     */
+    public int deleteTIntactPumpByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性泵台账信息
+     * 
+     * @param id 设备完整性泵台账ID
+     * @return 结果
+     */
+    public int deleteTIntactPumpById(Long id);
+}

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

@@ -0,0 +1,64 @@
+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.TIntactYsj;
+
+/**
+ * 设备完整性压缩机台账Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+public interface ITIntactYsjService  extends IService<TIntactYsj>
+{
+    /**
+     * 查询设备完整性压缩机台账
+     * 
+     * @param id 设备完整性压缩机台账ID
+     * @return 设备完整性压缩机台账
+     */
+    public TIntactYsj selectTIntactYsjById(Long id);
+
+    /**
+     * 查询设备完整性压缩机台账列表
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 设备完整性压缩机台账集合
+     */
+    public List<TIntactYsj> selectTIntactYsjList(TIntactYsj tIntactYsj);
+
+    /**
+     * 新增设备完整性压缩机台账
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    public int insertTIntactYsj(TIntactYsj tIntactYsj);
+
+    /**
+     * 修改设备完整性压缩机台账
+     * 
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    public int updateTIntactYsj(TIntactYsj tIntactYsj);
+
+    /**
+     * 批量删除设备完整性压缩机台账
+     * 
+     * @param ids 需要删除的设备完整性压缩机台账ID
+     * @return 结果
+     */
+    public int deleteTIntactYsjByIds(Long[] ids);
+
+    /**
+     * 删除设备完整性压缩机台账信息
+     * 
+     * @param id 设备完整性压缩机台账ID
+     * @return 结果
+     */
+    public int deleteTIntactYsjById(Long id);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.project.intact.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.intact.mapper.TApproveMaintenanceMapper;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.intact.service.ITApproveMaintenanceService;
+
+/**
+ * 设备完整性维修申请Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-27
+ */
+@Service
+public class TApproveMaintenanceServiceImpl implements ITApproveMaintenanceService
+{
+    @Autowired
+    private TApproveMaintenanceMapper tApproveMaintenanceMapper;
+
+    /**
+     * 查询设备完整性维修申请
+     *
+     * @param id 设备完整性维修申请ID
+     * @return 设备完整性维修申请
+     */
+    @Override
+    public TApproveMaintenance selectTApproveMaintenanceById(Long id)
+    {
+        return tApproveMaintenanceMapper.selectTApproveMaintenanceById(id);
+    }
+
+    /**
+     * 查询设备完整性维修申请列表
+     *
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 设备完整性维修申请
+     */
+    @Override
+    public List<TApproveMaintenance> selectTApproveMaintenanceList(TApproveMaintenance tApproveMaintenance)
+    {
+        return tApproveMaintenanceMapper.selectTApproveMaintenanceList(tApproveMaintenance);
+    }
+
+    /**
+     * 新增设备完整性维修申请
+     *
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    @Override
+    public int insertTApproveMaintenance(TApproveMaintenance tApproveMaintenance)
+    {
+        return tApproveMaintenanceMapper.insertTApproveMaintenance(tApproveMaintenance);
+    }
+
+    /**
+     * 修改设备完整性维修申请
+     *
+     * @param tApproveMaintenance 设备完整性维修申请
+     * @return 结果
+     */
+    @Override
+    public int updateTApproveMaintenance(TApproveMaintenance tApproveMaintenance)
+    {
+        return tApproveMaintenanceMapper.updateTApproveMaintenance(tApproveMaintenance);
+    }
+
+    /**
+     * 批量删除设备完整性维修申请
+     *
+     * @param ids 需要删除的设备完整性维修申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTApproveMaintenanceByIds(Long[] ids)
+    {
+        return tApproveMaintenanceMapper.deleteTApproveMaintenanceByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性维修申请信息
+     *
+     * @param id 设备完整性维修申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTApproveMaintenanceById(Long id)
+    {
+        return tApproveMaintenanceMapper.deleteTApproveMaintenanceById(id);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.intact.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.intact.mapper.TIntactApproveMapper;
+import com.ruoyi.project.intact.domain.TIntactApprove;
+import com.ruoyi.project.intact.service.ITIntactApproveService;
+
+/**
+ * 设备完整性申请Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-24
+ */
+@Service
+public class TIntactApproveServiceImpl extends ServiceImpl<TIntactApproveMapper, TIntactApprove> implements ITIntactApproveService
+{
+    @Autowired
+    private TIntactApproveMapper tIntactApproveMapper;
+
+    /**
+     * 查询设备完整性申请
+     *
+     * @param id 设备完整性申请ID
+     * @return 设备完整性申请
+     */
+    @Override
+    public TIntactApprove selectTIntactApproveById(Long id)
+    {
+        return tIntactApproveMapper.selectTIntactApproveById(id);
+    }
+
+    /**
+     * 查询设备完整性申请列表
+     *
+     * @param tIntactApprove 设备完整性申请
+     * @return 设备完整性申请
+     */
+    @Override
+    public List<TIntactApprove> selectTIntactApproveList(TIntactApprove tIntactApprove)
+    {
+        return tIntactApproveMapper.selectTIntactApproveList(tIntactApprove);
+    }
+
+    /**
+     * 新增设备完整性申请
+     *
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactApprove(TIntactApprove tIntactApprove)
+    {
+        return tIntactApproveMapper.insertTIntactApprove(tIntactApprove);
+    }
+
+    /**
+     * 修改设备完整性申请
+     *
+     * @param tIntactApprove 设备完整性申请
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactApprove(TIntactApprove tIntactApprove)
+    {
+        return tIntactApproveMapper.updateTIntactApprove(tIntactApprove);
+    }
+
+    /**
+     * 批量删除设备完整性申请
+     *
+     * @param ids 需要删除的设备完整性申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactApproveByIds(Long[] ids)
+    {
+        return tIntactApproveMapper.deleteTIntactApproveByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性申请信息
+     *
+     * @param id 设备完整性申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactApproveById(Long id)
+    {
+        return tIntactApproveMapper.deleteTIntactApproveById(id);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.intact.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.intact.mapper.TIntactGjMapper;
+import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.service.ITIntactGjService;
+
+/**
+ * 设备完整性管件台账Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@Service
+public class TIntactGjServiceImpl extends ServiceImpl<TIntactGjMapper, TIntactGj> implements ITIntactGjService
+{
+    @Autowired
+    private TIntactGjMapper tIntactGjMapper;
+
+    /**
+     * 查询设备完整性管件台账
+     *
+     * @param id 设备完整性管件台账ID
+     * @return 设备完整性管件台账
+     */
+    @Override
+    public TIntactGj selectTIntactGjById(Long id)
+    {
+        return tIntactGjMapper.selectTIntactGjById(id);
+    }
+
+    /**
+     * 查询设备完整性管件台账列表
+     *
+     * @param tIntactGj 设备完整性管件台账
+     * @return 设备完整性管件台账
+     */
+    @Override
+    public List<TIntactGj> selectTIntactGjList(TIntactGj tIntactGj)
+    {
+        return tIntactGjMapper.selectTIntactGjList(tIntactGj);
+    }
+
+    /**
+     * 新增设备完整性管件台账
+     *
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactGj(TIntactGj tIntactGj)
+    {
+        return tIntactGjMapper.insertTIntactGj(tIntactGj);
+    }
+
+    /**
+     * 修改设备完整性管件台账
+     *
+     * @param tIntactGj 设备完整性管件台账
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactGj(TIntactGj tIntactGj)
+    {
+        return tIntactGjMapper.updateTIntactGj(tIntactGj);
+    }
+
+    /**
+     * 批量删除设备完整性管件台账
+     *
+     * @param ids 需要删除的设备完整性管件台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactGjByIds(Long[] ids)
+    {
+        return tIntactGjMapper.deleteTIntactGjByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性管件台账信息
+     *
+     * @param id 设备完整性管件台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactGjById(Long id)
+    {
+        return tIntactGjMapper.deleteTIntactGjById(id);
+    }
+}

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

@@ -0,0 +1,98 @@
+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.TIntactPump;
+import com.ruoyi.project.intact.mapper.TIntactGjMapper;
+import com.ruoyi.project.intact.mapper.TIntactPumpMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.intact.mapper.TIntactGylMapper;
+import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.service.ITIntactGylService;
+
+/**
+ * 设备完整性工业炉台账Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@Service
+public class TIntactGylServiceImpl extends ServiceImpl<TIntactGylMapper, TIntactGyl> implements ITIntactGylService
+{
+    @Autowired
+    private TIntactGylMapper tIntactGylMapper;
+
+    /**
+     * 查询设备完整性工业炉台账
+     *
+     * @param id 设备完整性工业炉台账ID
+     * @return 设备完整性工业炉台账
+     */
+    @Override
+    public TIntactGyl selectTIntactGylById(Long id)
+    {
+        return tIntactGylMapper.selectTIntactGylById(id);
+    }
+
+    /**
+     * 查询设备完整性工业炉台账列表
+     *
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 设备完整性工业炉台账
+     */
+    @Override
+    public List<TIntactGyl> selectTIntactGylList(TIntactGyl tIntactGyl)
+    {
+        return tIntactGylMapper.selectTIntactGylList(tIntactGyl);
+    }
+
+    /**
+     * 新增设备完整性工业炉台账
+     *
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactGyl(TIntactGyl tIntactGyl)
+    {
+        return tIntactGylMapper.insertTIntactGyl(tIntactGyl);
+    }
+
+    /**
+     * 修改设备完整性工业炉台账
+     *
+     * @param tIntactGyl 设备完整性工业炉台账
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactGyl(TIntactGyl tIntactGyl)
+    {
+        return tIntactGylMapper.updateTIntactGyl(tIntactGyl);
+    }
+
+    /**
+     * 批量删除设备完整性工业炉台账
+     *
+     * @param ids 需要删除的设备完整性工业炉台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactGylByIds(Long[] ids)
+    {
+        return tIntactGylMapper.deleteTIntactGylByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性工业炉台账信息
+     *
+     * @param id 设备完整性工业炉台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactGylById(Long id)
+    {
+        return tIntactGylMapper.deleteTIntactGylById(id);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.project.intact.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.intact.mapper.TIntactPumpMapper;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.intact.service.ITIntactPumpService;
+
+/**
+ * 设备完整性泵台账Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-22
+ */
+@Service
+public class TIntactPumpServiceImpl extends ServiceImpl<TIntactPumpMapper, TIntactPump> implements ITIntactPumpService
+{
+    @Autowired
+    private TIntactPumpMapper tIntactPumpMapper;
+
+    /**
+     * 查询设备完整性泵台账
+     *
+     * @param id 设备完整性泵台账ID
+     * @return 设备完整性泵台账
+     */
+    @Override
+    public TIntactPump selectTIntactPumpById(Long id)
+    {
+        return tIntactPumpMapper.selectTIntactPumpById(id);
+    }
+
+    /**
+     * 查询设备完整性泵台账列表
+     *
+     * @param tIntactPump 设备完整性泵台账
+     * @return 设备完整性泵台账
+     */
+    @Override
+    public List<TIntactPump> selectTIntactPumpList(TIntactPump tIntactPump)
+    {
+        return tIntactPumpMapper.selectTIntactPumpList(tIntactPump);
+    }
+
+    /**
+     * 新增设备完整性泵台账
+     *
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactPump(TIntactPump tIntactPump)
+    {
+        return tIntactPumpMapper.insertTIntactPump(tIntactPump);
+    }
+
+    /**
+     * 修改设备完整性泵台账
+     *
+     * @param tIntactPump 设备完整性泵台账
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactPump(TIntactPump tIntactPump)
+    {
+        return tIntactPumpMapper.updateTIntactPump(tIntactPump);
+    }
+
+    /**
+     * 批量删除设备完整性泵台账
+     *
+     * @param ids 需要删除的设备完整性泵台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactPumpByIds(Long[] ids)
+    {
+        return tIntactPumpMapper.deleteTIntactPumpByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性泵台账信息
+     *
+     * @param id 设备完整性泵台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactPumpById(Long id)
+    {
+        return tIntactPumpMapper.deleteTIntactPumpById(id);
+    }
+}

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

@@ -0,0 +1,97 @@
+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.TIntactYsjMapper;
+import com.ruoyi.project.intact.domain.TIntactYsj;
+import com.ruoyi.project.intact.service.ITIntactYsjService;
+
+/**
+ * 设备完整性压缩机台账Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-21
+ */
+@Service
+public class TIntactYsjServiceImpl extends ServiceImpl<TIntactYsjMapper, TIntactYsj> implements ITIntactYsjService
+{
+    @Autowired
+    private TIntactYsjMapper tIntactYsjMapper;
+
+    /**
+     * 查询设备完整性压缩机台账
+     *
+     * @param id 设备完整性压缩机台账ID
+     * @return 设备完整性压缩机台账
+     */
+    @Override
+    public TIntactYsj selectTIntactYsjById(Long id)
+    {
+        return tIntactYsjMapper.selectTIntactYsjById(id);
+    }
+
+    /**
+     * 查询设备完整性压缩机台账列表
+     *
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 设备完整性压缩机台账
+     */
+    @Override
+    public List<TIntactYsj> selectTIntactYsjList(TIntactYsj tIntactYsj)
+    {
+        return tIntactYsjMapper.selectTIntactYsjList(tIntactYsj);
+    }
+
+    /**
+     * 新增设备完整性压缩机台账
+     *
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactYsj(TIntactYsj tIntactYsj)
+    {
+        return tIntactYsjMapper.insertTIntactYsj(tIntactYsj);
+    }
+
+    /**
+     * 修改设备完整性压缩机台账
+     *
+     * @param tIntactYsj 设备完整性压缩机台账
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactYsj(TIntactYsj tIntactYsj)
+    {
+        return tIntactYsjMapper.updateTIntactYsj(tIntactYsj);
+    }
+
+    /**
+     * 批量删除设备完整性压缩机台账
+     *
+     * @param ids 需要删除的设备完整性压缩机台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactYsjByIds(Long[] ids)
+    {
+        return tIntactYsjMapper.deleteTIntactYsjByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性压缩机台账信息
+     *
+     * @param id 设备完整性压缩机台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactYsjById(Long id)
+    {
+        return tIntactYsjMapper.deleteTIntactYsjById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/plant/controller/TBrithstaffmgrController.java

@@ -36,7 +36,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 查询生日提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:list')")
     @GetMapping("/list")
     public TableDataInfo list(TBrithstaffmgr tBrithstaffmgr)
     {
@@ -48,7 +47,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 导出生日提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:export')")
     @Log(title = "生日提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TBrithstaffmgr tBrithstaffmgr)
@@ -61,7 +59,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 获取生日提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +68,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 新增生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:add')")
     @Log(title = "生日提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBrithstaffmgr tBrithstaffmgr)
@@ -82,7 +78,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 修改生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:edit')")
     @Log(title = "生日提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBrithstaffmgr tBrithstaffmgr)
@@ -93,7 +88,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 删除生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:remove')")
     @Log(title = "生日提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -18,9 +18,10 @@ import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import com.ruoyi.project.system.service.ISysUserService;
-import com.ruoyi.project.system.service.ITAlarmPrincipalService;
 import com.ruoyi.project.training.domain.*;
 import com.ruoyi.project.training.service.*;
+import com.ruoyi.project.training.spec.service.ITStPlanService;
+import com.ruoyi.project.training.spec.service.ITStSuccessorService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -84,6 +85,12 @@ public class TStaffmgrController extends BaseController
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private ITStSuccessorService stSuccessorService;
+
+    @Autowired
+    private ITStPlanService tStPlanService;
+
     /**
      * 获取当前用户id
      * @return 当前用户id
@@ -135,6 +142,19 @@ public class TStaffmgrController extends BaseController
         return AjaxResult.success(tStaffmgrService.selectMentorList(tStaffmgr));
     }
 
+    /**
+     * 查询人员管理列表--包含离职人员
+     */
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TStaffmgr tStaffmgr)
+    {
+        ServletUtils.getParameter("sexs");
+        startPage();
+        logger.info("staffmgr:" + tStaffmgr);
+        List<TStaffmgr> list = tStaffmgrMapper.selectTStaffmgrListAll(tStaffmgr);
+        return getDataTable(list);
+    }
+
     /**
      * 查询人员管理列表
      */
@@ -477,7 +497,11 @@ public class TStaffmgrController extends BaseController
             tTrainingrecords.setDelFlag(9l);
             tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
         }
-
+        // 王子文 2022年6月27日 添加
+        // 离职时修改继任者清单状态、培养计划状态
+        Long staffId = Long.parseLong(tStaffmgrService.selectTStaffmgrById(id).getStaffid());
+        stSuccessorService.updateStateByStaffId(staffId);
+        tStPlanService.updateStudyStateByStaffId(staffId);
         return toAjax(tStaffmgrService.deleteLeftTStaffmgrByIds(id));
     }
 

master/src/main/java/com/ruoyi/project/plant/domain/TStaffmgr.java

@@ -124,6 +124,18 @@ public class TStaffmgr extends BaseEntity
     /** 特殊职能 */
     private String specialDuty;
 
+    /** 离职日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date leftDate;
+
+    public Date getLeftDate() {
+        return leftDate;
+    }
+
+    public void setLeftDate(Date leftDate) {
+        this.leftDate = leftDate;
+    }
+
     public String getEducations() {
         return educations;
     }

master/src/main/java/com/ruoyi/project/plant/mapper/TStaffmgrMapper.java

@@ -50,6 +50,14 @@ public interface TStaffmgrMapper
     @DataScope(deptAlias = "d")
     public List<TStaffmgr> selectTStaffmgrList(TStaffmgr tStaffmgr);
 
+    /**
+     * 查询人员管理列表
+     *
+     * @param tStaffmgr 人员管理
+     * @return 人员管理集合
+     */
+    public List<TStaffmgr> selectTStaffmgrListAll(TStaffmgr tStaffmgr);
+
     /**
      * 定时任务查询人员管理列表
      *

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -107,7 +107,7 @@ public class SpecHomeController extends BaseController
         //压力管道
         int ylgdAll = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
 
@@ -117,7 +117,7 @@ public class SpecHomeController extends BaseController
                         .eq("STATUS" , 1)
                         .eq("del_flag" , 0)
                         .in("plant_code",plantIds)
-                        .in("unit",unitIds)
+//                        .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                        .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
@@ -146,7 +146,7 @@ public class SpecHomeController extends BaseController
             }
             allLength += gdLength;
         }
-        DecimalFormat df = new DecimalFormat("#");
+        DecimalFormat df = new DecimalFormat("0.00#");
         System.out.println(df.format(allLength));
         Map<String, Object> mapylgd = new HashMap<String, Object>();
         mapylgd.put("ylgdAll_num", ylgdAll);
@@ -156,7 +156,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                 .in("unit",unitIds)
+//                 .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
@@ -167,7 +167,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                  .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                 .in("unit",unitIds)
+//                 .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
                 );
@@ -178,7 +178,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
         );
         Map<String, Object> mapdt = new HashMap<String, Object>();
         mapdt.put("dtAll_num", dtAll);
@@ -187,14 +187,14 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
                 .like("CHECK_STRATEGY","强制")
         );
         int dzsbUn = tSpecdevDzsbService.count(new QueryWrapper<TSpecdevDzsb>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
                 .notLike("CHECK_STRATEGY","强制")
         );
 
@@ -206,7 +206,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
         );
         Map<String, Object> mapcc = new HashMap<String, Object>();
         mapcc.put("ccAll_num", ccAll);
@@ -239,7 +239,7 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
+//                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -343,7 +343,6 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -360,7 +359,6 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql2,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
             );
             yearList2.add(year);
             countList2.add(num);
@@ -405,7 +403,6 @@ public class SpecHomeController extends BaseController
 //                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -570,14 +567,12 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .in("unit",unitIds)
         );
 
         int safe3 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -585,7 +580,6 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .in("unit",unitIds)
         );
 
         int safe4 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -593,20 +587,17 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .in("unit",unitIds)
         );
         int safe5 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","5","5级","5.0","五级","Ⅴ级")
-                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4 - safe5;
         List safeList = new ArrayList();
@@ -634,34 +625,29 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .in("unit",unitIds)
         );
         int safe3 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .in("unit",unitIds)
         );
         int safe4 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4;
         List safeList = new ArrayList();
@@ -687,13 +673,11 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int cc = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
                 .in("CHECK_CONCLUSION","符合要求","允许运行")
         );
         String per = "0";
@@ -719,7 +703,6 @@ public class SpecHomeController extends BaseController
                     .notIn("APPROVE_STATUS" , 0)
                     .in("plant_code",plantIds)
                     .eq("del_flag" , 0)
-                    .in("unit",unitIds)
             );
         if (ylrqList!= null){
             for (TSpecdevYlrq t: ylrqList
@@ -738,7 +721,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (ylgdList!= null){
             for (TSpecdevYlgd t: ylgdList
@@ -757,7 +739,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (GlList!= null){
             for (TSpecdevGl t: GlList
@@ -776,7 +757,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (dzsbList!= null){
             for (TSpecdevDzsb t: dzsbList
@@ -795,7 +775,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (dtList!= null){
             for (TSpecdevDt t: dtList
@@ -813,7 +792,6 @@ public class SpecHomeController extends BaseController
         List<TSpecdevCc> ccList = tSpecdevCcService.list(new QueryWrapper<TSpecdevCc>()
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
                 .eq("del_flag" , 0)
         );
         if (ccList!= null){

master/src/main/java/com/ruoyi/project/sems/controller/TApproveController.java

@@ -242,6 +242,7 @@ public class TApproveController extends BaseController
         logger.info("流程实例id：" + pi.getProcessInstanceId());
         tApprove.setProcessId(pi.getProcessInstanceId());
         tApproveService.updateTApprove(tApprove);
+
         return AjaxResult.success();
     }
 

master/src/main/java/com/ruoyi/project/sems/controller/TMeasureRecordController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.sems.domain.TMeasureRecord;
 import com.ruoyi.project.sems.domain.TMeasureThickness;
+import com.ruoyi.project.sems.mapper.TMeasureThicknessMapper;
 import com.ruoyi.project.sems.service.ITMeasureRecordService;
 import com.ruoyi.project.sems.service.ITMeasureThicknessService;
 import org.apache.poi.ss.usermodel.Cell;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -41,6 +43,8 @@ public class TMeasureRecordController extends BaseController {
     private ITMeasureRecordService tMeasureRecordService;
     @Autowired
     private ITMeasureThicknessService tMeasureThicknessService;
+    @Resource
+    private TMeasureThicknessMapper tMeasureThicknessMapper;
 
     /**
      * 查询测厚记录列表
@@ -126,20 +130,23 @@ public class TMeasureRecordController extends BaseController {
                 TMeasureRecord r2 = list.get(1);
                 BigDecimal i = new BigDecimal(r2.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN).subtract(new BigDecimal(r1.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN));
                 int day = formatDate(r1.getMeasureDate(), r2.getMeasureDate());
-                logger.info(i + "----" + day);
+                if (day == 0) {
+                    day = day + 1;
+                }
+                logger.info(i + "-i--day-" + day);
                 BigDecimal di = new BigDecimal(day).divide(new BigDecimal(365), 4, BigDecimal.ROUND_HALF_DOWN);
-                logger.info(di + "----");
+                logger.info(di + "--di--");
                 BigDecimal st = i.divide(di, 3, BigDecimal.ROUND_HALF_DOWN);
-                logger.info(st + "----");
+                logger.info(st + "--st--");
                 thickness.setStCorrosion(String.valueOf(st));
                 //长期速率
                 TMeasureRecord r3 = list.get(list.size() - 1);
                 BigDecimal i1 = new BigDecimal(r3.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN).subtract(new BigDecimal(r1.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN));
                 int day1 = formatDate(r1.getMeasureDate(), r3.getMeasureDate());
-                logger.info(i1 + "----" + day1);
+                logger.info(i1 + "--i1--" + day1);
                 BigDecimal di2 = new BigDecimal(day1).divide(new BigDecimal(365), 4, BigDecimal.ROUND_HALF_DOWN);
                 BigDecimal lt = i1.divide(di2, 3, BigDecimal.ROUND_HALF_DOWN);
-                logger.info(lt + "----");
+                logger.info(lt + "--lt--");
                 thickness.setLtCorrosion(String.valueOf(lt));
                 //预估寿命
                 if (thickness.getThicknessMin()!= null) {
@@ -149,8 +156,11 @@ public class TMeasureRecordController extends BaseController {
                     } else {
                         e = st;
                     }
+                    if(e.compareTo(new BigDecimal("0")) == 0) {
+                        e = new BigDecimal("1");
+                    }
                     BigDecimal cc = new BigDecimal(r1.getMeasureValue()).subtract(new BigDecimal(thickness.getThicknessMin()));
-                    logger.info(cc + "----");
+                    logger.info(cc + "----cc");
                     BigDecimal est = cc.divide(e, 2, BigDecimal.ROUND_HALF_DOWN);
                     thickness.setEstRemain(String.valueOf(est));
                 }
@@ -205,13 +215,19 @@ public class TMeasureRecordController extends BaseController {
                     }
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
-                    if (j == 0) {
-                        entity.setMeasureId(cellValue);
-                    } else if (j == 1) {
-                        entity.setMeasureId(entity.getMeasureId() + "," + cellValue);
-                    } else if (j == 2) {
+                    if (j == 0) { //装置
+                        entity.setPlantCode(cellValue);
+                    }else if (j == 1) {//单元
+                        entity.setUnitCode(cellValue);
+                    }else if (j == 2) {//单位内编号
+                        entity.setTagno(cellValue);
+                    }else if (j == 3) {//侧厚部位
+                        entity.setPosition(cellValue);
+                    } else if (j == 4) {//检测编号
+                        entity.setMeasureNo(cellValue);
+                    } else if (j == 5) {//数值
                         entity.setMeasureValue(Double.parseDouble(cellValue));
-                    } else if (j == 3) {
+                    } else if (j == 6) {//时间
                         entity.setMeasureDate(sdf.parse(cellValue));
                     }
                 }
@@ -230,17 +246,20 @@ public class TMeasureRecordController extends BaseController {
             failNum++;
             try {
                 //保存测厚记录
-                String measureId = t.getMeasureId();
-                String[] split = measureId.split(",");
-                Long id = this.tMeasureThicknessService.selectByTagNo(split[0], split[1]);
+                Long id = this.tMeasureThicknessMapper.selectByRecord(t);
                 logger.info(id.toString());
                 t.setMeasureId(id.toString());
+                this.tMeasureRecordService.deleteTMeasureRecordByDate(t);
                 this.tMeasureRecordService.insertTMeasureRecord(t);
-                this.updateMeasure(id + "");
+                try {
+                    this.updateMeasure(id + "");
+                }catch (Exception e) {
+                    logger.error("更新速率错误e:" + e);
+                }
                 successNumber++;
             } catch (Exception e) {
                 failNumber++;
-                logger.info("e:" + e);
+                logger.error("e:" + e);
                 failRow.add(failNum + 1);
             }
         }

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -364,6 +364,7 @@ public class TSpecdevCcController extends BaseController
                                 new QueryWrapper<TSpecdevCc>()
                                         .eq("DOCNO", t.getDocno())
                                         .eq("CAR_NO", t.getCarNo())
+                                        .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
             }catch (Exception e){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -346,6 +346,7 @@ public class TSpecdevDtController extends BaseController
                         .update(t,
                                 new QueryWrapper<TSpecdevDt>()
                                         .eq("DOCNO", t.getDocno())
+                                        .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
             }catch (Exception e){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -355,6 +355,7 @@ public class TSpecdevDzsbController extends BaseController
                         .update(t,
                                 new QueryWrapper<TSpecdevDzsb>()
                                         .eq("DOCNO", t.getDocno())
+                                        .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
             }catch (Exception e){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -391,6 +391,7 @@ public class TSpecdevGlController extends BaseController
                                 new QueryWrapper<TSpecdevGl>()
                                         .eq("USENO", t.getUseno())
                                         .eq("PLANT_CODE", t.getPlantCode())
+                                        .eq("DEVNO" , t.getDevno())
                         );
                 successNumber++;
             }catch (Exception e){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -412,6 +412,7 @@ public class TSpecdevYlgdController extends BaseController {
                                 new QueryWrapper<TSpecdevYlgd>()
                                         .eq("USENO", t.getUseno())
                                         .eq("PLANT_CODE", t.getPlantCode())
+                                        .eq("DEVNO" , t.getDevno())
                         );
                 successNumber++;
             } catch (Exception e) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -70,9 +70,9 @@ public class TSpecdevYlrqController extends BaseController
 //        Thread t = new Thread(specOverLifeThead);
 //        t.start();
 
-//        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
-//        Thread t2 = new Thread(specDevYlgdThread);
-//        t2.start();
+        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
+        Thread t2 = new Thread(specDevYlgdThread);
+        t2.start();
         return getDataTable(list);
     }
 
@@ -432,7 +432,9 @@ public class TSpecdevYlrqController extends BaseController
             failNum++;
             try {
                 tSpecdevYlrqService.update(t,
-                        new QueryWrapper<TSpecdevYlrq>().eq("USENO", t.getUseno()).eq("PLANT_CODE", t.getPlantCode()));
+                        new QueryWrapper<TSpecdevYlrq>().eq("USENO", t.getUseno())
+                                                        .eq("PLANT_CODE", t.getPlantCode())
+                                .eq("DEVNO" , t.getDevno()));
                 successNumber++;
             }catch (Exception e){
                 e.printStackTrace();

master/src/main/java/com/ruoyi/project/sems/domain/TMeasureRecord.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.sems.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,6 +54,67 @@ public class TMeasureRecord extends BaseEntity
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date measureDate;
 
+    /** 装置名称 */
+    @TableField(exist = false)
+    private String plantCode;
+
+    /** 单元名称 */
+    @TableField(exist = false)
+    private String unitCode;
+
+    /** 单位内编号 */
+    @TableField(exist = false)
+    private String tagno;
+
+    /** 测厚部位CML */
+    @TableField(exist = false)
+    private String position;
+
+    /** 检测编号 */
+    @TableField(exist = false)
+    private String measureNo;
+
+
+    public String getPlantCode() {
+        return plantCode;
+    }
+
+    public void setPlantCode(String plantCode) {
+        this.plantCode = plantCode;
+    }
+
+    public String getUnitCode() {
+        return unitCode;
+    }
+
+    public void setUnitCode(String unitCode) {
+        this.unitCode = unitCode;
+    }
+
+    public String getTagno() {
+        return tagno;
+    }
+
+    public void setTagno(String tagno) {
+        this.tagno = tagno;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public String getMeasureNo() {
+        return measureNo;
+    }
+
+    public void setMeasureNo(String measureNo) {
+        this.measureNo = measureNo;
+    }
+
     public void setMeasureDate(Date measureDate) {
         this.measureDate = measureDate;
     }

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevCc.java

@@ -218,6 +218,16 @@ public class TSpecdevCc extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -187,6 +187,16 @@ public class TSpecdevDt extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDzsb.java

@@ -188,6 +188,16 @@ public class TSpecdevDzsb extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevGl.java

@@ -211,6 +211,16 @@ public class TSpecdevGl extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public Long getHiFlag() {
         return hiFlag;
     }

master/src/main/java/com/ruoyi/project/sems/mapper/TMeasureRecordMapper.java

@@ -66,4 +66,5 @@ public interface TMeasureRecordMapper extends BaseMapper<TMeasureRecord>
      */
     public int deleteTMeasureRecordByIds(Long[] ids);
 
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TMeasureThicknessMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
+import com.ruoyi.project.sems.domain.TMeasureRecord;
 import com.ruoyi.project.sems.domain.TMeasureThickness;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,6 +32,8 @@ public interface TMeasureThicknessMapper {
      */
     public Long selectByTagNo(@Param("tagNo") String tagNo, @Param("position") String position);
 
+    public Long selectByRecord(TMeasureRecord record);
+
     /**
      * 查询定点测厚列表
      *

master/src/main/java/com/ruoyi/project/sems/service/ITMeasureRecordService.java

@@ -62,4 +62,6 @@ public interface ITMeasureRecordService  extends IService<TMeasureRecord>
     public int deleteTMeasureRecordById(Long id);
 
     List<TMeasureRecord> queryRecords(String id);
+
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/service/impl/TMeasureRecordServiceImpl.java

@@ -99,4 +99,9 @@ public class TMeasureRecordServiceImpl extends ServiceImpl<TMeasureRecordMapper,
     public List<TMeasureRecord> queryRecords(String measureId) {
         return this.list(new QueryWrapper<TMeasureRecord>().eq(!StringUtils.isEmpty(measureId),"MEASURE_ID", measureId) .orderByDesc("MEASURE_DATE"));
     }
+
+    @Override
+    public void deleteTMeasureRecordByDate(TMeasureRecord t) {
+        tMeasureRecordMapper.deleteTMeasureRecordByDate(t);
+    }
 }

master/src/main/java/com/ruoyi/project/training/controller/TTrainingController.java

@@ -204,6 +204,10 @@ public class TTrainingController extends BaseController
                 i = 1;
             }
         }
+        if (tTraining.getStartDate()!= null) {
+            logger.info("修改了时间");
+            i = 1;
+        }
         if (i == 1) {
             logger.info("修改了需参培人员名单");
             //如果存在条目

master/src/main/java/com/ruoyi/project/training/controller/TTrainingHisparticipantsController.java

@@ -169,11 +169,11 @@ public class TTrainingHisparticipantsController extends BaseController
 
                     }else if (j == 9){
                         if (cellValue!= ""){
-                            entity.setScore(Long.parseLong(cellValue.trim()));
+                            entity.setScore(Double.parseDouble(cellValue.trim()));
                         }
                     }else if (j == 10){
                         if (cellValue!= ""){
-                            entity.setOperationScore(Long.parseLong(cellValue.trim()));
+                            entity.setOperationScore(Double.parseDouble(cellValue.trim()));
                         }
                     }else if (j == 11){
                         entity.setTrainingPlace(cellValue);

master/src/main/java/com/ruoyi/project/training/controller/TTrainingRegularController.java

@@ -271,7 +271,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(s.getStaffid());
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }
@@ -284,7 +283,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(staffId);
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }
@@ -296,7 +294,6 @@ public class TTrainingRegularController extends BaseController
                         TTrainingDevice tTrainingDevice = new TTrainingDevice();
                         tTrainingDevice.setStaffId(s.getStaffid());
                         tTrainingDevice.setRegularId(training.getId());
-                        tTrainingDevice.setStartDate(tTrainingRegular.getPlanTrainingdate());
                         tTrainingDevice.setSupplementary("0");
                         tTrainingDeviceService.insertTTrainingDevice(tTrainingDevice);
                     }

master/src/main/java/com/ruoyi/project/training/domain/TTrainingHisparticipants.java

@@ -40,11 +40,11 @@ public class TTrainingHisparticipants extends BaseEntity
 
     /** 理论成绩 */
     @Excel(name = "理论成绩")
-    private Long score;
+    private Double score;
 
     /** 实际操作成绩 */
     @Excel(name = "实际操作成绩")
-    private Long operationScore;
+    private Double operationScore;
 
     /** 培训地点 */
     @Excel(name = "培训地点")
@@ -132,26 +132,24 @@ public class TTrainingHisparticipants extends BaseEntity
     {
         return endDate;
     }
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
 
-    public Long getScore()
-    {
+    public Double getScore() {
         return score;
     }
-    public void setOperationScore(Long operationScore)
-    {
-        this.operationScore = operationScore;
+
+    public void setScore(Double score) {
+        this.score = score;
     }
 
-    public Long getOperationScore()
-    {
+    public Double getOperationScore() {
         return operationScore;
     }
-    public void setTrainingPlace(String trainingPlace)
-    {
+
+    public void setOperationScore(Double operationScore) {
+        this.operationScore = operationScore;
+    }
+
+    public void setTrainingPlace(String trainingPlace) {
         this.trainingPlace = trainingPlace;
     }
 

master/src/main/java/com/ruoyi/project/training/domain/TTrainingParticipants.java

@@ -40,11 +40,11 @@ public class TTrainingParticipants extends BaseEntity
 
     /** 理论成绩 */
     @Excel(name = "理论成绩")
-    private Long score;
+    private Double score;
 
     /** 实际操作成绩 */
     @Excel(name = "实际操作成绩")
-    private Long operationScore;
+    private Double operationScore;
 
     /** 培训地点 */
     @Excel(name = "培训地点")
@@ -137,24 +137,23 @@ public class TTrainingParticipants extends BaseEntity
     {
         return endDate;
     }
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
 
-    public Long getScore()
-    {
+    public Double getScore() {
         return score;
     }
-    public void setOperationScore(Long operationScore)
-    {
-        this.operationScore = operationScore;
+
+    public void setScore(Double score) {
+        this.score = score;
     }
 
-    public Long getOperationScore()
-    {
+    public Double getOperationScore() {
         return operationScore;
     }
+
+    public void setOperationScore(Double operationScore) {
+        this.operationScore = operationScore;
+    }
+
     public void setTrainingPlace(String trainingPlace)
     {
         this.trainingPlace = trainingPlace;

master/src/main/java/com/ruoyi/project/training/spec/controller/TStApproveController.java

@@ -9,7 +9,9 @@ import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.thread.Trainning.PlanApproveMailThread;
 import com.ruoyi.project.approve.damain.DevTask;
+import com.ruoyi.project.system.domain.SysMessage;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.service.ISysMessageService;
 import com.ruoyi.project.training.spec.domain.TStPlan;
 import com.ruoyi.project.training.spec.domain.TStYearplan;
 import com.ruoyi.project.training.spec.service.ITStPlanService;
@@ -62,6 +64,8 @@ public class TStApproveController extends BaseController
     private SysUserMapper sysUserMapper;
     @Autowired
     private IMailService mailService;
+    @Autowired
+    private ISysMessageService sysMessageService;
 
     /**
      * 查询专项培训计划申请列表
@@ -144,13 +148,17 @@ public class TStApproveController extends BaseController
         tStApproveService.updateTStApprove(tStApprove);
         //发送邮件
         try {
+            SysMessage message = new SysMessage();
             String email = sysUserMapper.selectUserById(tStApprove.getZzjl()).getEmail();
             String apNo = tStApprove.getApNo();
             String username = sysUserMapper.selectUserById(tStApprove.getZzjl()).getNickName();
             String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
             logger.info("email:" + email);
             logger.info("username:" + username);
-            PlanApproveMailThread sendEmailThead = new PlanApproveMailThread(email,apNo, username,usernameEN, mailService, tStApprove, "");
+            message.setUserId(tStApprove.getZzjl());
+            message.setMsgTitle("您有一条系统消息");
+            message.setMsgContent("您有一条培训待审核");
+            PlanApproveMailThread sendEmailThead = new PlanApproveMailThread(email,apNo, username,usernameEN, mailService, tStApprove,sysMessageService,message,"0");
             Thread t = new Thread(sendEmailThead);
             t.start();
         }catch (Exception e) {
@@ -192,6 +200,24 @@ public class TStApproveController extends BaseController
                 t.setApproveStatus(1l);
                 tStPlanService.updateTStPlan(t);
             }
+            //发送邮件
+            try {
+                SysMessage message = new SysMessage();
+                String email = sysUserMapper.selectUserById(tStApprove.getUserId()).getEmail();
+                String apNo = tStApprove.getApNo();
+                String username = sysUserMapper.selectUserById(tStApprove.getUserId()).getNickName();
+                String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+                logger.info("email:" + email);
+                logger.info("username:" + username);
+                message.setUserId(tStApprove.getUserId());
+                message.setMsgTitle("您有一条系统消息");
+                message.setMsgContent("您有一条培训申请已通过");
+                PlanApproveMailThread sendEmailThead = new PlanApproveMailThread(email,apNo, username,usernameEN, mailService, tStApprove,sysMessageService,message,"1");
+                Thread t = new Thread(sendEmailThead);
+                t.start();
+            }catch (Exception e) {
+                logger.error("邮件发送失败" + JSON.toJSONString(e));
+            }
          }
         else if (devTask.getCondition().equals("0")) {
             devTask.setComment("未通过");
@@ -207,6 +233,24 @@ public class TStApproveController extends BaseController
                 t.setApproveStatus(2l);
                 tStPlanService.updateTStPlan(t);
             }
+            //发送邮件
+            try {
+                SysMessage message = new SysMessage();
+                String email = sysUserMapper.selectUserById(tStApprove.getUserId()).getEmail();
+                String apNo = tStApprove.getApNo();
+                String username = sysUserMapper.selectUserById(tStApprove.getUserId()).getNickName();
+                String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+                logger.info("email:" + email);
+                logger.info("username:" + username);
+                message.setUserId(tStApprove.getUserId());
+                message.setMsgTitle("您有一条系统消息");
+                message.setMsgContent("您有一条培训申请未通过");
+                PlanApproveMailThread sendEmailThead = new PlanApproveMailThread(email,apNo, username,usernameEN, mailService, tStApprove,sysMessageService,message,"2");
+                Thread t = new Thread(sendEmailThead);
+                t.start();
+            }catch (Exception e) {
+                logger.error("邮件发送失败" + JSON.toJSONString(e));
+            }
         }
         tStApproveService.updateTStApprove(tStApprove);
         System.out.println(processInstancesId);

master/src/main/java/com/ruoyi/project/training/spec/controller/TStSuccessorController.java

@@ -9,7 +9,9 @@ import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import com.ruoyi.project.training.spec.domain.TStSuccessorScore;
 import com.ruoyi.project.training.spec.domain.vo.TStSuccessorExportVO;
+import com.ruoyi.project.training.spec.mapper.TStYearplanMapper;
 import com.ruoyi.project.training.spec.service.ITStSuccessorScoreService;
+import com.ruoyi.project.training.spec.service.ITStYearplanService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,9 +49,23 @@ public class TStSuccessorController extends BaseController
 
     @Autowired
     private ISysUserService sysUserService;
+
     @Autowired
     private ITStSuccessorScoreService tStSuccessorScoreService;
 
+    @Autowired
+    private TStYearplanMapper tStYearplanMapper;
+
+    /**
+     * 根据学员id查询继任者清单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('spec:successor:query')")
+    @GetMapping("/getInfoBySuccessorId/{staffId}")
+    public AjaxResult getInfoBySuccessorId(@PathVariable("staffId") Long staffId)
+    {
+        return AjaxResult.success(tStSuccessorService.selectTStSuccessorBySuccessorId(staffId));
+    }
+
     /**
      * 查询导师列表
      */
@@ -209,6 +225,12 @@ public class TStSuccessorController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        //删除对应年度计划
+        for (Long id: ids
+             ) {
+            TStSuccessor t = tStSuccessorService.selectTStSuccessorById(id);
+            tStYearplanMapper.deleteTStYearplanByStaffId(t.getStaffId());
+        }
         return toAjax(tStSuccessorService.deleteTStSuccessorByIds(ids));
     }
 }

master/src/main/java/com/ruoyi/project/training/spec/domain/vo/TStFeedbackVO.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
 import com.ruoyi.project.training.spec.domain.TStPlan;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

master/src/main/java/com/ruoyi/project/training/spec/mapper/TStPlanMapper.java

@@ -93,4 +93,10 @@ public interface TStPlanMapper
      */
     public int deleteTStPlanByIds(Long[] ids);
 
+    /**
+     * 根据staffId修改“未完成”的继任者计划状态为“因离职中止”
+     * @param staffId
+     * @return
+     */
+    public int updateStudyStateByStaffId(Long staffId);
 }

master/src/main/java/com/ruoyi/project/training/spec/mapper/TStSuccessorMapper.java

@@ -71,4 +71,16 @@ public interface TStSuccessorMapper
      * @return 结果
      */
     public int deleteTStSuccessorByIds(Long[] ids);
+
+    /**
+     * 根据staffId修改“进行中”的继任者计划状态为“因离职中止”
+     * @param staffId
+     * @return
+     */
+    public int updateStateByStaffId(Long staffId);
+
+    /**
+     * 根据学员id查询继任者清单详细信息
+     */
+    public TStSuccessor selectTStSuccessorBySuccessorId(Long staffId);
 }

master/src/main/java/com/ruoyi/project/training/spec/mapper/TStYearplanMapper.java

@@ -62,4 +62,6 @@ public interface TStYearplanMapper
     public int deleteTStYearplanByIds(Long[] ids);
 
     List<TStYearplan> selectTStYearPlanExist(TStYearplan tStYearplan);
+
+    void deleteTStYearplanByStaffId(String staffId);
 }

master/src/main/java/com/ruoyi/project/training/spec/service/ITStPlanService.java

@@ -88,4 +88,11 @@ public interface ITStPlanService
      * @return 结果
      */
     String importData(List<TStPlanImportVO> planList, boolean isUpdateSupport, SysUser loginUser, Long yearPlanId);
+
+    /**
+     * 根据staffId修改“未完成”的继任者计划状态为“因离职中止”
+     * @param staffId
+     * @return
+     */
+    public int updateStudyStateByStaffId(Long staffId);
 }

master/src/main/java/com/ruoyi/project/training/spec/service/ITStSuccessorService.java

@@ -68,4 +68,16 @@ public interface ITStSuccessorService
      * @return 结果
      */
     public int deleteTStSuccessorById(Long id);
+
+    /**
+     * 根据staffId修改“进行中”的继任者计划状态为“因离职中止”
+     * @param staffId
+     * @return
+     */
+    public int updateStateByStaffId(Long staffId);
+
+    /**
+     * 根据学员id查询继任者清单详细信息
+     */
+    public TStSuccessor selectTStSuccessorBySuccessorId(Long staffId);
 }