准东数据推送

heheng

2025-06-19 af6d33f7c16b121538a6cdd417728e03c4ad0ef1

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

@@ -100,9 +100,12 @@
        <result property="companyId" column="company_id"/>



        <result property="checkPerson" column="check_person"/>
        <result property="findTime" column="find_time"/>
    </resultMap>



    <sql id="selectHiddenDangerCheckPointVo">
        select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,a.accept_status,
@@ -257,22 +260,18 @@
            <if test="planFormulateStatusExclude != null  and planFormulateStatusExclude != ''">and
                a.plan_formulate_status != #{planFormulateStatusExclude}
            </if>

            <if test="judgeQueryByUserId != null  and judgeQueryByUserId != ''">
                and a.danger_sources in (2,3)
                and (a.register_user_id = #{judgeQueryByUserId} or (a.judge_user_id = #{judgeQueryByUserId} and
                a.report_status IS NOT NULL) )
            </if>


            <if test="null != judgeQueryByUserIdList  and judgeQueryByUserIdList.size() > 0">
                and a.danger_sources in (2,3) and a.report_status IS NOT NULL and (a.judge_user_id in
                <foreach collection="judgeQueryByUserIdList" item="judgeQueryByUserId" open="(" separator="," close=")">
                    #{judgeQueryByUserId}
                </foreach>)
            </if>

            <if test="reportStatusByHasHandle != null  and reportStatusByHasHandle != ''">and (a.report_status = 1 or
                a.report_status = 2 or a.report_status = 3)
            </if>
            <if test="reportStatusIsNotNull != null  and reportStatusIsNotNull != ''">and (a.report_status IS NOT
                NULL)
@@ -348,8 +347,193 @@
                    #{companyId}
                </foreach>)
            </if>

            <if test="reportStatusByHasHandle != null  and reportStatusByHasHandle != ''">and (a.report_status = 0 or a.report_status = 1 or
                a.report_status = 2)
            </if>
            and (a.whether_danger = 1 or a.whether_danger is null) and  danger_name is not null
        </where>
