隐患审核复查审核记录

huaxin-system/src/main/java/com/zehong/system/domain/TDangerApprovalRecord.java

@@ -44,6 +44,10 @@ public class TDangerApprovalRecord extends BaseEntity
 
     private String nickName;
 
+    /** 审核类型：0.复查 1.审核 */
+    @Excel(name = "审核类型",readConverterExp = "0=复查 1=审核")
+    private String type;
+
     public void setApprovalId(Long approvalId) 
     {
         this.approvalId = approvalId;
@@ -116,6 +120,14 @@ public class TDangerApprovalRecord extends BaseEntity
         this.nickName = nickName;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

huaxin-system/src/main/java/com/zehong/system/service/impl/TDangerServiceImpl.java

@@ -171,9 +171,31 @@ public class TDangerServiceImpl implements ITDangerService
         tDangerStatus.setOptime(new Date());
         tDangerStatus.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
         tDangerStatusMapper.insertTDangerStatus(tDangerStatus);
+        //2026-10-13 复查记录加入审核记录表
+        saveCheckRecord(tDanger);
         return tDangerMapper.updateTDanger(tDanger);
     }
 
+    /**
+     * 2026-10-13
+     * 保存复查记录
+     * @param tDanger
+     */
+    private void saveCheckRecord(TDanger tDanger) {
+        //复查标识
+        if(null != tDanger.getParams() && tDanger.getParams().containsKey("bhFlag")){
+            //2026-10-13 复查记录加入审核记录表
+            //隐患记录
+            TDangerApprovalRecord tDangerApprovalRecord = new TDangerApprovalRecord();
+            tDangerApprovalRecord.setDangerId(tDanger.getId());
+            tDangerApprovalRecord.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+            tDangerApprovalRecord.setApprovalStatus(tDanger.getParams().containsKey("bhFlag") ? "1" : "0");
+            if(StringUtils.isNotEmpty(tDanger.getCheckRemark())) tDangerApprovalRecord.setSuggestion(tDanger.getCheckRemark());
+            tDangerApprovalRecord.setType("0");
+            tDangerApprovalRecordService.insertTDangerApprovalRecord(tDangerApprovalRecord);
+        }
+    }
+
     /**
      * 批量删除安检隐患整改
      * 
@@ -290,6 +312,7 @@ public class TDangerServiceImpl implements ITDangerService
             tDangerApprovalRecord.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
             tDangerApprovalRecord.setApprovalStatus(approvalVo.getState());
             tDangerApprovalRecord.setSuggestion(approvalVo.getSuggestion());
+            tDangerApprovalRecord.setType("1");
             tDangerApprovalRecordService.insertTDangerApprovalRecord(tDangerApprovalRecord);
         }
         return 1;

huaxin-system/src/main/resources/mapper/system/TDangerApprovalRecordMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
+        <result property="type"    column="type"    />
     </resultMap>
 
     <sql id="selectTDangerApprovalRecordVo">
@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             record.update_time,
             record.is_del,
             record.remarks,
+            record.type,
             su.nick_name as nickName
         FROM
             t_danger_approval_record record
@@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="suggestion != null  and suggestion != ''"> and record.suggestion = #{suggestion}</if>
             <if test="isDel != null  and isDel != ''"> and record.is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and record.remarks = #{remarks}</if>
+            <if test="type != null  and type != ''"> and record.type = #{type}</if>
         </where>
         ORDER BY record.create_time ASC
     </select>
@@ -65,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="type != null">type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dangerId != null">#{dangerId},</if>
@@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="type != null">#{type},</if>
          </trim>
     </insert>
 
@@ -91,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="type != null">type = #{type},</if>
         </trim>
         where approval_id = #{approvalId}
     </update>

huaxin-web/src/views/checktask/customerServiceDanger/components/DangerDetail.vue

@@ -931,7 +931,7 @@ export default {
     },
     //获取审核记录
     getDangerApprovalList(dangerId){
-      dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
+      dangerApprovalListInfo({dangerId:dangerId,type: "1"}).then(res =>{
         if(res.code == 200){
           this.dangerApprovalList = res.data;
         }

huaxin-web/src/views/checktask/danger/components/DangerDetail.vue

@@ -917,7 +917,7 @@ export default {
     },
     //获取审核记录
     getDangerApprovalList(dangerId){
-      dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
+      dangerApprovalListInfo({dangerId:dangerId,type: "1"}).then(res =>{
         if(res.code == 200){
           this.dangerApprovalList = res.data;
         }

huaxin-web/src/views/checktask/pendingApprovaldanger/components/DangerDetail.vue

@@ -917,7 +917,7 @@ export default {
     },
     //获取审核记录
     getDangerApprovalList(dangerId){
-      dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
+      dangerApprovalListInfo({dangerId:dangerId,type: "1"}).then(res =>{
         if(res.code == 200){
           this.dangerApprovalList = res.data;
         }

huaxin-web/src/views/checktask/superviseDanger/components/DangerDetail.vue

@@ -883,7 +883,7 @@ export default {
     },
     //获取审核记录
     getDangerApprovalList(dangerId){
-      dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
+      dangerApprovalListInfo({dangerId:dangerId,type: "1"}).then(res =>{
         if(res.code == 200){
           this.dangerApprovalList = res.data;
         }

huaxin-web/src/views/checktask/task/components/DangerDetailInfo.vue

@@ -871,7 +871,7 @@ export default {
     },
     //获取审核记录
     getDangerApprovalList(dangerId){
-      dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
+      dangerApprovalListInfo({dangerId:dangerId,type: "1"}).then(res =>{
         if(res.code == 200){
           this.dangerApprovalList = res.data;
         }