d多人核查，隐患检索部分改动

16639036659

2023-09-06 ef1fe7f67a9d7d4c94933c0a993e2d9639620239

d多人核查，隐患检索部分改动

 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java

对比新文件
@@ -0,0 +1,31 @@
package com.ruoyi.doublePrevention.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



import java.time.LocalDateTime;



@Data

@TableName("prevent_risk_danger_confirm_log")

public class PreventRiskDangerConfirmLog {



    /**

     * 主键

     * */

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;



    private Long dangerCheckPointId;



    private Long confirmUserId;



    private String confirmUser;



    private LocalDateTime confirmTime;



    private Integer confirmResult;



    private String confirmOpinion;

}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java

对比新文件
@@ -0,0 +1,18 @@
package com.ruoyi.doublePrevention.repository;





import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import org.springframework.stereotype.Repository;



import java.util.List;



@Repository

public interface PreventRiskDangerConfirmLogRepository {





    int saveConfirmLog(PreventRiskDangerConfirmLog confirmLog);





    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);

}


 src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java

@@ -97,7 +97,7 @@
//    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次

//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟

    @Scheduled(cron = "0 0/20 * * * ? ")    // 分钟

    //@Scheduled(cron = "0/30 * * * * ?")

//    @Scheduled(cron = "0/30 * * * * ?")

    public void execReportDateSchedule() throws UnsupportedEncodingException {

        logger.info("【####】上报数据开始...");




 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java

@@ -615,10 +615,12 @@
                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间

                    }



                    CJDangerInfo.setCost(String.valueOf(0));//初始值给0

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){

                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());

                        //整改人信息

                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人

                        CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

                    }



                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){

@@ -678,12 +680,11 @@
                    }

                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述

                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因

                    CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限

                    if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){

                        CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态

                    }

                    CJDangerInfo.setHazardDangerType(hiddenDanger.getHazardDangerType().toString());//隐患类型

                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());// todo 隐患类型

                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

                    //封装数据

                    CJDangerInfoLists.add(CJDangerInfo);


 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java

对比新文件
@@ -0,0 +1,15 @@
package com.ruoyi.doublePrevention.service.baseService;





import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;



import java.util.List;



public interface PreventRiskDangerConfirmLogService {





    int saveConfirmLog(HiddenDangerCheckPoint hdcp);



    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);

}


 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java

对比新文件
@@ -0,0 +1,47 @@
package com.ruoyi.doublePrevention.service.baseService.impl;



import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;

import com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository;

import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;



import java.time.LocalDateTime;

import java.util.List;



@Service

public class PreventRiskDangerConfirmLogServiceImpl implements PreventRiskDangerConfirmLogService {



    @Autowired

    private PreventRiskDangerConfirmLogRepository confirmLogRepository;



    @Autowired

    private IHiddenDangerCheckPointService hiddenDangerCheckPointService;



    @Override

    public int saveConfirmLog(HiddenDangerCheckPoint hdcp) {



        PreventRiskDangerConfirmLog confirmLog = new PreventRiskDangerConfirmLog();



        confirmLog.setDangerCheckPointId(hdcp.getId());

        confirmLog.setConfirmUserId(hdcp.getExamineUserId());// examine_user_id , 核查人id

        confirmLog.setConfirmUser(hdcp.getExamineUserName());// examine_user_name

        confirmLog.setConfirmTime(LocalDateTime.now());

//        confirmLog.setConfirmResult(Integer.valueOf(hdcp.getReportStatus()));// report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）

//        confirmLog.setConfirmOpinion(hdcp.getExamineOpinion()); // examine_opinion  意见



        int result = hiddenDangerCheckPointService.updateConfirm(hdcp);

        if (result < 1){

            throw new RuntimeException("修改核查人失败");

        }



        return confirmLogRepository.saveConfirmLog(confirmLog);

    }



    @Override

    public List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId) {

        return confirmLogRepository.getLogsByDangerCheckPointId(dangerCheckPointId);

    }

}


 src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java

