审批修改，时间倒叙

ZQN

2024-06-25 0a7159370767b04ef9243f18270d155d527691d4

 project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml

@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.enforce.mapper.EnforceOrderMapper">
    
    <resultMap type="EnforceOrder" id="EnforceOrderResult">

    <resultMap type="EnforceOrderVo" id="EnforceOrderResult">
        <result property="orderId"    column="order_id"    />
        <result property="orderNo"    column="order_no"    />
        <result property="companyId"    column="company_id"    />
@@ -15,24 +15,26 @@
        <result property="companyAddress"    column="company_address"    />
        <result property="regionCode"    column="region_code"    />
        <result property="regionName"    column="region_name"    />
        <result property="enforceContent"    column="enforce_content"    />
        <result property="enforceReason"    column="enforce_reason"    />
        <result property="enforceType"    column="enforce_type"    />
        <result property="applyId"    column="apply_id"    />
        <result property="applyUser"    column="apply_user"    />
        <result property="applyPhone"    column="apply_phone"    />
        <result property="applyDeptId"    column="apply_dept_id"    />
        <result property="applyDeptName"    column="apply_dept_name"    />
        <result property="applyTime"    column="apply_time"    />
        <result property="planTime"    column="plan_time"    />
        <result property="inTime"    column="in_time"    />
        <result property="userNum"    column="user_num"    />
        <result property="warnStatus"    column="warn_status"    />
        <result property="warnReason"    column="warn_reason"    />
        <result property="orderStatus"    column="order_status"    />
        <result property="checkId"    column="check_id"    />
        <result property="checkUser"    column="check_user"    />
        <result property="checkPhone"    column="check_phone"    />
        <result property="checkDeptId"    column="check_dept_id"    />
        <result property="checkDeptName"    column="check_dept_name"    />
        <result property="checkTime"    column="check_time"    />
        <result property="checkStatus"    column="check_status"    />
        <result property="checkReason"    column="check_reason"    />
        <result property="checkLevel"    column="check_level"    />
        <result property="executeId"    column="execute_id"    />
        <result property="executeUser"    column="execute_user"    />
        <result property="executePhone"    column="execute_phone"    />
@@ -47,9 +49,70 @@
        <result property="isShow"    column="is_show"    />
        <result property="isEva"    column="is_eva"    />
        <result property="totalScore"    column="total_score"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>

    <sql id="selectEnforceOrderVo">
        select *
        from enforce_order
    </sql>

    <select id="selectCheckList"
            parameterType="EnforceOrderQueryBo"
            resultMap="EnforceOrderResult">
        <include refid="selectEnforceOrderVo"/>
        where 1=1
            and check_status !=2
            and check_status!=-1
            <if test="orderNo != null and orderNo != ''">
                AND order_no like concat('%', #{orderNo}, '%')
            </if>
            <if test="companyName != null and companyName != ''">
                AND company_name like concat('%', #{companyName}, '%')
            </if>
            <if test="orderStatus != null and orderStatus != ''">
                AND order_status = #{orderStatus}
            </if>
            <if test="checkIds != null and checkIds != '' ">
                AND check_ids like concat('%', #{checkIds}, '%')
            </if>
            <if test="enforceReason != null and enforceReason != '' ">
                AND enforce_reason like concat('%', #{enforceReason}, '%')
            </if>
            <if test="applyDeptIds != null and applyDeptIds !='' ">
                AND apply_dept_id in
                <foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
                    #{applyDeptId}
                </foreach>
            </if>
        order by apply_time desc
    </select>

    <select id="selectCheckedList"
            parameterType="OrderCheckedQueryBo"
            resultMap="EnforceOrderResult">
        select t2.*
            from enforce_check_log t1 join enforce_order t2 on t1.order_id = t2.order_id
        where t2.del_flag = 0
        and t1.check_id = #{userId}
        <if test="checkStatus != null">
            AND t2.check_status = #{checkStatus}
        </if>
        <if test="enforceReason != null and enforceReason != '' ">
            AND t2.enforce_reason like concat('%', #{enforceReason}, '%')
        </if>
        order by t2.apply_time desc
    </select>


</mapper>
    <select id="selectScanList"
            resultMap="EnforceOrderResult">
        select t2.*
        from enforce_peer t1 join enforce_order t2 on t1.order_id = t2.order_id
        where
            t2.del_flag = 0
            and t2.order_status=2
            AND t1.peer_id = #{userId}
            AND t2.company_code = #{companyCode}
        order by t2.apply_time asc
    </select>
</mapper>