PSSR自动生成数据+模板

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -1258,7 +1258,7 @@ public class TPssrApproveController extends BaseController {
                 break;
             case "xqf"://消气防设施
                 if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
-                    return AjaxResult.error("请确认所有确认人都已选择！");
+                    return AjaxResult.error("请确认所有巡检都已确认！");
                 }
                 doPatrolApprove(tPssrSubcontent);
                 break;
@@ -1270,13 +1270,13 @@ public class TPssrApproveController extends BaseController {
                 break;
             case "txjk"://通讯监控
                 if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
-                    return AjaxResult.error("请确认所有确认人都已选择！");
+                    return AjaxResult.error("请确认所有巡检都已确认！");
                 }
                 doPatrolApprove(tPssrSubcontent);
                 break;
             case "bxsjcy"://便携式检测仪
                 if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
-                    return AjaxResult.error("请确认所有确认人都已选择！");
+                    return AjaxResult.error("请确认所有巡检都已确认！");
                 }
                 doPatrolApprove(tPssrSubcontent);
                 break;
@@ -1404,7 +1404,7 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("zdj");
             forShorts.add("tzsb");
             forShorts.add("sksgfmzt");
-        } else if ("ssy,gygc,yfl".contains(sub.getForShort())) {
+        } else if ("sys,gygc,yfl".contains(sub.getForShort())) {
             forShorts.add("xcws");
             forShorts.add("rsfh");
             forShorts.add("xqf");
@@ -2967,7 +2967,7 @@ public class TPssrApproveController extends BaseController {
         Set<String> remover = new HashSet<>();
         List<TPssrAirtight> tPssrAirtights = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         for (TPssrAirtight item : tPssrAirtights) {
-            if (!"是".equals(item.getStandard())) {
+            if (!"是".equals(item.getUptoStandard())) {
                 throw new Exception("气密性测试标准为否，请重新检查！");
             }
         }
@@ -3142,7 +3142,7 @@ public class TPssrApproveController extends BaseController {
         Set<String> remover = new HashSet<>();
         List<TPssrPublic> tPssrPublics = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         for (TPssrPublic item : tPssrPublics) {
-            if ("✔".equals(item.getCheckResult())) {
+            if (!"✔".equals(item.getCheckResult())) {
                 throw new Exception("公用工程检查结果不合规！请重新检查！");
             }
         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -118,9 +118,9 @@ public class TPssrPipeController extends BaseController {
                     pipe.setPipelineNo(t.getDevno());
                     pipe.setSubId(tPssrPipe.getSubId());
 
-                    pipe.setChecked("√");
-                    pipe.setRequire("√");
-                    pipe.setValidity("√");
+                    pipe.setChecked("✔");
+                    pipe.setRequire("✔");
+                    pipe.setValidity("✔");
 
                     pipe.setApproveStatus(0L);
                     pipe.setCreatedate(new Date());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -202,21 +202,21 @@ public class TPssrPublicController extends BaseController {
                 String cMpa = "-1";
                 String cycKpa = "-1";
                 if (checkRequire.contains("压力达(") && checkRequire.contains(")kPa"))
-                    rKpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 3, checkRequire.indexOf(")kPa")).trim();
+                    rKpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 4, checkRequire.indexOf(")kPa")).trim();
                 if (checkRequire.contains("压差达("))
-                    rycKpa = checkRequire.substring(checkRequire.indexOf("压差达(") + 3, checkRequire.indexOf(")kPa")).trim();
+                    rycKpa = checkRequire.substring(checkRequire.indexOf("压差达(") + 4, checkRequire.indexOf(")kPa")).trim();
                 if (checkRequire.contains("温度达("))
-                    rTemp = checkRequire.substring(checkRequire.indexOf("温度达(") + 3, checkRequire.indexOf(")℃")).trim();
+                    rTemp = checkRequire.substring(checkRequire.indexOf("温度达(") + 4, checkRequire.indexOf(")℃")).trim();
                 if (checkRequire.contains("压力达(") && checkRequire.contains(")MPa"))
-                    rMpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 3, checkRequire.indexOf(")MPa")).trim();
+                    rMpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 4, checkRequire.indexOf(")MPa")).trim();
                 if (checkCondition.contains("压力达(") && checkCondition.contains(")kPa"))
-                    cKpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 3, checkCondition.indexOf(")kPa")).trim();
+                    cKpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 4, checkCondition.indexOf(")kPa")).trim();
                 if (checkCondition.contains("压差达("))
-                    cycKpa = checkCondition.substring(checkCondition.indexOf("压差达(") + 3, checkCondition.indexOf(")kPa")).trim();
+                    cycKpa = checkCondition.substring(checkCondition.indexOf("压差达(") + 4, checkCondition.indexOf(")kPa")).trim();
                 if (checkCondition.contains("温度达("))
-                    cTemp = checkCondition.substring(checkCondition.indexOf("温度达(") + 3, checkCondition.indexOf(")℃")).trim();
+                    cTemp = checkCondition.substring(checkCondition.indexOf("温度达(") + 4, checkCondition.indexOf(")℃")).trim();
                 if (checkCondition.contains("压力达(") && checkCondition.contains("MPa"))
-                    cMpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 3, checkCondition.indexOf(")MPa")).trim();
+                    cMpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 4, checkCondition.indexOf(")MPa")).trim();
 
                 if (new BigDecimal(rKpa).compareTo(new BigDecimal(cKpa)) <= 0 || new BigDecimal(rycKpa).compareTo(new BigDecimal(cycKpa)) <= 0 ||
                         (new BigDecimal(rTemp).compareTo(new BigDecimal(cTemp)) <= 0 && new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0)

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -259,9 +259,9 @@ public class TPssrVesselController extends BaseController {
                     vessel.setVesselNo(t.getDevno());
                     vessel.setSubId(tPssrVessel.getSubId());
 
-                    vessel.setChecked("√");
-                    vessel.setRequire("√");
-                    vessel.setValidity("√");
+                    vessel.setChecked("✔");
+                    vessel.setRequire("✔");
+                    vessel.setValidity("✔");
 
                     vessel.setApproveStatus(0L);
                     vessel.setCreatedate(new Date());

master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -228,7 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
             <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
-            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="confirmationTime != null">confirmation_time = #{confirmationTime},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>

ui/src/views/pssr/public/index.vue

@@ -231,9 +231,9 @@
 
     <el-table v-loading="loading" :data="publicList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="从表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="唯一标识ID" align="center" prop="id" />-->
+      <!--<el-table-column label="从表id" align="center" prop="subId" />-->
+      <!--<el-table-column label="审批id" align="center" prop="approveId" />-->
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
@@ -242,20 +242,19 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true"/>
-      <el-table-column label="检查要求" align="center" prop="checkRequire" :show-overflow-tooltip="true"/>
-      <el-table-column label="界区阀" align="center" prop="valveStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="检查情况" align="center" prop="checkCondition" :show-overflow-tooltip="true"/>
-      <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
-      <!--<el-table-column label="确认人" align="center" prop="confirm" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
-                       width="150">
+      <el-table-column label="检查内容" align="center" prop="checkContent"  width="250"/>
+      <el-table-column label="检查要求" align="center" prop="checkRequire"  width="250"/>
+      <el-table-column label="界区阀" align="center" prop="valveStatus"  width="120"/>
+      <el-table-column label="检查情况" align="center" prop="checkCondition"  width="250"/>
+      <el-table-column label="检查结果" align="center" prop="checkResult"  width="100"/>
+      <el-table-column label="确认人1" align="center" prop="confirm1"
+                       width="130">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"
-                       width="150">
+      <el-table-column label="确认人2" align="center" prop="confirm2"
+                       width="130">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
@@ -265,21 +264,21 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="创建人" align="center" prop="createrCode" />-->
       <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
         <!--<template slot-scope="scope">-->
           <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
         <!--</template>-->
       <!--</el-table-column>-->
-      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="修改人" align="center" prop="updaterCode" />-->
       <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
         <!--<template slot-scope="scope">-->
           <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
         <!--</template>-->
       <!--</el-table-column>-->
-      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <!--<el-table-column label="部门编号" align="center" prop="deptId" />-->
+      <el-table-column label="驳回原因" align="center" prop="reason" width="150"/>
+      <el-table-column label="备注" align="center" prop="remarks" width="150"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
           <el-button
@@ -488,8 +487,8 @@
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">
       <el-table  :data="items" border>
-        <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true"/>
-        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+        <el-table-column label="检查内容" align="center" prop="checkContent" />
+        <el-table-column label="驳回原因" align="center" prop="reason" >
           <template slot-scope="scope">
               <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
           </template>