From 5b8ea9fb2bef5377e8a39c7a16e9b8b915a959a5 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 12 Jul 2024 10:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml | 3 ++-
 .../mapper/manage/materialsinfo/MaterialsInfoMapper.xml        | 2 +-
 .../mapper/manage/operationInfo/OperationInfoMapper.xml        | 2 +-
 .../mapper/manage/propagandainfo/PropagandaInfoMapper.xml      | 2 +-
 .../mapper/manage/questioninfo/QuestionInfoMapper.xml          | 1 +
 .../resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml    | 2 +-
 .../mapper/manage/servicepackage/ServicePackageMapper.xml      | 2 +-
 .../manage/servicewaycontent/ServiceWayContentMapper.xml       | 2 +-
 .../resources/mapper/manage/textmessage/TextMessageMapper.xml  | 2 +-
 .../mapper/manage/wechattemplate/WechatTemplateMapper.xml      | 2 +-
 10 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml
index 43c68f11..8f78ade0 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml
@@ -29,7 +29,7 @@
     <select id="selectCrowdInfoList" parameterType="CrowdInfo" resultMap="CrowdInfoResult">
         <include refid="selectCrowdInfoVo"/>
         <where>
-	        del_flag = 0
+            del_flag = 0
             <if test="crowdName != null  and crowdName != ''">
                 and crowd_name like concat('%', #{crowdName}, '%')
             </if>
@@ -52,6 +52,7 @@
                 and whether_disable = #{whetherDisable}
             </if>
         </where>
+        order by sort
     </select>
 
     <select id="selectCrowdInfoById" parameterType="Long"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml
index 317aa044..9b898fc0 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml
@@ -55,7 +55,7 @@
 		        and date_format(create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d')
 	        </if>
         </where>
-        order by create_time desc
+        order by materials_sort, create_time desc
     </select>
 
     <select id="selectMaterialsInfoById" parameterType="Long"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
index 9b40e87a..3bc651fb 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
@@ -66,7 +66,7 @@
 		        and source_template_id = #{sourceTemplateId}
 	        </if>
         </where>
-        order by create_time DESC
+        order by update_time DESC
     </select>
 
     <select id="selectOperationList" parameterType="OperationInfo" resultMap="OperationInfoResult">
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
index e42a58a0..fb8d11c0 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
@@ -70,7 +70,7 @@
 	        <!-- 数据范围过滤 -->
 	        ${params.dataScope}
         </where>
-        order by p.create_time desc
+        order by p.update_time desc
     </select>
 
     <select id="selectPropagandaInfoById" parameterType="Long"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
index 551c634d..dd070199 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
@@ -164,6 +164,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
+        order by questionnaire_sort
     </select>
 
     <select id="selectQuestionInfoById" parameterType="Long"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
index 8f024043..23e4581e 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
@@ -125,7 +125,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        order by si.create_time DESC
+        order by script_sort
     </select>
 
     <select id="selectScriptInfoById" parameterType="Long"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
index 693434aa..d5a0bcf0 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
@@ -203,7 +203,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        order by sp.create_time DESC
+        order by sp.update_time DESC
     </select>
     <select id="selectServicePackageVoListById"
             resultType="com.xinelu.manage.vo.servicepackagecontent.ServicePackageContentVO">
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml
index 2ac19b57..dc6f42fc 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml
@@ -174,7 +174,7 @@
                 )
             </if>
         </where>
-        order by swc1.create_time DESC,swc2.create_time DESC
+        order by swc1.service_sort,swc1.create_time DESC,swc2.create_time DESC
     </select>
 
     <select id="selectServiceWayContentDetailByFrequencyId"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
index 4335df35..cc5a659d 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
@@ -146,7 +146,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        order by tm.create_time DESC ,tmst.create_time DESC
+        order by tm.text_message_sort, tm.create_time DESC ,tmst.create_time DESC
     </select>
 
     <select id="countByTextMessageTaskDTO" resultType="java.lang.Integer"
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
index 5a809e57..672e0a4b 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
@@ -159,7 +159,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        group by wt.id order by wt.create_time DESC,wtst.create_time DESC
+        group by wt.id order by wt.template_sort, wt.create_time DESC,wtst.create_time DESC
     </select>
     <select id="selectWechatTemplateDtoById" resultMap="WechatTemplateVOResultMap">
         select wt.id,