Merge remote-tracking branch 'origin/master'

zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsSpotRecInfor.java

@@ -63,6 +63,10 @@ public class TInsSpotRecInfor extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     private Date fUpdateTime;
 
+    private String taskCode;
+
+    private String taskName;
+
     public void setfInsSpotRecInforId(Long fInsSpotRecInforId) 
     {
         this.fInsSpotRecInforId = fInsSpotRecInforId;
@@ -127,6 +131,22 @@ public class TInsSpotRecInfor extends BaseEntity
         return fUpdateTime;
     }
 
+    public String getTaskCode() {
+        return taskCode;
+    }
+
+    public void setTaskCode(String taskCode) {
+        this.taskCode = taskCode;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zh-baseversion-system/src/main/resources/mapper/system/TInsSpotHazardRefMapper.xml

@@ -47,16 +47,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTInsSpotHazardRefList" parameterType="TInsSpotHazardRef" resultMap="TInsSpotHazardRefResult">
         <include refid="selectTInsSpotHazardRefVo"/>
         <where>  
-            <if test="fHazardUniqueCode != null  and fHazardUniqueCode != ''"> and f_hazard_unique_code like concat('%', #{fHazardUniqueCode}, '%')</if>
-            <if test="fObjType != null  and fObjType != ''"> and f_obj_type = #{fObjType}</if>
-            <if test="fIsEnforcement != null  and fIsEnforcement != ''"> and f_is_enforcement = #{fIsEnforcement}</if>
+            <if test="fHazardUniqueCode != null  and fHazardUniqueCode != ''"> and spot.f_hazard_unique_code like concat('%', #{fHazardUniqueCode}, '%')</if>
+            <if test="fObjType != null  and fObjType != ''"> and spot.f_obj_type = #{fObjType}</if>
+            <if test="fIsEnforcement != null  and fIsEnforcement != ''"> and spot.f_is_enforcement = #{fIsEnforcement}</if>
         </where>
         ORDER BY f_last_time DESC
     </select>
     
     <select id="selectTInsSpotHazardRefById" parameterType="Long" resultMap="TInsSpotHazardRefResult">
         <include refid="selectTInsSpotHazardRefVo"/>
-        where f_ins_spot_hazard_ref_id = #{fInsSpotHazardRefId}
+        where spot.f_ins_spot_hazard_ref_id = #{fInsSpotHazardRefId}
     </select>
         
     <insert id="insertTInsSpotHazardRef" parameterType="TInsSpotHazardRef" useGeneratedKeys="true" keyProperty="fInsSpotHazardRefId">

zh-baseversion-system/src/main/resources/mapper/system/TInsSpotRecInforMapper.xml

@@ -15,21 +15,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInsSpotRecInforVo">
-        select f_ins_spot_rec_infor_id, f_check_code, f_name, f_content, f_method, f_result, f_update_time from t_ins_spot_rec_infor
+        SELECT
+            spot.f_ins_spot_rec_infor_id,
+            spot.f_check_code,
+            spot.f_name,
+            spot.f_content,
+            spot.f_method,
+            spot.f_result,
+            spot.f_update_time,
+            rec.f_check_task_code AS taskCode,
+            task.f_name AS taskName
+        FROM
+            t_ins_spot_rec_infor spot
+        LEFT JOIN t_ins_rec_infor rec ON rec.f_check_code = spot.f_check_code
+        LEFT JOIN t_ins_task_infor task ON task.f_unique_code = rec.f_check_task_code
     </sql>
 
     <select id="selectTInsSpotRecInforList" parameterType="TInsSpotRecInfor" resultMap="TInsSpotRecInforResult">
         <include refid="selectTInsSpotRecInforVo"/>
         <where>  
-            <if test="fCheckCode != null  and fCheckCode != ''"> and f_check_code like concat('%', #{fCheckCode}, '%')</if>
-            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
-            <if test="fMethod != null  and fMethod != ''"> and f_method = #{fMethod}</if>
+            <if test="fCheckCode != null  and fCheckCode != ''"> and spot.f_check_code like concat('%', #{fCheckCode}, '%')</if>
+            <if test="fName != null  and fName != ''"> and spot.f_name like concat('%', #{fName}, '%')</if>
+            <if test="fMethod != null  and fMethod != ''"> and spot.f_method = #{fMethod}</if>
         </where>
     </select>
     
     <select id="selectTInsSpotRecInforById" parameterType="Long" resultMap="TInsSpotRecInforResult">
         <include refid="selectTInsSpotRecInforVo"/>
-        where f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
+        where spot.f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
     </select>
         
     <insert id="insertTInsSpotRecInfor" parameterType="TInsSpotRecInfor" useGeneratedKeys="true" keyProperty="fInsSpotRecInforId">

zh-baseversion-web/src/views/supervision/findings/components/DetailInfo.vue

@@ -10,6 +10,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="检查任务名称">
+            <span v-if="detailInfo.taskCode">{{ detailInfo.taskCode }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="检查任务编码">
+            <span v-if="detailInfo.taskName">{{ detailInfo.taskName }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="12">
           <el-form-item label="调研项目名称">
             <span v-if="detailInfo.fName">{{ detailInfo.fName }}</span>

zh-baseversion-web/src/views/supervision/findings/index.vue

@@ -81,6 +81,8 @@
     <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="检查记录编码" align="center" prop="fCheckCode" />
+      <el-table-column label="检查任务名称" align="center" prop="taskName" />
+      <el-table-column label="检查任务编号" align="center" prop="taskCode" />
       <el-table-column label="调研项目名称" align="center" prop="fName" />
       <el-table-column label="调研内容" align="center" prop="fContent" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -100,7 +102,7 @@
           <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -142,7 +144,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row class="el-row-table">
           <el-col :span="12">
-            <el-form-item label="检查记录编码" prop="fCheckCode">
+            <el-form-item label="检查记录" prop="fCheckCode">
               <el-select
                 v-model="form.fCheckCode"
                 placeholder="请选择检查记录编码"
@@ -151,7 +153,7 @@
                 <el-option
                   v-for="record in records"
                   :key="record.fInsRecInforId"
-                  :label="record.fCheckCode"
+                  :label="record.taskName + ' + '+record.fCheckCode"
                   :value="record.fCheckCode"
                 ></el-option>
               </el-select>