PSSR静电接地/跨接添加序号字段

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

@@ -76,6 +76,9 @@ public class TPssrAboveallController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ITPssrFranklinismService tPssrFranklinismService;
+
     /**
      * 查询PSSR列表
      */
@@ -238,6 +241,8 @@ public class TPssrAboveallController extends BaseController {
                         genXcws(subcontent.getId(), userId);
                     } else if (subcontent.getForShort().equals("rsfh")) {
                         genRsfh(subcontent.getId(), userId);
+                    } else if (subcontent.getForShort().equals("jdjdkj")) {
+                        genJdjdkj(subcontent.getId(), userId);
                     }
                 }, "新增子表数据").start();
             }
@@ -251,6 +256,14 @@ public class TPssrAboveallController extends BaseController {
         tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId, "管道/设备上的保温层不妨碍操作人员进行现场作业。", userId, new Date()));
     }
 
+    private void genJdjdkj(Long subId, String userId) {
+        tPssrFranklinismService.insertTPssrFranklinism(new TPssrFranklinism(1L, subId, "电气设备按要求接地，接线规范。", userId, new Date()));
+        tPssrFranklinismService.insertTPssrFranklinism(new TPssrFranklinism(2L, subId, "管线按要求跨接，接线规范。", userId, new Date()));
+        tPssrFranklinismService.insertTPssrFranklinism(new TPssrFranklinism(3L, subId, "接线端头牢固，无松动。", userId, new Date()));
+        tPssrFranklinismService.insertTPssrFranklinism(new TPssrFranklinism(4L, subId, "接地电缆无破损，状况良好。", userId, new Date()));
+        tPssrFranklinismService.insertTPssrFranklinism(new TPssrFranklinism(5L, subId, "接地标记/标识清晰。", userId, new Date()));
+    }
+
     private void genXcws(Long subId, String userId) {
         tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "现场地面无油渍，积水等。", userId, new Date()));
         tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "现场无检修施工后的残留物(碎屑, 密封材料, 螺栓，保温材料等) 。", userId, new Date()));

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

@@ -94,6 +94,8 @@ public class TPssrFranklinism extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    private Long serialNumber;
+
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
@@ -342,6 +344,26 @@ public class TPssrFranklinism extends BaseEntity
         return approveStatus;
     }
 
+    public Long getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Long serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public TPssrFranklinism() {
+    }
+
+    public TPssrFranklinism(Long serialNumber, Long subId, String checkContent, String createrCode, Date createdate) {
+        this.serialNumber = serialNumber;
+        this.subId = subId;
+        this.checkContent = checkContent;
+        this.createrCode = createrCode;
+        this.createdate = createdate;
+        this.approveStatus = 0L;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -27,10 +27,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="selectTPssrFranklinismVo">
-        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.check_des, d.change_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_franklinism d
+        select d.id, d.serial_number, 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.check_des, d.change_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_franklinism 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
@@ -56,10 +57,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="selectTPssrFranklinismById" parameterType="Long" resultMap="TPssrFranklinismResult">
@@ -92,6 +95,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>
@@ -113,6 +117,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>
 
@@ -137,6 +142,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>
@@ -152,6 +158,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/franklinism/index.vue

@@ -133,7 +133,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="checkContent" :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="checkContent" :show-overflow-tooltip="true" width="400"/>
       <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
                        width="150">
@@ -193,6 +194,9 @@
     <!-- 添加或修改静电接地，跨接对话框 -->
     <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 type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>