PSSR环保设施火炬/VOC添加序号字段

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

@@ -287,28 +287,28 @@ public class TPssrAboveallController extends BaseController {
      * 生成环保设施数据
      */
     private void genHbss(Long subId, String userId) {
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬系统检修时所加装的盲板已拆除。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬系统已完成氮气置换，氧含量<0.2%。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "公用工程（消防水、仪表风、氮气、电、中、低压蒸汽等）已投用或具备使用条件。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬系统的所有仪表功能检查正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬点火用燃料气已引到PCV-9994、PC-9991阀前。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "仪表空气送至PCV-9995阀前。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "加热火炬气的甲醇已充进换热器390-E-903，390-E-903的低压蒸汽管线暖管结束。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬总管分子封用氮已经投用。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "点火器装置和电视监控器等电器设备已送电，设备完好。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬消烟蒸汽已引到蒸汽调节阀前，RO-9991～3的前后闸阀全开，管线上所有疏水器均须投用。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "由LV-9990向水封罐390-V-940注生产工艺水，直到工艺水由从U形管排出。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "设定390-P-940去急冷水塔的流程，投用390-P-940自启动及停车控制器UC-9990。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "投用各火炬总管端点的吹扫气。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬长明灯点火完成，确认正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "1", "火炬系统可以接收装置物料排放。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "VOC系统检修时所加装的盲板已拆除。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "VOC系统已完成氮气置换，氧含量合格。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "公用工程（消防水、仪表风、氮气、电、中、低压蒸汽等）已投用或具备使用条件。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "VOC系统的所有仪表功能检查正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "VOC系统具备使用条件，开车流程打通，确认正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "按操作程序启动390-K-950，确认K950运行正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(subId, "2", "VOC系统运行正常，可以接收VOC排放。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(1L, subId, "1", "火炬系统检修时所加装的盲板已拆除。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(2L, subId, "1", "火炬系统已完成氮气置换，氧含量<0.2%。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(3L, subId, "1", "公用工程（消防水、仪表风、氮气、电、中、低压蒸汽等）已投用或具备使用条件。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(4L, subId, "1", "火炬系统的所有仪表功能检查正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(5L, subId, "1", "火炬点火用燃料气已引到PCV-9994、PC-9991阀前。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "1", "仪表空气送至PCV-9995阀前。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(7L, subId, "1", "加热火炬气的甲醇已充进换热器390-E-903，390-E-903的低压蒸汽管线暖管结束。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(8L, subId, "1", "火炬总管分子封用氮已经投用。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(9L, subId, "1", "点火器装置和电视监控器等电器设备已送电，设备完好。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(10L, subId, "1", "火炬消烟蒸汽已引到蒸汽调节阀前，RO-9991～3的前后闸阀全开，管线上所有疏水器均须投用。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(11L, subId, "1", "由LV-9990向水封罐390-V-940注生产工艺水，直到工艺水由从U形管排出。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(12L, subId, "1", "设定390-P-940去急冷水塔的流程，投用390-P-940自启动及停车控制器UC-9990。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(13L, subId, "1", "投用各火炬总管端点的吹扫气。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(14L, subId, "1", "火炬长明灯点火完成，确认正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(15L, subId, "1", "火炬系统可以接收装置物料排放。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(1L, subId, "2", "VOC系统检修时所加装的盲板已拆除。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(2L, subId, "2", "VOC系统已完成氮气置换，氧含量合格。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(3L, subId, "2", "公用工程（消防水、仪表风、氮气、电、中、低压蒸汽等）已投用或具备使用条件。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(4L, subId, "2", "VOC系统的所有仪表功能检查正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(5L, subId, "2", "VOC系统具备使用条件，开车流程打通，确认正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "2", "按操作程序启动390-K-950，确认K950运行正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(7L, subId, "2", "VOC系统运行正常，可以接收VOC排放。", userId, new Date()));
     }
 
     /**

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

@@ -22,7 +22,8 @@ public class TPssrTorchvoc extends BaseEntity
     public TPssrTorchvoc() {
     }
 
-    public TPssrTorchvoc(Long subId, String torchvocType, String content, String createrCode, Date createdate) {
+    public TPssrTorchvoc(Long serialNumber, Long subId, String torchvocType, String content, String createrCode, Date createdate) {
+        this.serialNumber = serialNumber;
         this.subId = subId;
         this.torchvocType = torchvocType;
         this.content = content;
@@ -46,6 +47,10 @@ public class TPssrTorchvoc extends BaseEntity
     @Excel(name = "类型，1火炬/2VOC")
     private String torchvocType;
 
+    /** 序号 */
+    @Excel(name = "序号")
+    private Long serialNumber;
+
     /** 投用步骤内容 */
     @Excel(name = "投用步骤内容")
     private String content;
@@ -112,6 +117,14 @@ public class TPssrTorchvoc extends BaseEntity
 
     private String reason;
 
+    public Long getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Long serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
     public String getReason() {
         return reason;
     }

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

@@ -26,10 +26,11 @@ 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="serialNumber"    column="serial_number"    />
     </resultMap>
 
     <sql id="selectTPssrTorchvocVo">
-        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.torchvoc_type, d.content, d.procedure_status, 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_torchvoc d
+        select d.serial_number, u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.torchvoc_type, d.content, d.procedure_status, 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_torchvoc 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
@@ -54,10 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by d.serial_number asc
     </select>
 
     <select id="selectTPssrTorchvocById" parameterType="Long" resultMap="TPssrTorchvocResult">
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null">approve_status,</if>
             <if test="confirm1 != null">confirm1,</if>
             <if test="confirm2 != null">confirm2,</if>
+            <if test="serialNumber != null">serial_number,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="confirm1 != null">#{confirm1},</if>
             <if test="confirm2 != null">#{confirm2},</if>
+            <if test="serialNumber != null">#{serialNumber},</if>
          </trim>
     </insert>
 
@@ -132,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id = #{id}
     </update>
@@ -147,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

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

@@ -155,7 +155,8 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="投用步骤内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="投用步骤内容" align="center" prop="content" :show-overflow-tooltip="true" width="400"/>
       <el-table-column label="步骤状态" align="center" prop="procedureStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
                        width="150">
@@ -215,6 +216,9 @@
     <!-- 添加或修改火炬，VOC系统对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="序号">
+          <el-input v-model="form.serialNumber" placeholder="请输入序号" />
+        </el-form-item>
         <el-form-item label="投用步骤内容">
           <el-input v-model="form.content" placeholder="请输入投用步骤内容" />
         </el-form-item>