隐患；危险源；事故

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/controller/BisMajHiddSupController.java

@@ -43,6 +43,7 @@ public class BisMajHiddSupController extends BaseController {
     @PreAuthorize("@ss.hasPermi('hidd:majhiddsup:add')")
     @PostMapping
     public AjaxResult add(@RequestBody BisMajHiddSup bisMajHiddSup) {
+        bisMajHiddSup.setSupStat("1");
         int result = bisMajHiddSupService.insertBisMajHiddSup(bisMajHiddSup);
         if (result > 0 && bisMajHiddSup.getHiddGuid() != null) {
             ObjHidd hidd = objHiddService.selectObjHiddByGuid(bisMajHiddSup.getHiddGuid());

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/BisMajHiddSup.java

@@ -25,6 +25,14 @@ public class BisMajHiddSup {
     private String supLegPers;
     /** 督办意见 */
     private String supOpin;
+    /** 督办状态 */
+    private String supStat;
+    /** 隐患名称 (obj_hidd 关联) */
+    private String hiddName;
+    /** 隐患等级 (obj_hidd 关联) */
+    private String hiddGrad;
+    /** 隐患状态 (obj_hidd 关联) */
+    private String hiddStat;
     /** 备注 */
     private String note;
     /** 创建时间 */

gw-slaj/src/main/resources/mapper/slaj/hidd/BisMajHiddSupMapper.xml

@@ -11,14 +11,20 @@
         <result property="supWiunCode" column="sup_wiun_code"/>
         <result property="supLegPers" column="sup_leg_pers"/>
         <result property="supOpin" column="sup_opin"/>
+        <result property="supStat" column="sup_stat"/>
+        <result property="hiddName" column="hidd_name"/>
+        <result property="hiddGrad" column="hidd_grad"/>
+        <result property="hiddStat" column="hidd_stat"/>
         <result property="note" column="note"/>
         <result property="collTime" column="coll_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="recPers" column="rec_pers"/>
     </resultMap>
     <sql id="selectBisMajHiddSupVo">
-        select guid, hidd_guid, is_list, rect_peri, sup_lare_id, sup_date, sup_wiun_code, sup_leg_pers, sup_opin, note, coll_time, upd_time, rec_pers
-        from bis_maj_hidd_sup
+        select s.guid, s.hidd_guid, s.is_list, s.rect_peri, s.sup_lare_id, s.sup_date, s.sup_wiun_code, s.sup_leg_pers, s.sup_opin, s.sup_stat, s.note, s.coll_time, s.upd_time, s.rec_pers,
+               h.hidd_name, h.hidd_grad, h.hidd_stat
+        from bis_maj_hidd_sup s
+        left join obj_hidd h on h.guid = s.hidd_guid
     </sql>
     <select id="selectBisMajHiddSupByGuid" parameterType="String" resultMap="BisMajHiddSupResult">
         <include refid="selectBisMajHiddSupVo"/>
@@ -28,12 +34,13 @@
         <include refid="selectBisMajHiddSupVo"/>
         <where>
             <if test="hiddGuid != null and hiddGuid != ''">AND hidd_guid = #{hiddGuid}</if>
+            <if test="supStat != null and supStat != ''">AND sup_stat = #{supStat}</if>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
         </where>
     </select>
     <insert id="insertBisMajHiddSup" parameterType="com.goldenwater.slaj.hidd.domain.BisMajHiddSup">
-        insert into bis_maj_hidd_sup (guid, hidd_guid, is_list, rect_peri, sup_lare_id, sup_date, sup_wiun_code, sup_leg_pers, sup_opin, note, coll_time, upd_time, rec_pers)
-        values (#{guid}, #{hiddGuid}, #{isList}, #{rectPeri}, #{supLareId}, #{supDate}, #{supWiunCode}, #{supLegPers}, #{supOpin}, #{note}, #{collTime}, #{updTime}, #{recPers})
+        insert into bis_maj_hidd_sup (guid, hidd_guid, is_list, rect_peri, sup_lare_id, sup_date, sup_wiun_code, sup_leg_pers, sup_opin, sup_stat, note, coll_time, upd_time, rec_pers)
+        values (#{guid}, #{hiddGuid}, #{isList}, #{rectPeri}, #{supLareId}, #{supDate}, #{supWiunCode}, #{supLegPers}, #{supOpin}, #{supStat}, #{note}, #{collTime}, #{updTime}, #{recPers})
     </insert>
     <update id="updateBisMajHiddSup" parameterType="com.goldenwater.slaj.hidd.domain.BisMajHiddSup">
         update bis_maj_hidd_sup
@@ -46,6 +53,7 @@
             <if test="supWiunCode != null">sup_wiun_code = #{supWiunCode},</if>
             <if test="supLegPers != null">sup_leg_pers = #{supLegPers},</if>
             <if test="supOpin != null">sup_opin = #{supOpin},</if>
+            <if test="supStat != null">sup_stat = #{supStat},</if>
             <if test="note != null">note = #{note},</if>
             <if test="collTime != null">coll_time = #{collTime},</if>
             <if test="updTime != null">upd_time = #{updTime},</if>

gw-ui/src/views/slaj/hidd/supList.vue

@@ -63,14 +63,14 @@
         <el-form-item label="隐患名称">
           <el-input v-model="supForm.hiddName" disabled />
         </el-form-item>
-        <el-form-item label="督办意见" prop="supOpinion">
-          <el-input v-model="supForm.supOpinion" type="textarea" :rows="4" placeholder="请输入督办意见" />
+        <el-form-item label="督办意见" prop="supOpin">
+          <el-input v-model="supForm.supOpin" type="textarea" :rows="4" placeholder="请输入督办意见" />
         </el-form-item>
-        <el-form-item label="文号" prop="docNum">
-          <el-input v-model="supForm.docNum" placeholder="请输入文号" />
+        <el-form-item label="文号" prop="supLareId">
+          <el-input v-model="supForm.supLareId" placeholder="请输入文号" />
         </el-form-item>
-        <el-form-item label="督办期限" prop="limitDate">
-          <el-date-picker v-model="supForm.limitDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择期限" style="width: 100%" />
+        <el-form-item label="督办期限" prop="rectPeri">
+          <el-date-picker v-model="supForm.rectPeri" type="date" value-format="YYYY-MM-DD" placeholder="请选择期限" style="width: 100%" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -115,9 +115,9 @@ const dateRange = ref([])
 const supOpen = ref(false)
 const supForm = ref({})
 const supRules = {
-  supOpinion: [{ required: true, message: "督办意见不能为空", trigger: "blur" }],
-  docNum: [{ required: true, message: "文号不能为空", trigger: "blur" }],
-  limitDate: [{ required: true, message: "请选择督办期限", trigger: "change" }]
+  supOpin: [{ required: true, message: "督办意见不能为空", trigger: "blur" }],
+  supLareId: [{ required: true, message: "文号不能为空", trigger: "blur" }],
+  rectPeri: [{ required: true, message: "请选择督办期限", trigger: "change" }]
 }
 
 const writeOffOpen = ref(false)
@@ -175,9 +175,9 @@ function handleSup(row) {
   supForm.value = {
     hiddGuid: row.guid,
     hiddName: row.hiddName,
-    supOpinion: undefined,
-    docNum: undefined,
-    limitDate: undefined
+    supOpin: undefined,
+    supLareId: undefined,
+    rectPeri: undefined
   }
   supOpen.value = true
 }