PSSR bugfix

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

@@ -373,13 +373,14 @@ public class TPssrAboveallController extends BaseController {
      * 生成公用工程数据
      */
     private void genGygc(Long subId, String userId) {
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统各压力等级蒸汽已投用，具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统各压力等级凝液已投用，具备投用条件。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统消防水已投用或具备投用条件。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。","界区阀已打开，N2总管压力390PI9114压力达    kpa。","N2总管压力390PI9114压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：","界区阀已打开，IA管压力PI3901压力达    kpa。","IA管压力PI3901压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。","界区阀已打开，PA管压力PI3902压力达    kpa。","PA管压力PI3902压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。","界区阀已打开，CW进出口压差达    kpa。","CW进出口压差达    kap。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。","界区阀已打开，PC9112压力达    Mpa，TI9061温度达    ℃。","PC9112压力达    Mpa，TI9061温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。","界区阀已打开，PC9081压力达    Mpa，TI9081温度达    ℃。","PC9081压力达    Mpa，TI9081温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。","界区阀已打开，PY9109压力达    Mpa，TI9115温度达    ℃。","PY9109压力达    Mpa，TI9115温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统精制凝液已投用或具备投用条件。","界区阀已打开，P3505A/B/C压力达    Mpa。","P3505A/B/C压力达    Mpa。", userId, new Date()));
     }
 
     /**

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

@@ -47,7 +47,7 @@ import java.util.*;
 @RequestMapping("/pssr/public")
 public class TPssrPublicController extends BaseController {
     @Resource
-     private TPssrPublicMapper tPssrPublicMapper;
+    private TPssrPublicMapper tPssrPublicMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -114,25 +114,27 @@ public class TPssrPublicController extends BaseController {
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getCheckContent());
-                row.createCell(2).setCellValue(t.getCheckResult());
-                row.createCell(3);
-                row.createCell(4);
+                row.createCell(2).setCellValue(t.getCheckContent());
+                row.createCell(3).setCellValue(t.getCheckContent());
+                row.createCell(4).setCellValue(t.getCheckResult());
+                row.createCell(5);
+                row.createCell(6);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
                     String confirm1 = sysUser.getSignUrl();
                     String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(5).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
-                row.createCell(6).setCellValue(t.getRemarks());
+                row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(8).setCellValue(t.getRemarks());
 
 
                 //渲染样式
-                for (int i = 0; i < 6; i++) {
+                for (int i = 0; i < 8; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;
@@ -154,8 +156,7 @@ public class TPssrPublicController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:public:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPssrPublicService.selectTPssrPublicById(id));
     }
 
@@ -176,8 +177,23 @@ public class TPssrPublicController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:public:edit')")
     @Log(title = "公用工程", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrPublic tPssrPublic)
-    {
+    public AjaxResult edit(@RequestBody TPssrPublic tPssrPublic) {
+        try {
+            String checkRequire = tPssrPublic.getCheckRequire();
+            String checkCondition = tPssrPublic.getCheckCondition();
+            String valveStatus = tPssrPublic.getValveStatus();
+            if (checkRequire.contains("达")) {
+                String rKpa = checkRequire.substring(checkRequire.indexOf("压力达"), checkRequire.indexOf("kpa"));
+                String rTemp = checkRequire.substring(checkRequire.indexOf("温度达"), checkRequire.indexOf("℃"));
+                String rMpa = checkRequire.substring(checkRequire.indexOf("压力达"), checkRequire.indexOf("Mpa"));
+                String cKpa = checkCondition.substring(checkCondition.indexOf("压力达"), checkCondition.indexOf("kpa"));
+                String cTemp = checkCondition.substring(checkCondition.indexOf("温度达"), checkCondition.indexOf("℃"));
+                String cMpa = checkCondition.substring(checkCondition.indexOf("压力达"), checkCondition.indexOf("Mpa"));
+
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
         return toAjax(tPssrPublicService.updateTPssrPublic(tPssrPublic));
     }
 
@@ -187,10 +203,10 @@ public class TPssrPublicController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:public:edit')")
     @Log(title = "公用工程", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
-    public AjaxResult editb(@RequestBody TPssrPublic tPssrPublic)
-    {
+    public AjaxResult editb(@RequestBody TPssrPublic tPssrPublic) {
         return toAjax(tPssrPublicMapper.updateTPssrPublicByIds(tPssrPublic));
     }
+
     /**
      * 删除公用工程
      */

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPublic.java

@@ -34,6 +34,15 @@ public class TPssrPublic extends BaseEntity
     @Excel(name = "检查内容")
     private String checkContent;
 
+    /**检查要求*/
+    private String checkRequire;
+
+    /**检查情况*/
+    private String checkCondition;
+
+    /**界区阀状态*/
+    private String valveStatus;
+
     /** 检查结果 */
     @Excel(name = "检查结果")
     private String checkResult;
@@ -96,6 +105,31 @@ public class TPssrPublic extends BaseEntity
 
     private String reason;
 
+
+    public String getCheckRequire() {
+        return checkRequire;
+    }
+
+    public void setCheckRequire(String checkRequire) {
+        this.checkRequire = checkRequire;
+    }
+
+    public String getCheckCondition() {
+        return checkCondition;
+    }
+
+    public void setCheckCondition(String checkCondition) {
+        this.checkCondition = checkCondition;
+    }
+
+    public String getValveStatus() {
+        return valveStatus;
+    }
+
+    public void setValveStatus(String valveStatus) {
+        this.valveStatus = valveStatus;
+    }
+
     public String getReason() {
         return reason;
     }
@@ -151,9 +185,11 @@ public class TPssrPublic extends BaseEntity
     public TPssrPublic() {
     }
 
-    public TPssrPublic(Long subId, String checkContent, String createrCode, Date createdate) {
+    public TPssrPublic(Long subId, String checkContent,String checkRequire,String checkCondition, String createrCode, Date createdate) {
         this.subId = subId;
         this.checkContent = checkContent;
+        this.checkRequire = checkRequire;
+        this.checkCondition = checkCondition;
         this.createrCode = createrCode;
         this.createdate = createdate;
         this.approveStatus = 0L;

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

@@ -50,7 +50,6 @@ public class TTrainingbccController extends BaseController
     /**
      * 查询装置培训跟踪b列表
      */
-    @PreAuthorize("@ss.hasPermi('training:trainingbcc:list')")
     @GetMapping("/list")
     public TableDataInfo list(TTrainingbcc tTrainingbcc)
     {

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

@@ -25,10 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirm2"    column="confirm2"    />
         <result property="confirm1Name"    column="confirm1_name"    />
         <result property="confirm2Name"    column="confirm2_name"    />
+        <result property="valveStatus"    column="valve_status"    />
+        <result property="checkCondition"    column="check_condition"    />
+        <result property="checkRequire"    column="check_require"    />
     </resultMap>
 
     <sql id="selectTPssrPublicVo">
-        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_public d
+        select d.id,d.valve_status,d.check_condition,d.check_require, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_public d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u1 on u1.user_id = d.CONFIRM1
       left join sys_user u2 on u2.user_id = d.CONFIRM2
@@ -40,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
+            <if test="valveStatus != null  and valveStatus != ''"> and valve_status = #{valveStatus}</if>
+            <if test="checkCondition != null  and checkCondition != ''"> and check_condition = #{checkCondition}</if>
+            <if test="checkRequire != null  and checkRequire != ''"> and check_require = #{checkRequire}</if>
             <if test="checkResult != null  and checkResult != ''"> and check_result = #{checkResult}</if>
             <if test="confirm != null  and confirm != ''"> and confirm = #{confirm}</if>
             <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
@@ -73,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subId != null">sub_id,</if>
             <if test="approveId != null">approve_id,</if>
             <if test="checkContent != null">check_content,</if>
+            <if test="valveStatus != null">valve_status,</if>
+            <if test="checkCondition != null">check_condition,</if>
+            <if test="checkRequire != null">check_require,</if>
             <if test="checkResult != null">check_result,</if>
             <if test="confirm != null">confirm,</if>
             <if test="confirmationDate != null">confirmation_date,</if>
@@ -92,6 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subId != null">#{subId},</if>
             <if test="approveId != null">#{approveId},</if>
             <if test="checkContent != null">#{checkContent},</if>
+            <if test="valveStatus != null">#{valveStatus},</if>
+            <if test="checkCondition != null">#{checkCondition},</if>
+            <if test="checkRequire != null">#{checkRequire},</if>
             <if test="checkResult != null">#{checkResult},</if>
             <if test="confirm != null">#{confirm},</if>
             <if test="confirmationDate != null">#{confirmationDate},</if>
@@ -114,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subId != null">sub_id = #{subId},</if>
             <if test="approveId != null">approve_id = #{approveId},</if>
             <if test="checkContent != null">check_content = #{checkContent},</if>
+            <if test="valveStatus != null">valve_status = #{valveStatus},</if>
+            <if test="checkCondition != null">check_condition = #{checkCondition},</if>
+            <if test="checkRequire != null">check_require = #{checkRequire},</if>
             <if test="checkResult != null">check_result = #{checkResult},</if>
             <if test="confirm != null">confirm = #{confirm},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>

ui/src/api/pssr/safety.js

@@ -12,7 +12,7 @@ export function handleConfirmBleed(data) {
 // 确认安全设施-呼吸阀
 export function handleConfirmBreath(data) {
   return request({
-    url: '/pssr/safety/confirmBBrust',
+    url: '/pssr/safety/confirmBreath',
     method: 'put',
     data: data
   })

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

@@ -589,9 +589,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.confirmedPerson = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -609,9 +609,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 320
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.respPerson = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -403,9 +403,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.confirmer = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -416,9 +416,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.confirmedPerson = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -580,9 +580,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.confirmedPerson = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -585,9 +585,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    if (this.isApprove != 0 && this.isApprove != 2) {
-      this.queryParams.identifyingPerson = 1;
-    }
+
     this.getList();
     this.getTreeselect();
     getPssrUser({}).then(res => {

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

@@ -239,6 +239,9 @@
         </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"
@@ -313,6 +316,17 @@
         <el-form-item label="检查内容">
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
+        <el-form-item label="检查要求">
+          <el-input type="textarea" v-model="form.checkRequire" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="界区阀">
+          <el-radio-group v-model="form.valveStatus">
+            <el-radio label="已打开">已打开</el-radio>
+            <el-radio label="已关闭">已关闭</el-radio>
+          </el-radio-group></el-form-item>
+        <el-form-item label="检查情况">
+          <el-input type="textarea" v-model="form.checkCondition" :min-height="192"/>
+        </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
           <el-radio-group v-model="form.checkResult">
             <el-radio label="✔">✔</el-radio>
@@ -588,6 +602,9 @@ export default {
         subId: this.subId,
         approveId: null,
         checkContent: null,
+        checkCondition: null,
+        valveStatus: null,
+        checkRequire: null,
         checkResult: null,
         confirm: null,
         confirmationDate: null,