重点部位列表排序

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

@@ -3,10 +3,8 @@
 <mapper
 	namespace="com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper">
 
-
-
 	<select id="getPageList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-SELECT
+		SELECT
 		c.`name` as name,
 		c.belong_id as belongId,
 		cou.biz_org_name as belongName,
@@ -33,35 +31,33 @@ SELECT
 		c.rec_date AS recDate,
 		c.fire_endurance_rate_name as fireEnduranceRateName,
 		c.use_nature_name as useNatureName
-FROM
+		FROM
 		cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.is_delete=FALSE
-<if test="name != null and name != ''">
+		left join cb_org_usr cou on c.belong_id =cou.sequence_nbr
+		where c.is_delete=FALSE
+		<if test="name != null and name != ''">
 			AND c.`name` like concat(#{name}, '%')
-</if>
-<if test="buildingId != null and buildingId != -1">
+		</if>
+		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}
-</if>
-<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+		</if>
+		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
-</if>
-<if test="useNature != null and useNature != ''">
+		</if>
+		<if test="useNature != null and useNature != ''">
 			AND c.`use_nature`= #{useNature}
-</if>
-<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+		</if>
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
-</if>
-<if test="belongId != null and belongId!='-1' and belongId != -1">
+		</if>
+		<if test="belongId != null and belongId!='-1' and belongId != -1">
 			AND c.`belong_id`= #{belongId}
-</if>
+		</if>
+		order by c.rec_date desc
 	</select>
 	
-	
 	<select id="getSequenceNbr" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-	
-	SELECT
-	c.`name` as name,
+		SELECT c.`name`                     as name,
 			   c.belong_id                  as belongId,
 			   cou.biz_org_name             as belongName,
 			   c.building_id                as buildingId,
@@ -87,16 +83,14 @@ where c.is_delete=FALSE
 			   c.rec_date                   AS recDate,
 			   c.fire_endurance_rate_name   as fireEnduranceRateName,
 			   c.use_nature_name            as useNatureName
-FROM
-	cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.sequence_nbr=#{sequenceNbr} and c.is_delete=FALSE;
-</select>
+		FROM cb_key_site c
+				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
+		where c.sequence_nbr = #{sequenceNbr}
+		  and c.is_delete = FALSE;
+	</select>
 		
 	<select id="getKeySiteList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-	
-	SELECT
-	c.`name` as name,
+		SELECT c.`name`                     as name,
 			   c.belong_id                  as belongId,
 			   cou.biz_org_name             as belongName,
 			   c.building_id                as buildingId,
@@ -122,10 +116,9 @@ where c.sequence_nbr=#{sequenceNbr} and c.is_delete=FALSE;
 			   c.rec_date                   AS recDate,
 			   c.fire_endurance_rate_name   as fireEnduranceRateName,
 			   c.use_nature_name            as useNatureName
-FROM
-	cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.is_delete=FALSE;
-</select>
+		FROM cb_key_site c
+				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
+		where c.is_delete = FALSE;
+	</select>
 		
 </mapper>

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

@@ -67,6 +67,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			String useNature, String fireFacilitiesInfo, Long belongId){
 		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
 	}
+
 	@Override
 	public List<Object> getBuildTree() {
 		ResponseModel<Object> response = equipFeignClient.getBuildingTree();