<!--     todo 查找验收条件，将待验收的放在前面-->
        order by a.accept_status, a.create_time desc
    </select>



    <resultMap  type="HiddenDangerCheckPoint" id="HiddenDangerCheckPointResultNew">
        <result property="id" column="id"/>
        <result property="checkPointId" column="check_point_id"/>
        <result property="checkId" column="check_id"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="remark" column="remark"/>
        <result property="planCreateUserId" column="plan_create_user_id"/>
        <result property="planName" column="plan_name"/>
        <result property="troubleshootTypeId" column="troubleshoot_type_id"/>
        <result property="troubleshootTypeName" column="troubleshoot_type_name"/>
        <result property="organizationDeptId" column="organization_dept_id"/>
        <result property="organizationDeptName" column="organization_dept_name"/>
        <result property="riskType" column="risk_type"/>
        <result property="riskId" column="risk_id"/>
        <result property="riskName" column="risk_name"/>
        <result property="checkUserId" column="check_user_id"/>
        <result property="checkUserName" column="check_user_name"/>
        <result property="beCheckedDeptId" column="be_checked_dept_id"/>
        <result property="beCheckedDeptName" column="be_checked_dept_name"/>
        <result property="checkBeginTime" column="check_begin_time"/>
        <result property="checkEndTime" column="check_end_time"/>
        <result property="planFormulateStatus" column="plan_formulate_status"/>
        <result property="planExecuteStatus" column="plan_execute_status"/>
        <result property="checkStatus" column="check_status"/>
        <result property="whetherDanger" column="whether_danger"/>
        <result property="dangerName" column="danger_name"/>
        <result property="dangerDescription" column="danger_description"/>
        <result property="dangerLevel" column="danger_level"/>
        <result property="troubleTypeId" column="trouble_type_id"/>
        <result property="troubleTypeName" column="trouble_type_name"/>
        <result property="dangerDeptId" column="danger_dept_id"/>
        <result property="dangerDeptName" column="danger_dept_name"/>
        <result property="dangerPlaceId" column="danger_place_id"/>
        <result property="dangerPlaceName" column="danger_place_name"/>
        <result property="checkTime" column="check_time"/>
        <result property="preRectifyPhoto" column="pre_rectify_photo"/>
        <result property="registerUserId" column="register_user_id"/>
        <result property="registerUserName" column="register_user_name"/>
        <result property="registerCreateTime" column="register_create_time"/>
        <result property="registerSubmitTime" column="register_submit_time"/>
        <result property="judgeUserId" column="judge_user_id"/>
        <result property="judgeUserName" column="judge_user_name"/>
        <result property="judgeCreateTime" column="judge_create_time"/>
        <result property="judgeCreateUserId" column="judge_create_user_id"/>
        <result property="dangerSources" column="danger_sources"/>
        <result property="reportStatus" column="report_status"/>
        <result property="examineUserId" column="examine_user_id"/>
        <result property="examineUserName" column="examine_user_name"/>
        <result property="examineStatus" column="examine_status"/>
        <result property="examineOpinion" column="examine_opinion"/>
        <result property="examineResult" column="examine_result"/>
        <result property="examineCreateTime" column="examine_create_time"/>
        <result property="treatMeasure" column="treat_measure"/>
        <result property="rectifyUserId" column="rectify_user_id"/>
        <result property="rectifyUserName" column="rectify_user_name"/>
        <result property="rectifyDeptId" column="rectify_dept_id"/>
        <result property="rectifyDeptName" column="rectify_dept_name"/>
        <result property="rectifyDeadlineTime" column="rectify_deadline_time"/>
        <result property="rectifyType" column="rectify_type"/>
        <result property="rectifyAttachment" column="rectify_attachment"/>
        <result property="rectifyMeasure" column="rectify_measure"/>
        <result property="rectifyCondition" column="rectify_condition"/>
        <result property="rectifyFund" column="rectify_fund"/>
        <result property="rectifyCompleteTime" column="rectify_complete_time"/>
        <result property="rectifyStatus" column="rectify_status"/>
        <result property="rectifyCreateTime" column="rectify_create_time"/>
        <result property="acceptUserId" column="accept_user_id"/>
        <result property="acceptUserName" column="accept_user_name"/>
        <result property="postRectifyPhoto" column="post_rectify_photo"/>
        <result property="acceptResult" column="accept_result"/>
        <result property="acceptOpinion" column="accept_opinion"/>
        <result property="acceptFile" column="accept_file"/>
        <result property="acceptCreateTime" column="accept_create_time"/>
        <result property="acceptStatus" column="accept_status"/>
        <result property="stage" column="stage"/>
        <result property="scheduleCreateUserId" column="schedule_create_user_id"/>
        <result property="scheduleCreateUserName" column="schedule_create_user_name"/>
        <result property="scheduleCheckUserId" column="schedule_check_user_id"/>
        <result property="scheduleCheckUserName" column="schedule_check_user_name"/>
        <result property="scheduleCheckStatus" column="schedule_check_status"/>
        <result property="jobId" column="job_id"/>
        <result property="jobName" column="job_name"/>
        <result property="jobGroup" column="job_group"/>
        <result property="invokeTarget" column="invoke_target"/>
        <result property="jobMessage" column="job_message"/>
        <result property="status" column="status"/>
        <result property="exceptionInfo" column="exception_info"/>
        <result property="troubleshootTypeCycleNum" column="type_cycle_num"/>
        <result property="troubleshootTypeCycleType" column="type_cycle_type"/>
        <result property="checkType" column="check_type"/>
        <result property="companyId" column="company_id"/>



        <result property="checkPerson" column="check_person"/>
        <result property="findTime" column="find_time"/>
        <result property="dangerSrc" column="danger_src"/>
    </resultMap>

    <sql id="selectHiddenDangerCheckPointVoNewCount">
        select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,a.accept_status,
        c.plan_create_user_id,
        c.plan_name, c.troubleshoot_type_id,
        c.troubleshoot_type_name, c.organization_dept_id,
        c.organization_dept_name, c.risk_id, c.risk_name,c.risk_type, c.check_user_id, c.check_user_name,
        c.be_checked_dept_id, c.be_checked_dept_name, c.check_begin_time, c.check_end_time,
        c.plan_formulate_status, c.plan_execute_status, c.check_status, a.whether_danger,
        a.danger_name, a.danger_description, a.danger_level, a.trouble_type_id, a.trouble_type_name,
        c.danger_place_id,c.danger_place_name, a.check_time, a.pre_rectify_photo, a.register_create_time, a.judge_create_time,
        a.danger_sources, a.report_status,
        a.examine_status, a.examine_opinion, a.examine_result, a.examine_create_time,
        a.treat_measure, a.rectify_user_id, a.rectify_user_name, a.rectify_dept_id, a.rectify_dept_name, a.rectify_deadline_time,
        a.rectify_type, a.rectify_attachment, a.rectify_measure, a.rectify_condition, a.rectify_fund, a.rectify_complete_time,
        a.rectify_status, a.rectify_create_time, a.accept_user_id, a.accept_user_name, a.post_rectify_photo, a.accept_result,
        a.accept_create_time,a.accept_status, a.accept_opinion, a.accept_file, a.stage,
        c.danger_dept_id,c.danger_dept_name,a.judge_user_id,a.judge_user_name,a.judge_create_user_id,
        a.register_submit_time,a.register_user_id,a.register_user_name,
        c.schedule_create_user_id, c.schedule_create_user_name,
        c.schedule_check_user_id, c.schedule_check_user_name, a.schedule_check_status,
        c.job_id, c.job_name, c.job_group, c.invoke_target, c.job_message, c.status, c.exception_info,

        c.check_type,a.company_id,
        b.type_cycle_num,b.type_cycle_type,
        a.examine_user_id, a.examine_user_name,
        a.check_person, a.find_time,e.danger_src
        from tr_hidden_danger_check_point a
        left join tr_hidden_danger_check  c  on  c.check_id = a.check_id
        left join tr_troubleshoot_type  b  on  c.troubleshoot_type_id = b.type_id
        left join prevent_risk_danger_info e on e.danger_check_point_id = a.id
    </sql>

    <!-- todo 查隐患台账-->
    <select id="selectHiddenDangerCheckPointListNewCount" parameterType="HiddenDangerCheckPoint"
            resultMap="HiddenDangerCheckPointResultNew">
        <include refid="selectHiddenDangerCheckPointVoNewCount"/>
        <where>
            <if test="id != null  and id != ''">and a.id = #{id}</if>
            <if test="dangerLevel != null  and dangerLevel != ''">and a.danger_level = #{dangerLevel}</if>
            <if test="registerUserId != null  and registerUserId != ''">and a.register_user_id = #{registerUserId}</if>
            <if test="registerUserName != null  and registerUserName != ''">and a.register_user_name =
                #{registerUserName}
            </if>
            <if test="dangerSrc != null"> and e.danger_src = #{dangerSrc}</if>
            <if test="registerCreateTime != null ">and a.register_create_time = #{registerCreateTime}</if>
            <if test="params.beginRegisterCreateTime != null and params.beginRegisterCreateTime != '' and params.endRegisterCreateTime != null and params.endRegisterCreateTime != ''">
                and a.register_create_time between #{params.beginRegisterCreateTime} and
                #{params.endRegisterCreateTime}
            </if>
            <if test="rectifyDeptId != null ">and a.rectify_dept_id = #{rectifyDeptId}</if>
            <if test="rectifyDeptName != null  and rectifyDeptName != ''">and a.rectify_dept_name like concat('%',
                #{rectifyDeptName}, '%')
            </if>
            <if test="rectifyStatus != null  and rectifyStatus != ''">and a.rectify_status = #{rectifyStatus}</if>
            <if test="acceptStatus != null  and acceptStatus != ''">and a.accept_status = #{acceptStatus}</if>
            <if test="stage != null  and stage != ''">and a.stage = #{stage}</if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND date_format(a.register_create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND date_format(a.register_create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
            </if>
            <if test="overdueRectify != null  and overdueRectify != ''">
                and (Date(a.rectify_complete_time) > Date(a.rectify_deadline_time))
            </if>
            <if test="acceptStatus != null  and acceptStatus != ''">and a.accept_status  = #{acceptStatus}</if>
            <if test="dangerSources != null  and dangerSources != ''">and a.danger_sources = #{dangerSources}</if>
            <if test="dangerName != null  and dangerName != ''">and a.danger_name like concat('%', #{dangerName}, '%')
            </if>

<!--            <if test="rectifyUserIdIsNotNull != null  and rectifyUserIdIsNotNull != ''">and a.rectify_user_id is not null</if>-->

            and (a.whether_danger = 1 or a.whether_danger is null) and  danger_name is not null
        </where>
        order by a.accept_status, a.create_time desc
    </select>

@@ -704,12 +888,12 @@

<!--    List<HiddenDangerCheckPoint> selectHiddenDangerCheckPointListNew(HiddenDangerCheckPoint hiddenDangerCheckPoint);-->


    <!-- todo 导出隐患台账-->
    <select id="selectHiddenDangerCheckPointListNew" parameterType="HiddenDangerCheckPoint"
            resultMap="HiddenDangerCheckPointResult">
        <include refid="selectHiddenDangerCheckPointVo"/>
        <where>
            danger_name is not null and rectify_user_id is not null
            danger_name is not null
            <if test="id != null  and id != ''">and a.id = #{id}</if>
            <if test="checkPointId != null  and checkPointId != ''">and a.check_point_id = #{checkPointId}</if>
            <if test="checkId != null  and checkId != ''">and a.check_id = #{checkId}</if>
@@ -829,7 +1013,7 @@
                a.plan_formulate_status != #{planFormulateStatusExclude}
            </if>
            <if test="judgeQueryByUserId != null  and judgeQueryByUserId != ''">
                and a.danger_sources = 2
<!--                and a.danger_sources = 2-->
                and (a.register_user_id = #{judgeQueryByUserId} or (a.judge_user_id = #{judgeQueryByUserId} and
                a.report_status IS NOT NULL) )
            </if>
@@ -840,10 +1024,6 @@
                <foreach collection="judgeQueryByUserIdList" item="judgeQueryByUserId" open="(" separator="," close=")">
                    #{judgeQueryByUserId}
                </foreach>)
            </if>

            <if test="reportStatusByHasHandle != null  and reportStatusByHasHandle != ''">and (a.report_status = 1 or
                a.report_status = 2)
            </if>
            <if test="reportStatusIsNotNull != null  and reportStatusIsNotNull != ''">and (a.report_status IS NOT
                NULL)
@@ -909,7 +1089,7 @@

            <if test="companyId != null  and companyId != ''">and a.company_id  = #{companyId}</if>

            <if test="rectifyUserIdIsNotNull != null  and rectifyUserIdIsNotNull != ''">and a.rectify_user_id is not null</if>
<!--            <if test="rectifyUserIdIsNotNull != null  and rectifyUserIdIsNotNull != ''">and a.rectify_user_id is not null</if>-->

            <if test="null != companyIdList  and companyIdList.size() > 0">
                and (a.company_id in
@@ -917,6 +1097,12 @@
                    #{companyId}
                </foreach>)
            </if>


<!--            <if test="reportStatusByHasHandle != null  and reportStatusByHasHandle != ''">and (a.report_status = 0 or a.report_status = 1 or-->
<!--                a.report_status = 2)-->
<!--            </if>-->
            and (a.whether_danger = 1 or a.whether_danger is null)
        </where>
        order by a.create_time desc
    </select>