fix联锁管理排序

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/InterlockDetailMapper.java

@@ -20,7 +20,7 @@ import org.jeecg.modules.summary.vo.InterlockSummaryVO;
  */
 public interface InterlockDetailMapper extends BaseMapper<InterlockDetail> {
 
-    /**联锁总表-分页列表查询（各种逻辑状态）*/
+    /**联锁详细信息表分页列表查询*/
     public IPage<InterlockDetailQueryVO> getPage2(Page<InterlockDetailQueryVO> page, @Param("dto") InterlockDetailQueryDTO dto);
 
     /**联锁总表-分页列表查询（各种逻辑状态）*/

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.detail.mapper.InterlockDetailMapper">
 
-    <!-- 联锁总表-分页列表查询（各种逻辑状态）-->
+    <!-- 联锁详细信息表分页列表查询-->
     <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.detail.vo.InterlockDetailQueryVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,
         d.instrument_status, d.interlock_set_value, d.current_value, d.if_bypass, d.input_status, d.output_status,
@@ -12,7 +12,7 @@
             <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>
             <if test="dto.interlockConditionTag != null and dto.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%',#{dto.interlockConditionTag},'%')</if>
         </where>
-order by d.summaryid
+        order by d.create_time desc
     </select>
 
     <!-- 联锁总表-分页列表查询（各种逻辑状态）-->
@@ -29,6 +29,7 @@ order by d.summaryid
             <if test="interlockSummaryVO.interlockStatus != null and interlockSummaryVO.interlockStatus != ''"> and s.interlock_status = #{interlockSummaryVO.interlockStatus}</if>
             <if test="interlockSummaryVO.loopHealthLevel != null and interlockSummaryVO.loopHealthLevel != ''"> and s.loop_health_level = #{interlockSummaryVO.loopHealthLevel}</if>
         </where>
+        order by s.create_time desc
     </select>
 
 </mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/IInterlockDetailService.java

@@ -16,7 +16,7 @@ import org.jeecg.modules.summary.vo.InterlockSummaryVO;
  */
 public interface IInterlockDetailService extends IService<InterlockDetail> {
 
-    /**联锁总表-分页列表查询（各种逻辑状态）*/
+    /**联锁详细信息表分页列表查询*/
     public IPage<InterlockDetailQueryVO> getPage2(Page<InterlockDetailQueryVO> page, InterlockDetailQueryDTO dto);
 
 

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/impl/InterlockDetailServiceImpl.java

@@ -26,7 +26,7 @@ public class InterlockDetailServiceImpl extends ServiceImpl<InterlockDetailMappe
     @SuppressWarnings("all")
     private InterlockDetailMapper interlockDetailMapper;
 
-    /**联锁总表-分页列表查询（各种逻辑状态）*/
+    /**联锁详细信息表分页列表查询*/
     public IPage<InterlockDetailQueryVO> getPage2(Page<InterlockDetailQueryVO> page, InterlockDetailQueryDTO dto){
         return interlockDetailMapper.getPage2(page, dto);
     }