guoshilong
2023-07-13 3118876ab5101b348fabf5c8f3785527b9f5c5c2
查询按创建时间降序排序
4 files modified
18 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml 12 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -55,5 +55,6 @@
        <if test="dangerReportVO.createUser != null and dangerReportVO.createUser !=''">
            AND (r.create_user = #{dangerReportVO.createUser} OR r.to_user = #{dangerReportVO.createUser})
        </if>
        ORDER BY R.UPDATE_TIME DESC
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -7,6 +7,7 @@
        <result property="reservoirId" column="reservoir_id"/>
        <result property="reservoirName" column="reservoirName"/>
        <result property="type" column="type"/>
        <result property="typeLabel" column="typeLabel"/>
        <result property="content" column="content"/>
        <result property="reportTime" column="report_time"/>
        <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -24,9 +25,15 @@
    </resultMap>
    <select id="selectRecordPage" resultMap="vo">
        SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_MANAGE_PROTECT_RECORD R
        SELECT
               R.*,
               arb."name" AS reservoirName,
               U.REAL_NAME ,
               BDB.DICT_VALUE  AS typeLabel
        FROM SM_MANAGE_PROTECT_RECORD R
        LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
        LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
        LEFT JOIN BLADE_DICT_BIZ BDB ON BDB.DICT_KEY = R.TYPE AND BDB.CODE = 'MANAGE_PROTECT_TYPE'
        WHERE R.IS_DELETED = 0
        <if test="record.reservoirName != null and record.reservoirName !=''">
            AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
@@ -34,6 +41,9 @@
        <if test="record.type !=null and record.type !=''">
            AND R.type = #{record.type}
        </if>
        <if test="record.createUser != null and record.createUser !='' ">
            AND R.CREATE_USER = #{record.createUser}
        </if>
        ORDER BY R.CREATE_TIME DESC
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
@@ -9,4 +9,6 @@
    private String reservoirName;
    private String reportUser;
    private String typeLabel;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
@@ -31,6 +31,9 @@
        <if test="record.gateStatus !=null and record.gateStatus !=''">
            AND R.gate_status = #{record.gateStatus}
        </if>
        <if test="record.createUser !=null and record.createUser !=''">
            AND R.CREATE_USER = #{record.createUser}
        </if>
        ORDER BY R.CREATE_TIME  DESC
    </select>
    <select id="customizeGetDetail" resultType="cn.gistack.sm.schedulingModules.vo.SchedulingRecordVO">