From 806e739ac22aefd448dee64c24b4bb178812738f Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Thu, 28 Nov 2024 09:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=80=92=E5=BA=8F=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hw/dms/controller/DmsBaseDeviceSuplierController.java | 4 ++--
 .../resources/mapper/dms/DmsBillsInspectInstanceMapper.xml    | 1 +
 .../main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml | 1 +
 .../src/main/resources/mapper/dms/DmsPlanInspectMapper.xml    | 1 +
 .../src/main/resources/mapper/dms/DmsPlanMaintMapper.xml      | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
index d2d3bd4b..3b5d164a 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
@@ -40,11 +40,11 @@ public class DmsBaseDeviceSuplierController extends BaseController
      */
     @RequiresPermissions("dms:suplier:list")
     @GetMapping("/list")
-    public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
+    public List<DmsBaseDeviceSuplier> list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
     {
 //        startPage();
         List<DmsBaseDeviceSuplier> list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier);
-        return getDataTable(list);
+        return list;
     }
     //todo 新加一个con 拿掉分页
 
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
index 0d660938..f01b8a62 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectStatus != null  and inspectStatus != ''"> and a.inspect_status = #{inspectStatus}</if>
             <if test="isFlag != null  and isFlag != ''"> and a.is_flag = #{isFlag}</if>
         </where>
+        order by create_time desc
     </select>
     <select id="selectPoint" parameterType="DmsBillsInspectInstance" resultMap="DmsBillsInspectInstanceResult">
         <include refid="selectDmsBillsInspectInstanceVo"/>
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
index c21e40dd..76756cc0 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintCompRate != null "> and a.maint_comp_rate = #{maintCompRate}</if>
             <if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectDmsBillsMaintInstanceByMaintInstanceId" parameterType="Long" resultMap="DmsBillsMaintInstanceResult">
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
index 6540d89f..ab2f0e32 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="performer != null  and performer != ''"> and performer = #{performer}</if>
             <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectDmsPlanInspectByPlanInspectId" parameterType="Long" resultMap="DmsPlanInspectResult">
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
index f91c31f2..fc0fe732 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createMethod != null "> and create_method = #{createMethod}</if>
             <if test="isFlag != null "> and is_flag = #{isFlag}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectDmsPlanMaintByPlanMaintId" parameterType="Long" resultMap="DmsPlanMaintDmsPlanMaintDetailResult">