Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

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"

postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml

@@ -55,7 +55,7 @@
 		        and date_format(create_time,'%y%m%d') <= 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"

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">

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"

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"

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"

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">

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"

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"

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,