@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
import com.ruoyi.project.mobile.domain.ApiResult;
@@ -17,11 +18,13 @@
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.ReactiveListCommands;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -50,6 +53,13 @@

    @Autowired
    private RiskService riskService;

    @Autowired
    private PreventRiskDangerConfirmLogService confirmLogService;


    @Autowired
    private IHiddenDangerCheckPointService hiddenDangerCheckPointService;

    /**
     * 获取隐患列表
@@ -116,7 +126,48 @@
        }
    }


    /**
     * 隐患核查--再次核查
     */
    @Transactional
    public ApiResult editNextConfirmSave(String str, ApiRequestHeader header) {
        //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
        ApiRequestHeader requestHeader = getHeader(header);
        if (!(header.equals(requestHeader))) {
            return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
        }
        try {
            Map<String, String> map = new ObjectMapper().readValue(str, HashMap.class);
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            // todo-2022 中间核查，插入多人核查附属表
            if(ObjectUtils.isEmpty(hdcp.getId())){
                throw new RuntimeException("id不能为空");
            }
            // report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）
//            if(ObjectUtils.isEmpty(hdcp.getReportStatus())){
//                throw new RuntimeException("判定结果不能为空");
//            }
            // examine_user_id , 核查人id
            if(ObjectUtils.isEmpty(hdcp.getExamineUserId())){
                throw new RuntimeException("核查人Id不能为空");
            }
            // examine_user_name
            if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){
                throw new RuntimeException("核查人姓名不能为空");
            }
            // examine_opinion  意见
//            if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
//                throw new RuntimeException("核查意见不能为空");
//            }
            int confirmResult = confirmLogService.saveConfirmLog(hdcp);
            if (confirmResult < 1){
                throw new RuntimeException("操作失败");
            }
            return ApiResult.success("隐患核查保存成功");
        } catch (Exception e) {
            return ApiResult.error("异常");
        }
    }
    /**
     * 隐患核查--保存
     */
@@ -129,6 +180,7 @@
        try {
            Map<String, String> map = new ObjectMapper().readValue(str, HashMap.class);
            HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
            // todo-2023 此处最终核查
            hdcp.setUpdateBy(header.loginName);
            hdcp.setUpdateTime(DateUtils.getNowDate());
            hdcp.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
@@ -142,17 +194,22 @@
                    hdcp.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_NOT);//是否为隐患(正常)
                }
            }

            hdcpService.updateHiddenDangerCheckPoint(hdcp);

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送

            // todo-2022 此处插入附属表
//        HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
            //此处插入隐患附属表
            int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
            if (result< 1){
                throw new RuntimeException("添加隐患附属信息失败");
            }

            HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hdcp.getId());
            int confirmResult = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint);
            if (confirmResult < 1){
                throw new RuntimeException("操作失败");
            }

            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送

            return ApiResult.success("隐患核查保存成功");
        } catch (Exception e) {

 src/main/java/com/ruoyi/project/mobile/service/ApiService.java

@@ -73,6 +73,10 @@
        return hiddenDangerCheckService.getHiddenDangeCheckList(str, header);
    }

    //隐患核查--再次核查
    public ApiResult editNextConfirmSave(String str, ApiRequestHeader header) {
        return hiddenDangerCheckService.editNextConfirmSave(str, header);
    }
    //隐患核查--保存
    public ApiResult editDangerExamineSave(String str, ApiRequestHeader header) {
        return hiddenDangerCheckService.editDangerExamineSave(str, header);

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java

@@ -5,7 +5,9 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -18,6 +20,8 @@
import com.ruoyi.project.tr.JpushMsg.service.IJpushMsgService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.javassist.expr.NewArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -49,6 +53,8 @@
    @Autowired
    JpushService jpushService;

    @Autowired
    private PreventRiskDangerConfirmLogService  confirmLogService;

    @Autowired
    private RiskService riskService;
@@ -87,6 +93,12 @@
//        hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);/** 核查状态(待核查) */
        startPage();
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
        for (HiddenDangerCheckPoint dangerCheck : list) {
            List<PreventRiskDangerConfirmLog> logsByDangerCheckPointId = confirmLogService.getLogsByDangerCheckPointId(dangerCheck.getId());
            if (logsByDangerCheckPointId.size() > 0){
                dangerCheck.setConfirmLogList(logsByDangerCheckPointId);
            }
        }
        return getDataTable(list);
    }

@@ -100,7 +112,51 @@
        startPage();
        hiddenDangerCheckPoint.setExamineUserId(getSysUser().getUserId());//核查人为本登录帐号userId的
        List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
        for (HiddenDangerCheckPoint dangerCheck : list) {
            List<PreventRiskDangerConfirmLog> logsByDangerCheckPointId = confirmLogService.getLogsByDangerCheckPointId(dangerCheck.getId());
            if (logsByDangerCheckPointId.size() > 0){
                dangerCheck.setConfirmLogList(logsByDangerCheckPointId);
            }
        }
        return getDataTable(list);
    }

    /**
     * 隐患核查--下一个核查人
     */
    @Log(title = "隐患核查--下一个核查人")
    @GetMapping("/nextConfirm")
    public AjaxResult nextConfirm(HiddenDangerCheckPoint hdcp) {

        if(ObjectUtils.isEmpty(hdcp.getId())){
            return AjaxResult.error("id不能为空");
        }
        // report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）
//        if(ObjectUtils.isEmpty(hdcp.getReportStatus())){
//            return AjaxResult.error("判定结果不能为空");
//        }
        // examine_user_id , 核查人id
        if(ObjectUtils.isEmpty(hdcp.getExamineUserId())){
            return AjaxResult.error("核查人Id不能为空");
        }
        // examine_user_name
        if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){
            return AjaxResult.error("核查人姓名不能为空");
        }
        // examine_opinion  意见
