diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/AirportMasterVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/AirportMasterVO.java index 28c7da60..f445c719 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/AirportMasterVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/AirportMasterVO.java @@ -52,6 +52,13 @@ public class AirportMasterVO extends AirportMaster { @Schema(description = "导入错误信息") private String errorMessage; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/FeeItemVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/FeeItemVO.java index b45d4580..7b77ee32 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/FeeItemVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/FeeItemVO.java @@ -49,6 +49,10 @@ public class FeeItemVO extends FeeItem { @Schema(description = "组织") private String createDeptName; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人") private String updateUserName; diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/PortTerminalVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/PortTerminalVO.java index 78474b07..b08a4c8a 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/PortTerminalVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/PortTerminalVO.java @@ -52,6 +52,13 @@ public class PortTerminalVO extends PortTerminal { @Schema(description = "导入错误信息") private String errorMessage; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RailwayStationVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RailwayStationVO.java index c28a15fc..17a50ba7 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RailwayStationVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RailwayStationVO.java @@ -52,6 +52,13 @@ public class RailwayStationVO extends RailwayStation { @Schema(description = "导入错误信息") private String errorMessage; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AccidentRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AccidentRecordVO.java index e06dc084..427bf362 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AccidentRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AccidentRecordVO.java @@ -80,6 +80,13 @@ public class AccidentRecordVO extends AccidentRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AnnualInspectionRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AnnualInspectionRecordVO.java index b76896a3..24606c29 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AnnualInspectionRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AnnualInspectionRecordVO.java @@ -68,6 +68,10 @@ public class AnnualInspectionRecordVO extends AnnualInspectionRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java index 802ed9ed..5e924aec 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java @@ -58,6 +58,10 @@ public class CustomerArchiveVO extends CustomerArchive { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "联系人") private List contacts = new ArrayList<>(); diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java index 856575c6..5b22c7ac 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java @@ -69,4 +69,8 @@ public class DriverVO extends Driver { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate warningDate; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + } diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java index 6df81ad4..72def95e 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java @@ -25,5 +25,8 @@ public class EquipmentLedgerVO extends EquipmentLedger { @Serial private static final long serialVersionUID = 1L; @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) private String updateUserName; } diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EtcRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EtcRecordVO.java index cef2656d..9c636dcd 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EtcRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EtcRecordVO.java @@ -26,6 +26,10 @@ public class EtcRecordVO extends EtcRecord { @Serial private static final long serialVersionUID = 1L; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InsuranceRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InsuranceRecordVO.java index 3af9b3b0..0aeeb030 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InsuranceRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InsuranceRecordVO.java @@ -63,6 +63,13 @@ public class InsuranceRecordVO extends InsuranceRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenancePlanVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenancePlanVO.java index bb4d225d..35306e67 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenancePlanVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenancePlanVO.java @@ -62,6 +62,13 @@ public class MaintenancePlanVO extends MaintenancePlan { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java index 260f0946..bfacf9f3 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java @@ -62,6 +62,13 @@ public class MaintenanceRecordVO extends MaintenanceRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MileageRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MileageRecordVO.java index 4c39754a..963e809c 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MileageRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MileageRecordVO.java @@ -66,6 +66,10 @@ public class MileageRecordVO extends MileageRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OilElectricRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OilElectricRecordVO.java index 94b35024..d3a08860 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OilElectricRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OilElectricRecordVO.java @@ -76,6 +76,10 @@ public class OilElectricRecordVO extends OilElectricRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OtherExpenseRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OtherExpenseRecordVO.java index 0c6db1e5..1639fa43 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OtherExpenseRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/OtherExpenseRecordVO.java @@ -49,6 +49,10 @@ public class OtherExpenseRecordVO extends OtherExpenseRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TireReplacementRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TireReplacementRecordVO.java index f9140956..eaf4b1c4 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TireReplacementRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TireReplacementRecordVO.java @@ -63,6 +63,13 @@ public class TireReplacementRecordVO extends TireReplacementRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportChangeRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportChangeRecordVO.java index 2ae66b51..60f904b6 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportChangeRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportChangeRecordVO.java @@ -57,6 +57,10 @@ public class TransportChangeRecordVO extends TransportChangeRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + @TableField(exist = false) @Schema(description = "更新人姓名") private String updateUserName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportShipVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportShipVO.java index 76fb12af..27e06308 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportShipVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportShipVO.java @@ -62,4 +62,8 @@ public class TransportShipVO extends TransportShip { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate warningDate; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + } diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java index 7536d193..bd4ab362 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java @@ -76,4 +76,8 @@ public class TransportVehicleVO extends TransportVehicle { @Schema(description = "绑定司机") private String boundDriver; + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + } diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ViolationRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ViolationRecordVO.java index 98b7569c..0e462908 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ViolationRecordVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ViolationRecordVO.java @@ -63,6 +63,13 @@ public class ViolationRecordVO extends ViolationRecord { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + /** + * 创建人姓名 + */ + @TableField(exist = false) + @Schema(description = "创建人姓名") + private String createUserName; + /** * 更新人姓名 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExportExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExportExcel.java index e237be36..d2918d23 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExportExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/AirportMasterExportExcel.java @@ -102,6 +102,9 @@ public class AirportMasterExportExcel implements Serializable { @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新人") private String updateUserName; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/FeeItemExportExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/FeeItemExportExcel.java index aedffeb5..593992ad 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/FeeItemExportExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/FeeItemExportExcel.java @@ -50,6 +50,9 @@ public class FeeItemExportExcel implements Serializable { @ExcelProperty("组织") private String createDeptName; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新人") private String updateUserName; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java index b1c6471b..5454526d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/PortTerminalExportExcel.java @@ -80,6 +80,9 @@ public class PortTerminalExportExcel implements Serializable { @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新人") private String updateUserName; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExportExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExportExcel.java index b745a80c..ddaf8230 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExportExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RailwayStationExportExcel.java @@ -92,6 +92,9 @@ public class RailwayStationExportExcel implements Serializable { @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新人") private String updateUserName; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java index ac098b40..77679157 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AirportMasterServiceImpl.java @@ -323,6 +323,7 @@ public class AirportMasterServiceImpl extends BaseServiceImpl excel.setCreateDeptName( Func.isEmpty(feeItem.getCreateDept()) ? "" : SysCache.getDeptName(feeItem.getCreateDept()) ); + excel.setCreateUserName(UserCache.getUserRealName(feeItem.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(feeItem.getUpdateUser())); excel.setStatusName(Objects.equals(feeItem.getStatus(), STATUS_ENABLED) ? "启用" : "停用"); return excel; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java index 740890dc..8e96be1d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java @@ -357,6 +357,7 @@ public class PortTerminalServiceImpl extends BaseServiceImpl { feeItemVO.setCreateDeptName( Func.isEmpty(feeItem.getCreateDept()) ? "" : SysCache.getDeptName(feeItem.getCreateDept()) ); + feeItemVO.setCreateUserName(UserCache.getUserRealName(feeItem.getCreateUser())); feeItemVO.setUpdateUserName(UserCache.getUserRealName(feeItem.getUpdateUser())); return feeItemVO; } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PortTerminalWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PortTerminalWrapper.java index af2f698c..a37ec11e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PortTerminalWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PortTerminalWrapper.java @@ -48,6 +48,7 @@ public class PortTerminalWrapper extends BaseEntityWrapper queryWrapper = Wrappers.lambdaQuery() .eq(CustomerArchive::getIsDeleted, 0) .orderByDesc(CustomerArchive::getCreateTime); - if (!AuthUtil.isAdministrator()) { + if (!TransportBusinessSupport.isAdministrator()) { Long userId = AuthUtil.getUserId(); queryWrapper.and(wrapper -> wrapper .exists("SELECT 1 FROM blade_user_customer_scope bucs WHERE bucs.user_id = " + userId diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java index 40d22aba..779e7821 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java @@ -81,6 +81,9 @@ public class AccidentRecordExportExcel implements Serializable { @ExcelProperty("事故原因及损坏情况") private String accidentReasonDamage; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java index 3b9a297a..36bf3ffa 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java @@ -81,6 +81,9 @@ public class AnnualInspectionRecordExportExcel implements Serializable { @ExcelProperty("评定(复核)单位") private String assessmentUnit; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java index 09d16966..a80893e3 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java @@ -88,6 +88,9 @@ public class CommonAddressExportExcel implements Serializable { @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java index 8c99ad77..23ea39ef 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java @@ -93,6 +93,9 @@ public class CommonCargoExportExcel implements Serializable { @ExcelProperty("组织") private String deptName; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("更新时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java index bd9c4709..6632ef44 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java @@ -93,6 +93,9 @@ public class CustomerArchiveExcel implements Serializable { @ExcelProperty("法人/负责人") private String legalPerson; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/DriverExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/DriverExcel.java index e69a82a8..996a85a6 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/DriverExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/DriverExcel.java @@ -35,6 +35,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; +import java.util.Date; /** * 司机管理 Excel @@ -128,4 +129,10 @@ public class DriverExcel implements Serializable { @ExcelProperty("所属组织 *") private String organizationName; + @ExcelProperty("创建人") + private String createUserName; + + @ExcelProperty("创建时间") + private Date createTime; + } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EquipmentLedgerExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EquipmentLedgerExcel.java index f8499608..cdb7df63 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EquipmentLedgerExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EquipmentLedgerExcel.java @@ -7,10 +7,12 @@ package org.springblade.transport.excel; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.format.DateTimeFormat; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Date; /** * 设备台账 Excel @@ -29,5 +31,7 @@ public class EquipmentLedgerExcel implements Serializable { @ExcelProperty("规格型号") private String specificationModel; @ExcelProperty(value = "出厂日期", converter = org.springblade.common.excel.LenientDateStringConverter.class) private String factoryDate; @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; @ExcelIgnore private String errorMessage; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java index 1400ed00..96a064a0 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java @@ -49,6 +49,9 @@ public class EtcRecordExportExcel implements Serializable { @ExcelProperty("出口站") private String exitStation; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java index ad1f0e7a..d8461d4a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java @@ -81,6 +81,9 @@ public class InsuranceRecordExportExcel implements Serializable { @ExcelProperty("开票日期") private LocalDate invoiceDate; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java index f50c2079..7b435f94 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java @@ -54,6 +54,8 @@ public class LoadingManageExcel implements Serializable { private String transportType; @ExcelProperty("数据来源") private String dataSource; + @ExcelProperty("创建人") + private String createUserName; @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java index a3c8a84e..10128b08 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java @@ -24,14 +24,17 @@ public class MaintenancePlanExportExcel extends MaintenancePlanExcel { @Serial private static final long serialVersionUID = 1L; - @ExcelProperty(value = "创建时间", index = 12) + @ExcelProperty(value = "创建人", index = 12) + private String createUserName; + + @ExcelProperty(value = "创建时间", index = 13) @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; - @ExcelProperty(value = "更新人", index = 13) + @ExcelProperty(value = "更新人", index = 14) private String updateUserName; - @ExcelProperty(value = "更新时间", index = 14) + @ExcelProperty(value = "更新时间", index = 15) @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date updateTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java index db5f3e9d..b2fdde6b 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java @@ -96,6 +96,9 @@ public class MaintenanceRecordExcel implements Serializable { @NumberFormat("0.00") private BigDecimal mileage; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MasterOrderWaybillExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MasterOrderWaybillExcel.java index 362e3390..282e8953 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MasterOrderWaybillExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MasterOrderWaybillExcel.java @@ -69,6 +69,8 @@ public class MasterOrderWaybillExcel { private String businessStatus; @ExcelProperty("备注") private String remark; + @ExcelProperty("创建人") + private String createUserName; @ExcelProperty("更新时间") private Date updateTime; @ExcelProperty("创建时间") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java index 5ad5f4ab..cb3e6999 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java @@ -70,6 +70,9 @@ public class MileageRecordExportExcel implements Serializable { @NumberFormat("0.00") private BigDecimal totalMileage; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java index 3db72793..d2bcccd9 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java @@ -60,6 +60,9 @@ public class OilElectricRecordExportExcel implements Serializable { @ExcelProperty("站点") private String station; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java index 1dfe171a..72daa532 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java @@ -41,6 +41,9 @@ public class OtherExpenseRecordExportExcel implements Serializable { @ExcelProperty("金额") private BigDecimal amount; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java index 26009e8c..2a8b25f7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java @@ -74,6 +74,9 @@ public class TireReplacementRecordExportExcel implements Serializable { @ExcelProperty("换胎说明") private String replacementDescription; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java index f737cd26..23bfefb7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java @@ -55,6 +55,9 @@ public class TransportChangeRecordExportExcel implements Serializable { @ExcelProperty("变更内容") private String changeContent; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportShipExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportShipExcel.java index 2dc65699..337c1bb3 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportShipExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportShipExcel.java @@ -36,6 +36,7 @@ import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.Date; /** * 船舶管理 Excel @@ -144,4 +145,10 @@ public class TransportShipExcel implements Serializable { @ExcelProperty("船舶经营人") private String shipOperator; + @ExcelProperty("创建人") + private String createUserName; + + @ExcelProperty("创建时间") + private Date createTime; + } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportVehicleExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportVehicleExcel.java index ac5c02dc..09ac2252 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportVehicleExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportVehicleExcel.java @@ -35,6 +35,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; +import java.util.Date; /** * 车辆管理 Excel @@ -83,4 +84,10 @@ public class TransportVehicleExcel implements Serializable { @ExcelProperty("年审有效期") private LocalDate annualReviewEndDate; + @ExcelProperty("创建人") + private String createUserName; + + @ExcelProperty("创建时间") + private Date createTime; + } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java index 7b95877e..2e96ecac 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java @@ -94,6 +94,9 @@ public class ViolationRecordExcel implements Serializable { @ExcelProperty("处理结果") private String processResult; + @ExcelProperty("创建人") + private String createUserName; + @ExcelProperty("创建时间") @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java index 97ed929e..81155e0b 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java @@ -74,6 +74,7 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl { record.setDirectEconomicLoss(normalizeEmptyAmount(record.getDirectEconomicLoss())); record.setInsuranceClaimAmount(normalizeEmptyAmount(record.getInsuranceClaimAmount())); + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); }); return page.setRecords(records); @@ -161,6 +162,7 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl records = baseMapper.selectAnnualInspectionRecordPage(page, annualInspectionRecord); records.forEach(record -> { record.setFee(normalizeEmptyAmount(record.getFee())); + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); }); return page.setRecords(records); @@ -182,6 +183,7 @@ public class AnnualInspectionRecordServiceImpl extends BaseServiceImpl { CommonAddressExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressExportExcel.class)); excel.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode()); + excel.setCreateUserName(UserCache.getUserRealName(address.getCreateUser())); return excel; }).toList(); } @@ -296,14 +297,14 @@ public class CommonAddressServiceImpl extends BaseServiceImpl buildQuery(ContractManageVO contractManage) { TransportBusinessSupport.validateAllDept(contractManage.getAllDept(), "合同管理"); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(ContractManage::getIsDeleted, 0); - if (AuthUtil.isAdministrator()) { + if (TransportBusinessSupport.isAdministrator()) { if (Objects.equals(contractManage.getAllDept(), 1) && Func.isNotEmpty(contractManage.getOrganizationId())) { queryWrapper.eq(ContractManage::getOrganizationId, contractManage.getOrganizationId()); } @@ -1092,7 +1092,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl selectCustomerArchivePage(IPage page, CustomerArchiveVO customer) { List records = baseMapper.selectCustomerArchivePage(page, customer, currentScopeUserId()); + records.forEach(record -> record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()))); fillFundUseRisk(records); return page.setRecords(records); } @@ -1199,6 +1202,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl imp @Override public IPage selectDriverPage(IPage page, DriverVO driver) { prepareQuery(driver); - return page.setRecords(baseMapper.selectDriverPage(page, driver)); + List records = baseMapper.selectDriverPage(page, driver); + records.forEach(record -> record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()))); + return page.setRecords(records); } @Override @@ -133,6 +136,8 @@ public class DriverServiceImpl extends BaseServiceImpl imp public List exportDriver(Wrapper queryWrapper) { return list(queryWrapper).stream().map(driver -> { DriverExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(driver, DriverExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(driver.getCreateUser())); + excel.setCreateTime(driver.getCreateTime()); excel.setAddress((driver.getAddressRegion() == null ? "" : driver.getAddressRegion()) + (driver.getAddress() == null ? "" : driver.getAddress())); return excel; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EquipmentLedgerServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EquipmentLedgerServiceImpl.java index 5fdb8559..cf601dc8 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EquipmentLedgerServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EquipmentLedgerServiceImpl.java @@ -59,7 +59,10 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl selectEquipmentLedgerPage(IPage page, EquipmentLedgerVO equipmentLedger) { List records = baseMapper.selectEquipmentLedgerPage(page, equipmentLedger); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -207,7 +210,12 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl exportEquipmentLedger(Wrapper queryWrapper) { return list(queryWrapper).stream() - .map(item -> Objects.requireNonNull(BeanUtil.copyProperties(item, EquipmentLedgerExcel.class))) + .map(item -> { + EquipmentLedgerExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(item, EquipmentLedgerExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(item.getCreateUser())); + excel.setCreateTime(item.getCreateTime()); + return excel; + }) .toList(); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EtcRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EtcRecordServiceImpl.java index 3e804f85..7da83099 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EtcRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EtcRecordServiceImpl.java @@ -45,7 +45,10 @@ public class EtcRecordServiceImpl extends BaseServiceImpl selectEtcRecordPage(IPage page, EtcRecordVO etcRecord) { List records = baseMapper.selectEtcRecordPage(page, etcRecord); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -124,6 +127,7 @@ public class EtcRecordServiceImpl extends BaseServiceImpl { EtcRecordExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(etcRecord, EtcRecordExportExcel.class)); excel.setTransactionAmount(nonNegative(etcRecord.getTransactionAmount())); + excel.setCreateUserName(UserCache.getUserRealName(etcRecord.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(etcRecord.getUpdateUser())); return excel; }).toList(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InsuranceRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InsuranceRecordServiceImpl.java index 239dbb41..62bca461 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InsuranceRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InsuranceRecordServiceImpl.java @@ -97,6 +97,7 @@ public class InsuranceRecordServiceImpl extends BaseServiceImpl { record.setInsuredAmount(normalizeEmptyAmount(record.getInsuredAmount())); record.setPremium(normalizeEmptyAmount(record.getPremium())); + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); }); return page.setRecords(records); @@ -198,6 +199,7 @@ public class InsuranceRecordServiceImpl extends BaseServiceImpl { record.setMileage(normalizeEmptyMileage(record.getMileage())); record.setNextMaintenanceMileage(normalizeEmptyMileage(record.getNextMaintenanceMileage())); + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); }); return page.setRecords(records); @@ -152,6 +153,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl exportMaintenancePlan(Wrapper queryWrapper) { return list(queryWrapper).stream().map(maintenancePlan -> { MaintenancePlanExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(maintenancePlan, MaintenancePlanExportExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(maintenancePlan.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(maintenancePlan.getUpdateUser())); excel.setMileage(normalizeEmptyMileage(maintenancePlan.getMileage())); excel.setNextMaintenanceMileage(normalizeEmptyMileage(maintenancePlan.getNextMaintenanceMileage())); 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 8e931e2f..b49f2563 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 @@ -66,7 +66,10 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl selectMaintenanceRecordPage(IPage page, MaintenanceRecordVO maintenanceRecord) { List records = baseMapper.selectMaintenanceRecordPage(page, maintenanceRecord); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -144,6 +147,7 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl selectOtherExpenseRecordPage(IPage page, OtherExpenseRecordVO otherExpenseRecord) { List records = baseMapper.selectOtherExpenseRecordPage(page, otherExpenseRecord); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -130,6 +133,7 @@ public class OtherExpenseRecordServiceImpl extends BaseServiceImpl { OtherExpenseRecordExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(otherExpenseRecord, OtherExpenseRecordExportExcel.class)); excel.setAmount(nonNegative(otherExpenseRecord.getAmount())); + excel.setCreateUserName(UserCache.getUserRealName(otherExpenseRecord.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(otherExpenseRecord.getUpdateUser())); return excel; }).toList(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java index 2192e180..01dbd443 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java @@ -337,7 +337,7 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl buildQuery(ProjectApplyVO projectApply) { TransportBusinessSupport.validateAllDept(projectApply.getAllDept(), "项目立项"); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(ProjectApply::getIsDeleted, 0); - if (AuthUtil.isAdministrator()) { + if (TransportBusinessSupport.isAdministrator()) { // 超管默认可查看全部未删除数据；仅在明确指定承办组织时按组织精确筛选。 if (Objects.equals(projectApply.getAllDept(), 1) && Func.isNotEmpty(projectApply.getUndertakeDeptId())) { queryWrapper.eq(ProjectApply::getUndertakeDeptId, projectApply.getUndertakeDeptId()); @@ -951,7 +951,7 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl buildQuery(TemporaryCreditLimitVO temporaryCreditLimit) { TransportBusinessSupport.validateAllDept(temporaryCreditLimit.getAllDept(), "临时额度管理"); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(TemporaryCreditLimit::getIsDeleted, 0); - if (AuthUtil.isAdministrator()) { + if (TransportBusinessSupport.isAdministrator()) { if (Objects.equals(temporaryCreditLimit.getAllDept(), 1) && Func.isNotEmpty(temporaryCreditLimit.getApplyDeptId())) { queryWrapper.eq(TemporaryCreditLimit::getApplyDeptId, temporaryCreditLimit.getApplyDeptId()); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TireReplacementRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TireReplacementRecordServiceImpl.java index 4ff31c91..a359c9f5 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TireReplacementRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TireReplacementRecordServiceImpl.java @@ -72,6 +72,7 @@ public class TireReplacementRecordServiceImpl extends BaseServiceImpl { record.setTireQuantity(normalizeEmptyInteger(record.getTireQuantity())); record.setReplacementCost(normalizeEmptyAmount(record.getReplacementCost())); + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); }); return page.setRecords(records); @@ -162,6 +163,7 @@ public class TireReplacementRecordServiceImpl extends BaseServiceImpl selectTransportChangeRecordPage(IPage page, TransportChangeRecordVO transportChangeRecord) { List records = baseMapper.selectTransportChangeRecordPage(page, transportChangeRecord); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -135,6 +138,7 @@ public class TransportChangeRecordServiceImpl extends BaseServiceImpl { TransportChangeRecordExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(transportChangeRecord, TransportChangeRecordExportExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(transportChangeRecord.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(transportChangeRecord.getUpdateUser())); return excel; }) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportShipServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportShipServiceImpl.java index 06d4f09e..dba18bd6 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportShipServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportShipServiceImpl.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.cache.UserCache; import org.springblade.core.tool.utils.Func; import org.springblade.transport.excel.TransportShipExcel; import org.springblade.transport.mapper.TransportShipMapper; @@ -66,7 +67,9 @@ public class TransportShipServiceImpl extends BaseServiceImpl selectTransportShipPage(IPage page, TransportShipVO ship) { prepareQuery(ship); - return page.setRecords(baseMapper.selectTransportShipPage(page, ship)); + List records = baseMapper.selectTransportShipPage(page, ship); + records.forEach(record -> record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()))); + return page.setRecords(records); } @Override @@ -111,6 +114,8 @@ public class TransportShipServiceImpl extends BaseServiceImpl exportTransportShip(Wrapper queryWrapper) { return list(queryWrapper).stream().map(ship -> { TransportShipExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(ship, TransportShipExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(ship.getCreateUser())); + excel.setCreateTime(ship.getCreateTime()); excel.setConstructionDateRange(formatDateRange( ship.getKeelLayingDate(), ship.getBuildCompletionDate() )); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java index 32462dc5..fdad3a66 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java @@ -32,6 +32,7 @@ import lombok.RequiredArgsConstructor; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.cache.UserCache; import org.springblade.core.tool.utils.Func; import org.springblade.transport.excel.TransportVehicleExcel; import org.springblade.transport.mapper.DriverMapper; @@ -81,6 +82,7 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl selectTransportVehiclePage(IPage page, TransportVehicleVO vehicle) { prepareQuery(vehicle); List records = baseMapper.selectTransportVehiclePage(page, vehicle); + records.forEach(record -> record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()))); fillBoundDrivers(records); return page.setRecords(records); } @@ -188,6 +190,8 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl exportTransportVehicle(Wrapper queryWrapper) { return list(queryWrapper).stream().map(vehicle -> { TransportVehicleExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(vehicle, TransportVehicleExcel.class)); + excel.setCreateUserName(UserCache.getUserRealName(vehicle.getCreateUser())); + excel.setCreateTime(vehicle.getCreateTime()); excel.setStatusName(vehicle.getStatus() != null && vehicle.getStatus() == 2 ? "停用" : "启用"); return excel; }).toList(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java index 55d61b59..84dd1824 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java @@ -76,7 +76,10 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl selectViolationRecordPage(IPage page, ViolationRecordVO violationRecord) { List records = baseMapper.selectViolationRecordPage(page, violationRecord); - records.forEach(record -> record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()))); + records.forEach(record -> { + record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); + record.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); + }); return page.setRecords(records); } @@ -173,6 +176,7 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl> selectableWaybillBatches(IPage page, String batchNo, String createUser, Integer waybillCount, String createTimeStart, String createTimeEnd) { return voucherWaybillBatchMapper.selectVoucherWaybillBatchPage(page, AuthUtil.getTenantId(), batchNo, createUser, waybillCount, createTimeStart, createTimeEnd, - !AuthUtil.isAdministrator(), currentCarrierName()); + !TransportBusinessSupport.isAdministrator(), currentCarrierName()); } private List> selectableWaybillBatchesByIds(List ids) { if (Func.isEmpty(ids)) return List.of(); - return voucherWaybillBatchMapper.selectWaybillBatchesByIds(AuthUtil.getTenantId(), ids, !AuthUtil.isAdministrator(), currentCarrierName()); + return voucherWaybillBatchMapper.selectWaybillBatchesByIds(AuthUtil.getTenantId(), ids, !TransportBusinessSupport.isAdministrator(), currentCarrierName()); } /** * 普通用户只能关联承运商名称与其当前组织名称一致的运单批次；超级管理员不受此限制。 */ private String currentCarrierName() { - if (AuthUtil.isAdministrator()) return null; + if (TransportBusinessSupport.isAdministrator()) return null; Long currentDeptId = Func.firstLong(AuthUtil.getDeptId()); return getOrganizationName(currentDeptId); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java index dd71c500..f5b9b143 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java @@ -25,6 +25,7 @@ package org.springblade.transport.support; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.SysCache; import org.springblade.system.pojo.entity.Dept; @@ -57,6 +58,24 @@ public final class TransportBusinessSupport { private TransportBusinessSupport() { } + /** + * 是否超级管理员：当前用户任一角色别名等于 administrator 即为超级管理员。 + * + * @return true-超级管理员 + */ + public static boolean isAdministrator() { + String userRole = AuthUtil.getUserRole(); + if (Func.isBlank(userRole)) { + return false; + } + for (String roleAlias : Func.toStrArray(userRole)) { + if (RoleConstant.ADMINISTRATOR.equals(Func.toStr(roleAlias).trim())) { + return true; + } + } + return false; + } + public static Long currentDeptId(String moduleName) { Long deptId = Func.firstLong(AuthUtil.getDeptId()); if (Func.isEmpty(deptId) || deptId <= 0) { @@ -80,7 +99,7 @@ public final class TransportBusinessSupport { } public static void validateAllDept(Integer allDept, String moduleName) { - if (Objects.equals(allDept, 1) && !AuthUtil.isAdministrator()) { + if (Objects.equals(allDept, 1) && !isAdministrator()) { throw new ServiceException("无权查看全部组织" + moduleName); } } @@ -97,7 +116,7 @@ public final class TransportBusinessSupport { */ public static List resolveDeptFilterIds(Integer allDept, Long deptId, String moduleName) { validateAllDept(allDept, moduleName); - if (AuthUtil.isAdministrator()) { + if (isAdministrator()) { if (Objects.equals(allDept, 1) && Func.isNotEmpty(deptId) && deptId > 0) { return Collections.singletonList(deptId); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/AccidentRecordWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/AccidentRecordWrapper.java index e5386976..002d23fb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/AccidentRecordWrapper.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/AccidentRecordWrapper.java @@ -53,6 +53,7 @@ public class AccidentRecordWrapper extends BaseEntityWrapper { @Override public DriverVO entityVO(Driver driver) { - return Objects.requireNonNull(BeanUtil.copyProperties(driver, DriverVO.class)); + DriverVO vo = Objects.requireNonNull(BeanUtil.copyProperties(driver, DriverVO.class)); + vo.setCreateUserName(UserCache.getUserRealName(driver.getCreateUser())); + return vo; } } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/EtcRecordWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/EtcRecordWrapper.java index ba05721d..1492bcbb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/EtcRecordWrapper.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/EtcRecordWrapper.java @@ -28,6 +28,7 @@ public class EtcRecordWrapper extends BaseEntityWrapper @Override public EtcRecordVO entityVO(EtcRecord etcRecord) { EtcRecordVO etcRecordVO = Objects.requireNonNull(BeanUtil.copyProperties(etcRecord, EtcRecordVO.class)); + etcRecordVO.setCreateUserName(UserCache.getUserRealName(etcRecord.getCreateUser())); etcRecordVO.setUpdateUserName(UserCache.getUserRealName(etcRecord.getUpdateUser())); return etcRecordVO; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/InsuranceRecordWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/InsuranceRecordWrapper.java index b5033c9e..2e667dbd 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/InsuranceRecordWrapper.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/InsuranceRecordWrapper.java @@ -53,6 +53,7 @@ public class InsuranceRecordWrapper extends BaseEntityWrapper