项目、合同修复

blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java

@@ -56,41 +56,41 @@ public class AirportMasterExcel implements Serializable {
 	@ExcelProperty("编码")
 	private String code;
 
-	@ExcelProperty("IATA编码")
+	@ExcelProperty("IATA编码*")
 	private String iataCode;
 
-	@ExcelProperty("ICAO代码")
+	@ExcelProperty("ICAO代码*")
 	private String icaoCode;
 
-	@ExcelProperty("机场标准名称")
+	@ExcelProperty("机场标准名称*")
 	private String name;
 
 	@ExcelProperty("机场简称")
 	private String shortName;
 
-	@ExcelProperty("所属省份")
+	@ExcelProperty("所属省份*")
 	private String provinceName;
 
-	@ExcelProperty("所属城市")
+	@ExcelProperty("所属城市*")
 	private String cityName;
 
-	@ExcelProperty("所属区县")
+	@ExcelProperty("所属区县*")
 	private String districtName;
 
-	@ExcelProperty("行政区划")
-	private String regionName;
-
 	@ExcelProperty("详细地址")
 	private String detailAddress;
 
-	@ExcelProperty("经度")
+	@ExcelProperty("经度*")
 	@NumberFormat("0.000000")
 	private BigDecimal longitude;
 
-	@ExcelProperty("纬度")
+	@ExcelProperty("纬度*")
 	@NumberFormat("0.000000")
 	private BigDecimal latitude;
 
+	@ExcelProperty("行政区划编号")
+	private String regionCode;
+
 	@ExcelProperty("数据来源")
 	private String dataSource;
 

blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java

@@ -54,30 +54,27 @@ public class RailwayStationExcel implements Serializable {
 	@ExcelProperty("编码")
 	private String code;
 
-	@ExcelProperty("TMIS国标编码")
+	@ExcelProperty("TMIS国标编码*")
 	private String tmisCode;
 
-	@ExcelProperty("电报码")
+	@ExcelProperty("电报码*")
 	private String telegraphCode;
 
-	@ExcelProperty("车站名称")
+	@ExcelProperty("车站名称*")
 	private String name;
 
 //	@ExcelProperty("所属铁路线路")
 //	private String railwayLine;
 
-	@ExcelProperty("所属省份")
+	@ExcelProperty("所属省份*")
 	private String provinceName;
 
-	@ExcelProperty("所属城市")
+	@ExcelProperty("所属城市*")
 	private String cityName;
 
-	@ExcelProperty("所属区县")
+	@ExcelProperty("所属区县*")
 	private String districtName;
 
-	@ExcelProperty("行政区划")
-	private String regionName;
-
 	@ExcelProperty("详细地址")
 	private String detailAddress;
 
@@ -87,6 +84,9 @@ public class RailwayStationExcel implements Serializable {
 	@ExcelProperty("纬度")
 	private String latitude;
 
+	@ExcelProperty("行政区划编号")
+	private String regionCode;
+
 	@ExcelProperty("数据来源")
 	private String dataSource;
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/FeeItemMapper.xml

@@ -8,6 +8,8 @@
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="update_user" property="updateUser"/>
+        <result column="create_dept_name" property="createDeptName"/>
+        <result column="update_user_name" property="updateUserName"/>
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
@@ -18,29 +20,33 @@
 
     <select id="selectFeeItemPage" resultMap="feeItemResultMap">
         SELECT
-            *
+            bfi.*,
+            bd.dept_name AS create_dept_name,
+            bu.real_name AS update_user_name
         FROM
-            blade_fee_item
+            blade_fee_item bfi
+            LEFT JOIN blade_dept bd ON bd.id = bfi.create_dept
+            LEFT JOIN blade_user bu ON bu.id = bfi.update_user
         WHERE
-            is_deleted = 0
+            bfi.is_deleted = 0
         <if test="feeItem.feeCategory != null and feeItem.feeCategory != ''">
-            AND fee_category = #{feeItem.feeCategory}
+            AND bfi.fee_category = #{feeItem.feeCategory}
         </if>
         <if test="feeItem.name != null and feeItem.name != ''">
             <bind name="nameLike" value="'%' + feeItem.name + '%'"/>
-            AND name LIKE #{nameLike}
+            AND bfi.name LIKE #{nameLike}
         </if>
         <if test="feeItem.englishName != null and feeItem.englishName != ''">
             <bind name="englishNameLike" value="'%' + feeItem.englishName + '%'"/>
-            AND english_name LIKE #{englishNameLike}
+            AND bfi.english_name LIKE #{englishNameLike}
         </if>
         <if test="feeItem.status != null">
-            AND status = #{feeItem.status}
+            AND bfi.status = #{feeItem.status}
         </if>
         <if test="feeItem.createDept != null">
-            AND create_dept = #{feeItem.createDept}
+            AND bfi.create_dept = #{feeItem.createDept}
         </if>
-        ORDER BY create_time DESC
+        ORDER BY bfi.create_time DESC
     </select>
 
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml

@@ -71,6 +71,9 @@
             <if test="param2.name!=null and param2.name!=''">
                 and region.name like concat(concat('%', #{param2.name}),'%')
             </if>
+            <if test="param2.regionLevel!=null">
+                and region.level = #{param2.regionLevel}
+            </if>
         </where>
         ORDER BY region.sort ASC, region.code ASC
     </select>
@@ -95,6 +98,9 @@
             <if test="param2.name!=null and param2.name!=''">
                 and region.name like concat(concat('%', #{param2.name}),'%')
             </if>
+            <if test="param2.regionLevel!=null">
+                and region.level = #{param2.regionLevel}
+            </if>
         </where>
         ORDER BY region.sort ASC, region.code ASC
     </select>