Merge remote-tracking branch 'origin/developer' into developer

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

@@ -52,4 +52,6 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 	 *
 	 * **/
 	Integer getStationListCount(@Param("par")RequestData par);
+
+	FireStationDto getFireStationDetails(Long id);
 }

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

@@ -32,5 +32,19 @@
     </select>
 
 
+    <select id="getFireStationDetails" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationDto">
+        SELECT
+        a.*,
+        (SELECT
+            count(i.instance_id)
+         from
+             cb_dynamic_form_instance i
+         where
+            i.field_value = #{id}) As userNum
+        FROM cb_fire_station a
+        where
+            a.sequence_nbr = #{id}
+    </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/FireStationServiceImpl.java

@@ -91,7 +91,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
 
     @Override
     public FireStationDto selectBySequenceNbr(Long id) {
-        return this.queryBySeq(id);
+        return fireStationMapper.getFireStationDetails(id);
     }