b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、调整基础配置模块

Browse Source 
2、调整车船务模块
This commit is contained in:
b2894lxlx
2026-07-24 14:33:50 +08:00
parent af8c9ac2e6
commit fd98744b46
52 changed files with 451 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExcel.java
View File

@@ -27,6 +27,7 @@ package org.springblade.transport.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;
@@ -72,9 +73,11 @@ public class AccidentRecordExcel implements Serializable {
private String accidentResponsibility;
@ExcelProperty("直接经济损失")
@NumberFormat("0.00")
private BigDecimal directEconomicLoss;
@ExcelProperty("保险理赔金额")
@NumberFormat("0.00")
private BigDecimal insuranceClaimAmount;
@ExcelProperty("事故原因及损坏情况")

2
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExcel.java
View File

@@ -27,6 +27,7 @@ package org.springblade.transport.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;
@@ -75,6 +76,7 @@ public class MaintenancePlanExcel implements Serializable {
private String maintenanceItem;
@ExcelProperty("费用")
@NumberFormat("0.00")
private BigDecimal cost;
@ExcelProperty("店名")

3
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java
View File

@@ -27,6 +27,7 @@ package org.springblade.transport.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;
@@ -72,6 +73,7 @@ public class MaintenanceRecordExcel implements Serializable {
private String replacedPart;
@ExcelProperty("费用")
@NumberFormat("0.00")
private BigDecimal cost;
@ExcelProperty("维修单位")
@@ -87,6 +89,7 @@ public class MaintenanceRecordExcel implements Serializable {
private LocalDateTime factoryTime;
@ExcelProperty("里程/航程数")
@NumberFormat("0.00")
private BigDecimal mileage;
@ExcelProperty("里程单位")

5
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExcel.java
View File

@@ -27,6 +27,7 @@ package org.springblade.transport.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;
@@ -59,15 +60,19 @@ public class MileageRecordExcel implements Serializable {
private String vehicleNo;
@ExcelProperty("上月统计里程")
@NumberFormat("0.00")
private BigDecimal previousMonthMileage;
@ExcelProperty("本月统计里程")
@NumberFormat("0.00")
private BigDecimal currentMonthMileage;
@ExcelProperty("本月行驶里程")
@NumberFormat("0.00")
private BigDecimal monthlyMileage;
@ExcelProperty("累计行驶里程")
@NumberFormat("0.00")
private BigDecimal totalMileage;
@ExcelProperty("里程单位")

2
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExcel.java
View File

@@ -27,6 +27,7 @@ package org.springblade.transport.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;
@@ -69,6 +70,7 @@ public class TireReplacementRecordExcel implements Serializable {
private Integer tireQuantity;
@ExcelProperty("换胎费用")
@NumberFormat("0.00")
private BigDecimal replacementCost;
@ExcelProperty("换胎说明")

2
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/EtcRecordMapper.xml
View File

@@ -60,7 +60,7 @@
<bind name="etcCardNoLike" value="'%' + etcRecord.etcCardNo + '%'"/>
AND etc_card_no LIKE #{etcCardNoLike}
</if>
ORDER BY exit_time DESC, create_time DESC
ORDER BY create_time DESC
</select>
</mapper>

2
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OilElectricRecordMapper.xml
View File

@@ -90,7 +90,7 @@
<if test="oilElectricRecord.createTimeEnd != null and oilElectricRecord.createTimeEnd != ''">
AND create_time &lt;= #{oilElectricRecord.createTimeEnd}
</if>
ORDER BY transaction_time DESC, create_time DESC
ORDER BY create_time DESC
</select>
</mapper>

2
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/OtherExpenseRecordMapper.xml
View File

@@ -70,7 +70,7 @@
<if test="otherExpenseRecord.createTimeEnd != null and otherExpenseRecord.createTimeEnd != ''">
AND create_time &lt;= #{otherExpenseRecord.createTimeEnd}
</if>
ORDER BY expense_date DESC, create_time DESC
ORDER BY create_time DESC
</select>
</mapper>

8
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java
View File

@@ -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<MaintenanceRec
public List<MaintenanceRecordExcel> exportMaintenanceRecord(Wrapper<MaintenanceRecord> 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<MaintenanceRec
return BigDecimal.ZERO;
}
private BigDecimal scaleAmount(BigDecimal value) {
return Func.isEmpty(value) ? null : value.setScale(2, RoundingMode.HALF_UP);
}
private String defaultMileageUnit(String vehicleType) {
return "船舶".equals(vehicleType) ? "海里" : "公里";
}