diff --git a/AGENTS.md b/AGENTS.md index 742ddc8..71ef371 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -195,6 +195,7 @@ Entity 基类的选择**直接决定** Service 和 ServiceImpl 的继承方式 - 简单查询使用 `LambdaQueryWrapper`，复杂查询写在 Mapper XML 中 - Mapper XML 与接口**同包**放置（`src/main/java` 下） - 分页统一使用 `Condition.getPage(query)` + `Condition.getQueryWrapper()` +- 表格的排序默认按照创建时间降序；后端分页 SQL 或 QueryWrapper 应默认使用 `create_time DESC` / `orderByDesc(Xxx::getCreateTime)`，除非用户明确要求业务字段优先排序。 - 禁止 JDBC 直连查询 ### 6.9 审计字段展示 @@ -204,7 +205,13 @@ Entity 基类的选择**直接决定** Service 和 ServiceImpl 的继承方式 - Entity → VO 转换统一在 `XxxWrapper` 中完成；审计人姓名通过 `UserCache.getUserRealName(userId)` 获取，优先返回用户真实姓名，缓存未命中时兜底返回用户 ID。 - Controller 不应在列表、详情方法中重复编写审计人翻译逻辑，避免各模块显示规则不一致。 -### 6.10 日志 +### 6.10 导出数据格式 + +- 导出 Excel、CSV 等文件时，金额类字段必须保留 2 位小数；即使原始数据为整数，也应导出为 `0.00` 形式。 +- 导出经度、纬度字段时必须保留 6 位小数；导出前仍需遵守经度 `-180 ~ 180`、纬度 `-90 ~ 90` 的有效范围约束。 +- 精度格式化应在导出 DTO/Excel 模型、导出组装逻辑或专用格式化工具中完成，禁止只依赖前端展示格式。 + +### 6.11 日志 - 使用 `@Slf4j`，占位符传参（禁止字符串拼接） - 包含关键业务标识，异常必须携带堆栈，禁止打印敏感信息 @@ -344,4 +351,4 @@ id parent_id code name alias path source sort category action is_open component 2075431753298714626 2075431169720033282 airport_master_status 修改状态 airport_master_status 1 2 0 1 0 2075431820189474818 2075431169720033282 airport_master_add 新增 airport_master_add 1 2 0 1 0 ``` -2.生成的表、字段的排序规则要使用utf8mb4_general_ci \ No newline at end of file +2.生成的表、字段的排序规则要使用utf8mb4_general_ci diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java index b6ce9ce..c0caabf 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/AirportMaster.java @@ -25,6 +25,7 @@ */ package org.springblade.system.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -93,9 +94,20 @@ public class AirportMaster extends BaseEntity { */ @Schema(description = "所属城市") private String cityName; + /** + * 所属区县编码 + */ + @Schema(description = "所属区县编码") + private String districtCode; + /** + * 所属区县 + */ + @Schema(description = "所属区县") + private String districtName; /** * 行政区划编码 */ + @TableField(exist = false) @Schema(description = "行政区划编码") private String regionCode; /** diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Currency.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Currency.java index 954f13f..931db1d 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Currency.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Currency.java @@ -95,6 +95,7 @@ public class Currency extends BaseEntity { /** * 是否本位币 */ + @TableField("is_base_currency") @Schema(description = "是否本位币") private Integer baseCurrency; /** diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/FeeItem.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/FeeItem.java index f8badb0..f3ef8b8 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/FeeItem.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/FeeItem.java @@ -48,14 +48,19 @@ public class FeeItem extends BaseEntity { private static final long serialVersionUID = 1L; /** - * 中文名称 + * 费用类型 */ - @Schema(description = "中文名称") + @Schema(description = "费用类型") + private String feeCategory; + /** + * 费用项 + */ + @Schema(description = "费用项") private String name; /** - * 英文名称 + * 费用项代码 */ - @Schema(description = "英文名称") + @Schema(description = "费用项代码") private String englishName; } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java index 340499d..d68c174 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/PortTerminal.java @@ -25,6 +25,7 @@ */ package org.springblade.system.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -88,9 +89,20 @@ public class PortTerminal extends BaseEntity { */ @Schema(description = "城市") private String city; + /** + * 区县编码 + */ + @Schema(description = "区县编码") + private String districtCode; + /** + * 区县 + */ + @Schema(description = "区县") + private String districtName; /** * 行政区划编码 */ + @TableField(exist = false) @Schema(description = "行政区划编码") private String regionCode; /** diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java index 0fbcfaa..ce72905 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/RailwayStation.java @@ -25,6 +25,7 @@ */ package org.springblade.system.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -93,9 +94,20 @@ public class RailwayStation extends BaseEntity { */ @Schema(description = "所属城市") private String cityName; + /** + * 所属区县编码 + */ + @Schema(description = "所属区县编码") + private String districtCode; + /** + * 所属区县 + */ + @Schema(description = "所属区县") + private String districtName; /** * 行政区划编码 */ + @TableField(exist = false) @Schema(description = "行政区划编码") private String regionCode; /** diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Region.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Region.java index 4ee1606..16e8255 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Region.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Region.java @@ -27,6 +27,7 @@ package org.springblade.system.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -134,5 +135,12 @@ public class Region implements Serializable { @Schema(description = "备注") private String remark; + /** + * 原区划编号 + */ + @TableField(exist = false) + @Schema(description = "原区划编号") + private String originalCode; + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AirportMasterController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AirportMasterController.java index ce99ccb..dd5d721 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AirportMasterController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AirportMasterController.java @@ -172,6 +172,7 @@ public class AirportMasterController extends BladeController { airportMaster.remove("Blade-Auth"); airportMaster.remove("Authorization"); airportMaster.remove("access_token"); + normalizeRegionCodeCondition(airportMaster); QueryWrapper queryWrapper = Condition.getQueryWrapper(airportMaster, AirportMaster.class); if (Func.isNotEmpty(ids)) { queryWrapper.lambda().in(AirportMaster::getId, Func.toLongList(ids.toString())); @@ -207,4 +208,11 @@ public class AirportMasterController extends BladeController { return query; } + private void normalizeRegionCodeCondition(Map params) { + Object regionCode = params.remove("regionCode"); + if (Func.isNotEmpty(regionCode) && Func.isEmpty(params.get("districtCode"))) { + params.put("districtCode", regionCode); + } + } + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/PortTerminalController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/PortTerminalController.java index 38f1306..ae055fa 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/PortTerminalController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/PortTerminalController.java @@ -184,6 +184,7 @@ public class PortTerminalController extends BladeController { portTerminal.remove("Blade-Auth"); portTerminal.remove("Authorization"); portTerminal.remove("access_token"); + normalizeRegionCodeCondition(portTerminal); QueryWrapper queryWrapper = Condition.getQueryWrapper(portTerminal, PortTerminal.class); applyDataSourceCondition(queryWrapper, dataSource); if (Func.isNotEmpty(ids)) { @@ -220,6 +221,13 @@ public class PortTerminalController extends BladeController { return query; } + private void normalizeRegionCodeCondition(Map params) { + Object regionCode = params.remove("regionCode"); + if (Func.isNotEmpty(regionCode) && Func.isEmpty(params.get("districtCode"))) { + params.put("districtCode", regionCode); + } + } + private void applyDataSourceCondition(QueryWrapper queryWrapper, Object dataSource) { String value = Func.toStrWithEmpty(dataSource, ""); if (Func.isEmpty(value)) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RailwayStationController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RailwayStationController.java index 5dc056a..f5d01f2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RailwayStationController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RailwayStationController.java @@ -176,6 +176,7 @@ public class RailwayStationController extends BladeController { railwayStation.remove("Blade-Auth"); railwayStation.remove("Authorization"); railwayStation.remove("access_token"); + normalizeRegionCodeCondition(railwayStation); QueryWrapper queryWrapper = Condition.getQueryWrapper(railwayStation, RailwayStation.class); applyDataSourceCondition(queryWrapper, dataSource); if (Func.isNotEmpty(ids)) { @@ -212,6 +213,13 @@ public class RailwayStationController extends BladeController { return query; } + private void normalizeRegionCodeCondition(Map params) { + Object regionCode = params.remove("regionCode"); + if (Func.isNotEmpty(regionCode) && Func.isEmpty(params.get("districtCode"))) { + params.put("districtCode", regionCode); + } + } + private void applyDataSourceCondition(QueryWrapper queryWrapper, Object dataSource) { String value = Func.toStrWithEmpty(dataSource, ""); if (Func.isEmpty(value)) { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java index d539e18..d366c36 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java @@ -133,7 +133,7 @@ public class RegionController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "新增", description = "传入region") public R save(@Valid @RequestBody Region region) { - return R.status(regionService.save(region)); + return R.status(regionService.submit(region)); } /** @@ -143,7 +143,8 @@ public class RegionController extends BladeController { @ApiOperationSupport(order = 6) @Operation(summary = "修改", description = "传入region") public R update(@Valid @RequestBody Region region) { - return R.status(regionService.updateById(region)); + region.setOriginalCode(region.getCode()); + return R.status(regionService.submit(region)); } /** @@ -174,7 +175,10 @@ public class RegionController extends BladeController { @ApiOperationSupport(order = 9) @Operation(summary = "下拉数据源", description = "传入tenant") public R> select(@RequestParam(required = false, defaultValue = "+86") String code) { - List list = regionService.list(Wrappers.query().lambda().eq(Region::getParentCode, code)); + List list = regionService.list(Wrappers.lambdaQuery() + .eq(Region::getParentCode, code) + .orderByAsc(Region::getSort) + .orderByAsc(Region::getCode)); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java index 171463d..8152b25 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExcel.java @@ -74,6 +74,9 @@ public class AirportMasterExcel implements Serializable { @ExcelProperty("所属城市") private String cityName; + @ExcelProperty("所属区县") + private String districtName; + @ExcelProperty("行政区划") private String regionName; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java index bbdf3b0..1f8f2de 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExcel.java @@ -27,6 +27,7 @@ package org.springblade.system.excel; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.NumberFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -73,6 +74,9 @@ public class PortTerminalExcel implements Serializable { @ExcelProperty("城市") private String city; + @ExcelProperty("区县") + private String districtName; + @ExcelProperty("行政区划编码") private String regionCode; @@ -80,9 +84,11 @@ public class PortTerminalExcel implements Serializable { private String detailAddress; @ExcelProperty("经度") + @NumberFormat("0.000000") private BigDecimal longitude; @ExcelProperty("纬度") + @NumberFormat("0.000000") private BigDecimal latitude; @ExcelProperty("数据来源") diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java index c1409ca..0c38d75 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExcel.java @@ -27,7 +27,6 @@ package org.springblade.system.excel; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; -import cn.idev.excel.annotation.format.NumberFormat; import cn.idev.excel.annotation.write.style.ColumnWidth; import cn.idev.excel.annotation.write.style.ContentRowHeight; import cn.idev.excel.annotation.write.style.HeadRowHeight; @@ -35,7 +34,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; /** * 铁路车站主数据 Excel @@ -74,6 +72,9 @@ public class RailwayStationExcel implements Serializable { @ExcelProperty("所属城市") private String cityName; + @ExcelProperty("所属区县") + private String districtName; + @ExcelProperty("行政区划") private String regionName; @@ -81,12 +82,10 @@ public class RailwayStationExcel implements Serializable { private String detailAddress; @ExcelProperty("经度") - @NumberFormat("0.000000") - private BigDecimal longitude; + private String longitude; @ExcelProperty("纬度") - @NumberFormat("0.000000") - private BigDecimal latitude; + private String latitude; @ExcelProperty("数据来源") private String dataSource; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml index 19aa11b..f5e14e9 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AirportMasterMapper.xml @@ -21,7 +21,9 @@ - + + + @@ -50,7 +52,8 @@ am.province_name, am.city_code, am.city_name, - am.region_code, + am.district_code, + am.district_name, am.region_name, am.detail_address, am.longitude, @@ -77,7 +80,14 @@ AND am.icao_code = #{airportMaster.icaoCode} - AND am.region_code = #{airportMaster.regionCode} + AND am.district_code = #{airportMaster.regionCode} + + + AND am.district_code = #{airportMaster.districtCode} + + + + AND am.district_name LIKE #{districtNameLike} @@ -100,7 +110,7 @@ AND am.status = #{airportMaster.status} - ORDER BY am.update_time DESC, am.create_time DESC + ORDER BY am.create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CurrencyMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CurrencyMapper.xml index 7033b69..75519de 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CurrencyMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CurrencyMapper.xml @@ -91,7 +91,7 @@ AND bc.update_time <= #{currency.updateTimeEnd} - ORDER BY bc.code ASC, bc.effective_date DESC, bc.create_time DESC + ORDER BY bc.create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CustomerTypeMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CustomerTypeMapper.xml index 3a5f8be..aa185e4 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CustomerTypeMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/CustomerTypeMapper.xml @@ -33,7 +33,7 @@ AND status = #{customerType.status} - ORDER BY update_time DESC, create_time DESC + ORDER BY create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FeeItemMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FeeItemMapper.xml index a54ff31..60cdb64 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FeeItemMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FeeItemMapper.xml @@ -11,6 +11,7 @@ + @@ -22,6 +23,9 @@ blade_fee_item WHERE is_deleted = 0 + + AND fee_category = #{feeItem.feeCategory} + AND name LIKE #{nameLike} @@ -33,7 +37,7 @@ AND status = #{feeItem.status} - ORDER BY update_time DESC, create_time DESC + ORDER BY create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml index 4d9fa32..f81e280 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PortTerminalMapper.xml @@ -20,7 +20,9 @@ - + + + @@ -47,7 +49,8 @@ pt.parent_name, pt.country, pt.city, - pt.region_code, + pt.district_code, + pt.district_name, pt.detail_address, CASE WHEN pt.longitude BETWEEN -180 AND 180 THEN pt.longitude ELSE NULL END AS longitude, CASE WHEN pt.latitude BETWEEN -90 AND 90 THEN pt.latitude ELSE NULL END AS latitude, @@ -82,8 +85,15 @@ AND pt.city = #{portTerminal.city} + + AND pt.district_code = #{portTerminal.districtCode} + + + + AND pt.district_name LIKE #{districtNameLike} + - AND pt.region_code = #{portTerminal.regionCode} + AND pt.district_code = #{portTerminal.regionCode} @@ -95,7 +105,7 @@ AND pt.status = #{portTerminal.status} - ORDER BY pt.update_time DESC, pt.create_time DESC + ORDER BY pt.create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml index 458cfbb..de4f7f1 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RailwayStationMapper.xml @@ -21,7 +21,9 @@ - + + + @@ -50,7 +52,8 @@ rs.province_name, rs.city_code, rs.city_name, - rs.region_code, + rs.district_code, + rs.district_name, rs.region_name, rs.detail_address, rs.longitude, @@ -82,7 +85,14 @@ AND rs.telegraph_code = #{railwayStation.telegraphCode} - AND rs.region_code = #{railwayStation.regionCode} + AND rs.district_code = #{railwayStation.regionCode} + + + AND rs.district_code = #{railwayStation.districtCode} + + + + AND rs.district_name LIKE #{districtNameLike} @@ -111,7 +121,7 @@ AND rs.status = #{railwayStation.status} - ORDER BY rs.update_time DESC, rs.create_time DESC + ORDER BY rs.create_time DESC diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml index f70b9e2..e0694e6 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml @@ -72,6 +72,7 @@ and region.name like concat(concat('%', #{param2.name}),'%') + ORDER BY region.sort ASC, region.code ASC diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OilElectricRecordMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OilElectricRecordMapper.xml index 8d1fcdb..0deb9eb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OilElectricRecordMapper.xml +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OilElectricRecordMapper.xml @@ -90,7 +90,7 @@ AND create_time <= #{oilElectricRecord.createTimeEnd} - ORDER BY transaction_time DESC, create_time DESC + ORDER BY create_time DESC diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OtherExpenseRecordMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OtherExpenseRecordMapper.xml index b5c738f..80d5d3a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OtherExpenseRecordMapper.xml +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OtherExpenseRecordMapper.xml @@ -70,7 +70,7 @@ AND create_time <= #{otherExpenseRecord.createTimeEnd} - ORDER BY expense_date DESC, create_time DESC + ORDER BY create_time DESC diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java index a8a7348..b2a72f2 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -96,7 +97,8 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl exportMaintenanceRecord(Wrapper queryWrapper) { return list(queryWrapper).stream().map(maintenanceRecord -> { MaintenanceRecordExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(maintenanceRecord, MaintenanceRecordExcel.class)); - excel.setMileage(nonNegative(maintenanceRecord.getMileage())); + excel.setCost(scaleAmount(maintenanceRecord.getCost())); + excel.setMileage(scaleAmount(nonNegative(maintenanceRecord.getMileage()))); if (Func.isEmpty(excel.getMileageUnit())) { excel.setMileageUnit(defaultMileageUnit(maintenanceRecord.getVehicleType())); } @@ -167,6 +169,10 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl