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/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -19,15 +19,15 @@ import java.util.Map;
 * @date 2021-06-28
 */
 public interface FireStationMapper extends BaseMapper<FireStation> {
-	
-	
-	
+
+	// 微型消防站按时间倒叙排列add order by cb_fire_station.rec_date desc  2021-09-08 by kongfm
+
 	@Select("<script>"
 			+ "select * from  cb_fire_station  where cb_fire_station.is_delete=0 "
 			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
-			+"limit  #{pageNum},#{pageSize}"
+			+" order by cb_fire_station.rec_date desc limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
 	@Select("<script>"

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

@@ -52,7 +52,7 @@
         </if>
     </select>
 
-
+    <!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm  -->
     <select id="selectPersonList" resultType="Map">
         select * from (
         SELECT
@@ -86,6 +86,7 @@
         u.sequence_nbr ,
         u.biz_org_name ,
         u.biz_org_code
+        order by u.rec_date desc
         )a where a.sequenceNbr is not null
         <if test="map.fieldsValue != null">
             <foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>

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

@@ -115,6 +115,7 @@
         from cb_water_resource
         where is_delete = #{isDelete}
     </select>
+    <!--消防水源按时间倒叙排列add  order by cb_water_resource.rec_date desc 2021-09-08 by kongfm  -->
     <select id="getWaterResourcePageByParams"
             resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
         select * from cb_water_resource where is_delete = 1
@@ -133,6 +134,7 @@
         <if test="belongBuildingId != null and belongBuildingId.size() > 0">
             and find_in_set(belong_building_id, #{belongBuildingId}) > 0
         </if>
+        order by cb_water_resource.rec_date desc
     </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireChemicalServiceImpl.java

@@ -30,10 +30,11 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
          */
         @Override
         public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
-                if(typeCode.equals("-1")) { // bug 2673 选择 -1 时候没有查出所有危化品处理 by kongfm
+                if("-1".equals(typeCode)) { // bug 2673 选择 -1 时候没有查出所有危化品处理 by kongfm
                         typeCode = null;
                 }
-           return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
+                // 危化品按时间倒叙排列add rec_date 2021-09-08 by kongfm
+           return this.queryForPage(page, "rec_date", false,casNo, formula, name,  typeCode, isDelete);
         }
 
         /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -154,7 +154,8 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
                                                   Boolean isDelete,
                                                   @Condition(Operator.like) String aircraftModel,
                                                   String engineTypeCode, String fuelTypeCode) {
-        return this.queryForPage(page, null, false, isDelete, aircraftModel, engineTypeCode, fuelTypeCode);
+        // 航空器信息按时间倒叙排列add rec_date 2021-09-08 by kongfm
+        return this.queryForPage(page, "rec_date", false, isDelete, aircraftModel, engineTypeCode, fuelTypeCode);
     }
 
     /**