//        if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
//            return AjaxResult.error("核查意见不能为空");
//        }


//          原数据表，现在不做操作
//        int i = hiddenDangerCheckPointService.(hcdp);

        int i = confirmLogService.saveConfirmLog(hdcp);
        if (i < 1){
            return AjaxResult.error("操作失败");
        }
        return AjaxResult.success();
    }

    /**
@@ -127,6 +183,7 @@

    /**
     * 隐患核查--保存
     *
     */
    @Log(title = "隐患核查--保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editDangerExamineSave")
@@ -134,6 +191,8 @@
    public AjaxResult editDangerExamineSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
        //获取当前更新用户信息
        User sysUser = getSysUser();

        // todo-2023 此处最终核查
        hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
        hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
        hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
@@ -152,15 +211,21 @@
        if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) {
            rectifyRemindJPush(hiddenDangerCheckPoint);
        }

        // todo-2022 此处插入附属表
//        HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
        //此处插入隐患附属表
        //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
        int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
        if (result< 1){
            throw new RuntimeException("添加隐患附属信息失败");
        }

        HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
        int confirmResult = confirmLogService.saveConfirmLog(hdcp);
        if (confirmResult < 1){
            return AjaxResult.error("操作失败");
        }

        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送

        return toAjax(i);
    }


 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java

@@ -1,13 +1,12 @@
package com.ruoyi.project.tr.hiddenDangerCheckPoint.domain;

import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.project.system.company.domain.Company;
import kotlin.jvm.Transient;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

@@ -18,6 +17,7 @@
 * 隐患排查检查点信息表 tr_hidden_danger_check_point
 * 
 */
@Data
public class HiddenDangerCheckPoint extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -487,6 +487,12 @@
    @Transient
    private Long mobileCode;

    @Transient
    private Integer tag;

    @Transient
    private List<PreventRiskDangerConfirmLog> confirmLogList;


    public Long getMobileCode() {
        return mobileCode;

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java

@@ -86,4 +86,6 @@
    List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);

    int rectifyTimeOut(Long id , Date rectifyDeadlineTime);

    int updateConfirm(HiddenDangerCheckPoint hdcp);
}

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java

@@ -97,4 +97,6 @@
    List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);

    int rectifyTimeOut(Long id , Date rectifyDeadlineTime);

    int updateConfirm(HiddenDangerCheckPoint hdcp);
}

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java

@@ -211,5 +211,10 @@
        return hiddenDangerCheckPointMapper.rectifyTimeOut(id, rectifyDeadlineTime);
    }

    @Override
    public int updateConfirm(HiddenDangerCheckPoint hdcp) {
        return hiddenDangerCheckPointMapper.updateConfirm(hdcp);
    }


}

 src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml

@@ -38,7 +38,7 @@
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
<!--        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
        order by update_report_data_time
        limit 50
        limit 30
    </select>

<!--    int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
@@ -66,6 +66,7 @@
        mobile_code = #{mobileCode}
        where check_id = #{checkId}
    </update>

</mapper>



 src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml

对比新文件
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >

<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository" >



    <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog">

        <id column="id" property="id"/>

        <result column="danger_check_point_id" property="dangerCheckPointId" />

        <result column="confirm_user_id" property="confirmUserId"/>

        <result column="confirm_user" property="confirmUser"/>

        <result column="confirm_time" property="confirmTime" />

        <result column="confirm_result" property="confirmResult"/>

        <result column="confirm_opinion" property="confirmOpinion"/>

    </resultMap>



<!--    int saveConfirmLog(HiddenDangerCheckPoint hdcp);-->

    <insert id="saveConfirmLog">

        insert into prevent_risk_danger_confirm_log values

        (null, #{dangerCheckPointId}, #{confirmUserId}, #{confirmUser}, #{confirmTime}, null, null)

    </insert>



<!--    List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);-->

    <select id="getLogsByDangerCheckPointId" resultMap="BaseResultMap">

        select * from prevent_risk_danger_confirm_log

        where danger_check_point_id = #{dangerCheckPointId}

    </select>



    <update id="getLogsByDang1erCheckPointId" parameterType="int">

        update prevent_risk_danger_confirm_log set values

        (null, #{dangerCheckPoint}, #{ni})

    </update>

</mapper>








 src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml

@@ -690,4 +690,15 @@
            rectify_deadline_time = #{rectifyDeadlineTime}
        where id = #{id}
    </update>

<!--    int updateConfirm(HiddenDangerCheckPoint hdcp);-->
    <update id="updateConfirm" parameterType="HiddenDangerCheckPoint">
        update tr_hidden_danger_check_point set
        examine_user_id = #{examineUserId},
        examine_user_name = #{examineUserName}
        where id = #{id}
    </update>



</mapper>