Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -28,7 +28,7 @@
         </if>
 
     </select>
-
+    <!--消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm -->
     <select id="getFireTeamForPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto">
         SELECT
         a.sequence_nbr sequenceNbr,
@@ -63,6 +63,7 @@
                 and a.sequence_nbr = #{par.nodeId}
             </if>
         </if>
+        order by a.rec_date desc
     </select>
     <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">
         select t.*, p.name parentName
@@ -70,6 +71,8 @@
                  left join cb_fire_team p on t.parent = p.sequence_nbr
         where t.is_delete = #{isDelete}
     </select>
+
+    <!--消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm -->
     <select id="listFireTeamById" resultType="com.yeejoin.amos.boot.module.common.api.entity.FireTeam">
         SELECT *
         FROM cb_fire_team
@@ -77,6 +80,7 @@
         <if test="teamId != null">
             AND tree_code LIKE CONCAT((SELECT tree_code FROM cb_fire_team WHERE sequence_nbr = #{teamId}),'%');
         </if>
+        order by cb_fire_team.rec_date desc
     </select>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -9,7 +9,7 @@
         where a.is_delete = 0
         GROUP BY a.job_title_code
     </select>
-
+    <!--消防队员列表按时间倒叙排列add desc  2021-09-08 by kongfm -->
     <select id="getFirefighters"
             resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto">
         select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
@@ -22,9 +22,9 @@
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
          <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
          <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
-        ORDER BY a.rec_date  limit #{pageNum},#{pageSize}
+        ORDER BY a.rec_date desc limit #{pageNum},#{pageSize}
     </select>
-
+    <!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
@@ -38,7 +38,7 @@
         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 
-        ORDER BY a.rec_date
+        ORDER BY a.rec_date desc
     </select>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -159,6 +159,7 @@
           and biz_org_code like concat(#{bizOrgCode}, '%')
     </select>
 
+    <!--消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm -->
     <select id="queryOrgPersonDtoList" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto">
         select u.*,
                v.person_number,
@@ -204,6 +205,7 @@
              ) v
              on u.sequence_nbr = v.instance_id
         where u.is_delete = #{isDelete}
+        order by u.rec_date desc
     </select>
     <select id="listOrgUserById" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         SELECT *