From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java | 20
src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 58
src/main/java/com/ruoyi/ai/controller/SalesAiController.java | 15
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 46
src/main/java/com/ruoyi/account/controller/AccountFileController.java | 21
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 25
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 16
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 12
src/main/java/com/ruoyi/account/service/purchase/AccountPaymentApplicationService.java | 33
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 25
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 26
src/main/java/com/ruoyi/project/common/CaptchaController.java | 28
src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml | 3
src/main/java/com/ruoyi/account/controller/sales/AccountSalesInvoiceController.java | 72
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 21
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 26
src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java | 31
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 43
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | 14
src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java | 79
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java | 18
src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java | 31
src/main/java/com/ruoyi/account/controller/AccountStatementController.java | 71
src/main/java/com/ruoyi/project/system/controller/SysConfigController.java | 40
src/main/java/com/ruoyi/project/monitor/controller/ServerController.java | 15
src/main/java/com/ruoyi/account/controller/sales/AccountInvoiceApplicationController.java | 86
src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java | 8
src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java | 4
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 76
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 98
src/main/java/com/ruoyi/project/monitor/controller/CacheController.java | 37
src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java | 10
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 17
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 20
src/main/java/com/ruoyi/account/controller/AccountingController.java | 8
src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchaseInvoice.java | 168 +
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 27
src/main/java/com/ruoyi/projectManagement/controller/InfoController.java | 37
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 21
src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml | 47
src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPaymentApplicationDto.java | 34
src/main/java/com/ruoyi/account/bean/vo/sales/AccountInvoiceApplicationVo.java | 23
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 24
src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java | 23
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java | 14
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 16
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 26
src/main/java/com/ruoyi/project/system/controller/SysRoleController.java | 86
src/main/java/com/ruoyi/account/service/BorrowInfoService.java | 10
src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java | 17
src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java | 31
src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java | 10
src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java | 11
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java | 16
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 28
src/main/java/com/ruoyi/account/mapper/purchase/AccountPaymentApplicationMapper.java | 32
src/main/java/com/ruoyi/ai/controller/XiaozhiController.java | 23
src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java | 79
src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java | 4
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 34
src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java | 46
src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchaseInvoiceDto.java | 32
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 17
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 4
src/main/java/com/ruoyi/account/mapper/AccountStatementMapper.java | 25
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 19
src/main/resources/mapper/account/AccountStatementMapper.xml | 43
src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesCollectionDto.java | 34
src/main/java/com/ruoyi/account/mapper/sales/AccountSalesInvoiceMapper.java | 24
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 185
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 23
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java | 19
src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchasePayment.java | 127
src/main/java/com/ruoyi/account/service/sales/AccountInvoiceApplicationService.java | 33
src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java | 25
src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java | 29
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 20
src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java | 7
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 21
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 4
src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java | 8
src/main/java/com/ruoyi/CodeGenerator.java | 6
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 12
src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java | 4
src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java | 19
src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml | 73
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 27
src/main/java/com/ruoyi/account/pojo/AccountStatementDetails.java | 115
src/main/java/com/ruoyi/account/service/AccountStatementDetailsService.java | 16
src/main/java/com/ruoyi/account/service/AccountStatementService.java | 32
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java | 18
src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java | 8
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 15
src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesInvoiceDto.java | 33
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 24
src/main/java/com/ruoyi/account/service/impl/sales/AccountInvoiceApplicationServiceImpl.java | 97
src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java | 25
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 71
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 18
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 24
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 39
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 3
src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java | 6
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java | 16
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 27
src/main/java/com/ruoyi/framework/web/controller/BaseController.java | 36
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 10
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 71
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 43
src/main/java/com/ruoyi/basic/service/IProductModelService.java | 4
src/main/java/com/ruoyi/ai/service/PurchaseAiService.java | 92
src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java | 86
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 36
src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java | 23
src/main/resources/mapper/stock/StockInventoryMapper.xml | 6
src/main/java/com/ruoyi/account/controller/AccountIncomeController.java | 35
src/main/java/com/ruoyi/account/service/sales/AccountSalesCollectionService.java | 33
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 9
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java | 19
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 4
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 34
src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java | 50
src/main/java/com/ruoyi/account/service/impl/purchase/AccountPaymentApplicationServiceImpl.java | 96
src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesCollectionServiceImpl.java | 96
src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java | 6
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java | 9
src/main/java/com/ruoyi/account/mapper/sales/AccountSalesCollectionMapper.java | 32
src/main/java/com/ruoyi/account/service/impl/AccountStatementServiceImpl.java | 298 ++
src/main/java/com/ruoyi/account/service/sales/AccountSalesInvoiceService.java | 28
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java | 40
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java | 10
src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesInvoiceServiceImpl.java | 53
src/main/java/com/ruoyi/account/pojo/AccountStatement.java | 127
src/main/java/com/ruoyi/account/bean/dto/StatementAccountDto.java | 35
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 10
src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java | 58
src/main/java/com/ruoyi/purchase/service/IProductRecordService.java | 4
src/main/java/com/ruoyi/account/service/purchase/AccountPurchaseInvoiceService.java | 31
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 24
src/main/java/com/ruoyi/account/pojo/sales/AccountSalesCollection.java | 127
src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java | 8
src/main/java/com/ruoyi/account/mapper/AccountStatementDetailsMapper.java | 18
src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java | 10
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 8
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 27
src/main/java/com/ruoyi/basic/controller/ProductController.java | 32
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 36
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java | 34
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 46
src/main/java/com/ruoyi/project/system/controller/SysProfileController.java | 52
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 40
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 46
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java | 22
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 6
src/main/java/com/ruoyi/staff/controller/BankController.java | 21
src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java | 14
src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java | 8
src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java | 37
src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java | 141
src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java | 19
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | 8
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java | 19
src/main/resources/mapper/account/purchase/AccountPurchaseInvoiceMapper.xml | 86
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 31
src/main/java/com/ruoyi/sales/controller/CommonFileController.java | 9
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 21
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 25
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 16
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 23
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 33
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 16
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 23
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 3
src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchaseInvoiceMapper.java | 29
src/main/java/com/ruoyi/basic/service/ISupplierService.java | 4
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 46
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 17
src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchaseInvoiceVo.java | 19
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 1
src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchasePaymentServiceImpl.java | 79
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java | 20
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 4
src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchasePaymentDto.java | 34
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 14
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 61
src/main/java/com/ruoyi/project/system/controller/SysDeptController.java | 47
src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java | 18
src/main/java/com/ruoyi/staff/controller/StaffContractController.java | 9
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 37
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 125
src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java | 2
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 28
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 36
src/main/java/com/ruoyi/account/service/impl/AccountStatementDetailsServiceImpl.java | 20
src/main/java/com/ruoyi/account/service/purchase/AccountPurchasePaymentService.java | 30
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 37
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java | 26
src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java | 6
src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java | 16
src/main/java/com/ruoyi/account/pojo/sales/AccountInvoiceApplication.java | 138
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 20
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 45
src/main/resources/mapper/stock/StockInRecordMapper.xml | 5
src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java | 4
src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java | 25
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 20
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java | 16
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 26
src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java | 24
src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java | 14
src/main/java/com/ruoyi/home/controller/HomeController.java | 164
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 20
src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java | 8
src/main/java/com/ruoyi/account/mapper/sales/AccountInvoiceApplicationMapper.java | 32
src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java | 6
src/main/java/com/ruoyi/account/bean/vo/StatementAccountVo.java | 25
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 23
src/main/java/com/ruoyi/account/bean/dto/sales/AccountInvoiceApplicationDto.java | 34
src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchaseInvoiceServiceImpl.java | 59
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 40
src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java | 17
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 36
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 6
src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java | 77
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 13
src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java | 22
src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPaymentApplicationVo.java | 23
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 38
src/main/java/com/ruoyi/account/pojo/sales/AccountSalesInvoice.java | 168 +
src/main/java/com/ruoyi/account/controller/purchase/AccountPurchasePaymentController.java | 71
src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java | 4
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml | 47
src/main/java/com/ruoyi/account/controller/purchase/AccountPurchaseInvoiceController.java | 79
src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java | 15
src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 40
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 36
src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesInvoiceVo.java | 19
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 3
src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml | 89
src/main/java/com/ruoyi/staff/controller/AnalyticsController.java | 17
src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java | 11
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java | 11
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 10
src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java | 12
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java | 20
src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java | 25
246 files changed, 6,090 insertions(+), 2,412 deletions(-)
diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index 721245b..e9f7110 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -20,11 +20,11 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://localhost:3300/product-inventory-management-new-pro";
+ public static String database_url = "jdbc:mysql://localhost:3306/product-inventory-management-new-pro";
public static String database_username = "root";
- public static String database_password= "root";
+ public static String database_password= "123456";
public static String author = "鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃";
- public static String model = "sales"; // 妯″潡
+ public static String model = "account"; // 妯″潡
public static String setParent = "com.ruoyi."+ model; // 鍖呰矾寰�
public static String tablePrefix = ""; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
diff --git a/src/main/java/com/ruoyi/account/bean/dto/StatementAccountDto.java b/src/main/java/com/ruoyi/account/bean/dto/StatementAccountDto.java
new file mode 100644
index 0000000..52b6513
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/StatementAccountDto.java
@@ -0,0 +1,35 @@
+package com.ruoyi.account.bean.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "StatementAccountDto", description = "璐㈠姟绠＄悊--鐢熸垚瀵硅处鍗�(浼犲弬)")
+public class StatementAccountDto {
+
+ //涓氬姟绫诲瀷(1搴旀敹瀵硅处;2搴斾粯瀵硅处)
+ @Schema(name = "accountType", description = "涓氬姟绫诲瀷(1搴旀敹瀵硅处;2搴斾粯瀵硅处)")
+ private Integer accountType;
+
+ //閫夋嫨鐨勫鎴�(搴旀敹鏄鎴�,搴斾粯鏄緵搴斿晢supplierId)
+ @Schema(name = "customerId", description = "瀹㈡埛ID")
+ private Long customerId;
+
+ //瀵硅处鏈堜唤yyyy-MM
+ @Schema(name = "statementMonth", description = "瀵硅处鏈堜唤")
+ private String statementMonth;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPaymentApplicationDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPaymentApplicationDto.java
new file mode 100644
index 0000000..dfe0562
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPaymentApplicationDto.java
@@ -0,0 +1,34 @@
+package com.ruoyi.account.bean.dto.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountPaymentApplicationDto", description = "璐㈠姟绠＄悊--浠樻鐢宠鍙拌处(浼犲弬)")
+public class AccountPaymentApplicationDto {
+
+ @Schema(description = "渚涘簲鍟咺D")
+ private Integer supplierId;
+
+ @Schema(description = "鐢宠鍗曞彿")
+ private String invoiceApplicationNo;
+
+ @Schema(description = "瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃")
+ private Integer status;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchaseInvoiceDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchaseInvoiceDto.java
new file mode 100644
index 0000000..3a799eb
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchaseInvoiceDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.account.bean.dto.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountPurchaseInvoiceDto", description = "璐㈠姟绠＄悊--杩涢」鍙戠エ鍙拌处(浼犲弬)")
+public class AccountPurchaseInvoiceDto {
+
+ @Schema(description = "渚涘簲鍟咺D")
+ private Integer supplierId;
+
+ @Schema(description = "鍙戠エ鍙风爜")
+ private String invoiceNumber;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+ @Schema(description = "鐘舵��")
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchasePaymentDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchasePaymentDto.java
new file mode 100644
index 0000000..f01d241
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/AccountPurchasePaymentDto.java
@@ -0,0 +1,34 @@
+package com.ruoyi.account.bean.dto.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountPurchasePaymentDto", description = "璐㈠姟绠＄悊--浠樻鍗曞彴璐�(浼犲弬)")
+public class AccountPurchasePaymentDto {
+
+ @Schema(description = "渚涘簲鍟咺D")
+ private Integer supplierId;
+
+ @Schema(description = "浠樻鍗曞彿")
+ private String paymentNumber;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
index 9e0a027..cec0719 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "PurchaseInboundDto", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(浼犲弬)")
@@ -14,16 +14,18 @@
@Schema(description = "鍏ュ簱鍗曞彿")
private String inboundBatches;
+ private Long supplierId;
+
@Schema(description = "渚涘簲鍟�")
private String supplierName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private LocalDate endDate;
}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java
index f5adae5..eb6adec 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "PurchaseReturnDto", description = "璐㈠姟绠＄悊--閲囪喘閫�璐у彴璐�(浼犲弬)")
@@ -14,16 +14,18 @@
@Schema(description = "閫�璐у崟鍙�")
private String returnNo;
+ private Long supplierId;
+
@Schema(description = "渚涘簲鍟�")
private String supplierName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private LocalDate endDate;
}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/AccountInvoiceApplicationDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountInvoiceApplicationDto.java
new file mode 100644
index 0000000..d7917f3
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountInvoiceApplicationDto.java
@@ -0,0 +1,34 @@
+package com.ruoyi.account.bean.dto.sales;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountInvoiceApplicationDto", description = "璐㈠姟绠＄悊--寮�绁ㄧ敵璇峰彴璐�(浼犲弬)")
+public class AccountInvoiceApplicationDto {
+
+ @Schema(description = "瀹㈡埛ID")
+ private Integer customerId;
+
+ @Schema(description = "鐢宠鍗曞彿")
+ private String invoiceApplicationNo;
+
+ @Schema(description = "瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃")
+ private Integer status;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesCollectionDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesCollectionDto.java
new file mode 100644
index 0000000..ec3c042
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesCollectionDto.java
@@ -0,0 +1,34 @@
+package com.ruoyi.account.bean.dto.sales;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountSalesCollectionDto", description = "璐㈠姟绠＄悊--鏀舵鍗曞彴璐�(浼犲弬)")
+public class AccountSalesCollectionDto {
+
+ @Schema(description = "瀹㈡埛ID")
+ private Integer customerId;
+
+ @Schema(description = "鏀舵鍗曞彿")
+ private String collectionNumber;
+
+ @Schema(description = "鏀舵鏂瑰紡")
+ private String collectionMethod;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesInvoiceDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesInvoiceDto.java
new file mode 100644
index 0000000..4774edb
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/AccountSalesInvoiceDto.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.bean.dto.sales;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+@Schema(name = "AccountSalesInvoiceDto", description = "璐㈠姟绠＄悊--閿�椤瑰彂绁ㄥ彴璐�(浼犲弬)")
+public class AccountSalesInvoiceDto {
+
+ @Schema(description = "瀹㈡埛ID")
+ private Integer customerId;
+
+ @Schema(description = "鍙戠エ鍙风爜")
+ private String invoiceNumber;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+ @Schema(description = "鐘舵��")
+ private Integer status;
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java
index ba762e3..b8c9cc6 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "SalesOutboundDto", description = "璐㈠姟绠＄悊--閿�鍞嚭搴撳彴璐�(浼犲弬)")
@@ -14,16 +14,18 @@
@Schema(description = "鍑哄簱鍗曞彿")
private String outboundBatches;
+ private Long customerId;
+
@Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private LocalDate endDate;
}
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
index 1c6e266..5a239ae 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "SalesReturnDto", description = "璐㈠姟绠＄悊--閿�鍞��璐у彴璐�(浼犲弬)")
@@ -14,16 +14,18 @@
@Schema(description = "閫�璐у崟鍙�")
private String returnNo;
+ private Long customerId;
+
@Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private LocalDate endDate;
}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/StatementAccountVo.java b/src/main/java/com/ruoyi/account/bean/vo/StatementAccountVo.java
new file mode 100644
index 0000000..4dd073c
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/StatementAccountVo.java
@@ -0,0 +1,25 @@
+package com.ruoyi.account.bean.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.AccountStatement;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "StatementAccountVo", description = "璐㈠姟绠＄悊--瀵硅处鍗曡鎯�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class StatementAccountVo extends AccountStatement {
+
+ //瀹㈡埛鍚嶇О(搴旀敹鏄鎴�,搴斾粯鏄緵搴斿晢)
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ //瀵硅处鏄庣粏
+ @Schema(description = "瀵硅处鏄庣粏")
+ private List<AccountStatementDetails> accountStatementDetails;
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPaymentApplicationVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPaymentApplicationVo.java
new file mode 100644
index 0000000..26cae0e
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPaymentApplicationVo.java
@@ -0,0 +1,23 @@
+package com.ruoyi.account.bean.vo.purchase;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountPaymentApplicationVo", description = "璐㈠姟绠＄悊--浠樻鐢宠鍙拌处(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountPaymentApplicationVo extends AccountPaymentApplication {
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "鍏ュ簱鍗曞彿")
+ @Excel(name = "鍏ュ簱鍗曞彿")
+ private String inboundBatches;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchaseInvoiceVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchaseInvoiceVo.java
new file mode 100644
index 0000000..9d753b2
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchaseInvoiceVo.java
@@ -0,0 +1,19 @@
+package com.ruoyi.account.bean.vo.purchase;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountPurchaseInvoiceVo", description = "璐㈠姟绠＄悊--杩涢」鍙戠エ鍙拌处(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountPurchaseInvoiceVo extends AccountPurchaseInvoice {
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java
new file mode 100644
index 0000000..9a515de
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java
@@ -0,0 +1,31 @@
+package com.ruoyi.account.bean.vo.purchase;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountPurchasePaymentVo", description = "璐㈠姟绠＄悊--浠樻鍗曞彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountPurchasePaymentVo extends AccountPurchasePayment {
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "浠樻鐢宠鍗曞彿")
+ @Excel(name = "浠樻鐢宠鍗曞彿")
+ private String invoiceApplicationNo;
+
+ @Schema(description = "寮�鎴疯")
+ @Excel(name = "寮�鎴疯")
+ private String bankAccountName;
+
+ @Schema(description = "閾惰璐﹀彿")
+ @Excel(name = "閾惰璐﹀彿")
+ private String bankAccountNum;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
index 2160674..48831e1 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
@@ -7,7 +7,7 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "PurchaseInboundVo", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(杩斿洖)")
@@ -28,7 +28,7 @@
@Schema(description = "鍏ュ簱鏃ユ湡")
@Excel(name = "鍏ュ簱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date InboundDate;
+ private LocalDate InboundDate;
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/AccountInvoiceApplicationVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountInvoiceApplicationVo.java
new file mode 100644
index 0000000..55bf22b
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountInvoiceApplicationVo.java
@@ -0,0 +1,23 @@
+package com.ruoyi.account.bean.vo.sales;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountInvoiceApplicationVo", description = "璐㈠姟绠＄悊--寮�绁ㄧ敵璇峰彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountInvoiceApplicationVo extends AccountInvoiceApplication {
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "鍑哄簱鍗曞彿")
+ @Excel(name = "鍑哄簱鍗曞彿")
+ private String outboundBatches;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java
new file mode 100644
index 0000000..2463143
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java
@@ -0,0 +1,23 @@
+package com.ruoyi.account.bean.vo.sales;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountSalesCollectionVo", description = "璐㈠姟绠＄悊--鏀舵鍗曞彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountSalesCollectionVo extends AccountSalesCollection {
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "鍑哄簱鍗曞彿")
+ @Excel(name = "鍑哄簱鍗曞彿")
+ private String outboundBatches;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesInvoiceVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesInvoiceVo.java
new file mode 100644
index 0000000..1dfd4e3
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesInvoiceVo.java
@@ -0,0 +1,19 @@
+package com.ruoyi.account.bean.vo.sales;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AccountSalesInvoiceVo", description = "璐㈠姟绠＄悊--閿�椤瑰彂绁ㄥ彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class AccountSalesInvoiceVo extends AccountSalesInvoice {
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
index 90d4d53..13c1b27 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
@@ -7,7 +7,7 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "SalesOutboundVo", description = "璐㈠姟绠＄悊--閿�鍞嚭搴撳彴璐�(杩斿洖)")
@@ -28,7 +28,7 @@
@Schema(description = "鍑哄簱鏃ユ湡")
@Excel(name = "鍑哄簱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date shippingDate;
+ private LocalDate shippingDate;
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
@@ -42,6 +42,9 @@
@Excel(name = "閲戦")
private BigDecimal outboundAmount;
+ @Schema(description = "绋庣巼")
+ private BigDecimal taxRate;
+
@Schema(description = "鍙戣揣缂栧彿")
@Excel(name = "鍙戣揣缂栧彿")
private String shippingNo;
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index ea80191..9d49919 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -8,8 +8,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
@@ -26,7 +25,7 @@
@RestController
@RequestMapping("/account/accountExpense")
@Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
-public class AccountExpenseController extends BaseController {
+public class AccountExpenseController {
@Resource
private AccountExpenseService accountExpenseService;
@@ -42,11 +41,11 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody AccountExpense accountExpense) {
+ public AjaxResult add(@RequestBody AccountExpense accountExpense) {
accountExpense.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
accountExpense.setInputUser(loginUser.getNickName());
- return R.ok(accountExpenseService.save(accountExpense));
+ return AjaxResult.success(accountExpenseService.save(accountExpense));
}
/**
@@ -56,12 +55,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠屽崟
- return R.ok(accountExpenseService.removeBatchByIds(ids));
+ return AjaxResult.success(accountExpenseService.removeBatchByIds(ids));
}
/**
@@ -71,8 +70,8 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody AccountExpense accountExpense) {
- return R.ok(accountExpenseService.updateById(accountExpense));
+ public AjaxResult update(@RequestBody AccountExpense accountExpense) {
+ return AjaxResult.success(accountExpenseService.updateById(accountExpense));
}
/**
@@ -83,8 +82,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> accountExpenseListPage(Page page, AccountExpense accountExpense) {
- return R.ok(accountExpenseService.accountExpenseListPage(page, accountExpense));
+ public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
+ return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
}
/**
@@ -94,8 +93,8 @@
*/
@GetMapping("/{id}")
@Operation(summary = "璇︽儏")
- public R<?> accountExpenseDetail(@PathVariable("id") Integer id) {
- return R.ok(accountExpenseService.getById(id));
+ public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(accountExpenseService.getById(id));
}
/**
@@ -116,8 +115,8 @@
*/
@GetMapping("/report/forms")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
- public R<?> report(DateQueryDto dateQueryDto) {
- return R.ok(accountExpenseService.report(dateQueryDto));
+ public AjaxResult report(DateQueryDto dateQueryDto) {
+ return AjaxResult.success(accountExpenseService.report(dateQueryDto));
}
/**
@@ -126,8 +125,8 @@
*/
@GetMapping("/report/analysis")
@Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
- public R<?> analysis() {
- return R.ok(accountExpenseService.analysis());
+ public AjaxResult analysis() {
+ return AjaxResult.success(accountExpenseService.analysis());
}
/**
@@ -137,8 +136,8 @@
*/
@GetMapping("/report/income")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
- public R<?> reportIncome(ReportDateDto reportDateDto) {
- return R.ok(accountIncomeService.reportIncome(reportDateDto));
+ public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
}
/**
@@ -148,8 +147,8 @@
*/
@GetMapping("/report/expense")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
- public R<?> reportExpense(ReportDateDto reportDateDto) {
- return R.ok(accountExpenseService.reportExpense(reportDateDto));
+ public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountFileController.java b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
index 4427a3f..42c20d1 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountFileController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.service.IQualityInspectFileService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
@@ -19,7 +20,7 @@
@RestController
@RequestMapping("/account/accountFile")
@Tag(name = "璐㈠姟闄勪欢")
-public class AccountFileController extends BaseController {
+public class AccountFileController {
@Resource
@@ -33,8 +34,8 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody AccountFile accountFile) {
- return R.ok(accountFileService.save(accountFile));
+ public AjaxResult add(@RequestBody AccountFile accountFile) {
+ return AjaxResult.success(accountFileService.save(accountFile));
}
/**
@@ -44,12 +45,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public R<?> delAccountFile(@RequestBody List<Integer> ids) {
+ public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(accountFileService.removeBatchByIds(ids));
+ return AjaxResult.success(accountFileService.removeBatchByIds(ids));
}
/**
@@ -60,8 +61,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> accountFileListPage(Page page, AccountFile accountFile) {
- return R.ok(accountFileService.accountFileListPage(page, accountFile));
+ public AjaxResult accountFileListPage(Page page, AccountFile accountFile) {
+ return AjaxResult.success(accountFileService.accountFileListPage(page, accountFile));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 6d31342..690e75a 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -1,12 +1,19 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountIncome;
+import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.quality.service.IQualityInspectParamService;
+import com.ruoyi.quality.service.IQualityInspectService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
@@ -23,7 +30,7 @@
@RestController
@RequestMapping("/account/accountIncome")
@Tag(name = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
-public class AccountIncomeController extends BaseController {
+public class AccountIncomeController {
@Resource
private AccountIncomeService accountIncomeService;
@@ -36,11 +43,11 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody AccountIncome accountIncome) {
+ public AjaxResult add(@RequestBody AccountIncome accountIncome) {
accountIncome.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
accountIncome.setInputUser(loginUser.getNickName());
- return R.ok(accountIncomeService.save(accountIncome));
+ return AjaxResult.success(accountIncomeService.save(accountIncome));
}
/**
@@ -50,12 +57,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠屽崟
- return R.ok(accountIncomeService.removeBatchByIds(ids));
+ return AjaxResult.success(accountIncomeService.removeBatchByIds(ids));
}
/**
@@ -65,8 +72,8 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody AccountIncome accountIncome) {
- return R.ok(accountIncomeService.updateById(accountIncome));
+ public AjaxResult update(@RequestBody AccountIncome accountIncome) {
+ return AjaxResult.success(accountIncomeService.updateById(accountIncome));
}
/**
@@ -77,8 +84,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> accountIncomeListPage(Page page, AccountIncome accountIncome) {
- return R.ok(accountIncomeService.accountIncomeListPage(page, accountIncome));
+ public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
+ return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
/**
@@ -88,8 +95,8 @@
*/
@GetMapping("/{id}")
@Operation(summary = "璇︽儏")
- public R<?> accountIncomeDetail(@PathVariable("id") Integer id) {
- return R.ok(accountIncomeService.getById(id));
+ public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(accountIncomeService.getById(id));
}
/**
diff --git a/src/main/java/com/ruoyi/account/controller/AccountStatementController.java b/src/main/java/com/ruoyi/account/controller/AccountStatementController.java
new file mode 100644
index 0000000..b53f457
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/AccountStatementController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.StatementAccountDto;
+import com.ruoyi.account.bean.vo.StatementAccountVo;
+import com.ruoyi.account.service.AccountStatementService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 09:42:47
+ */
+@RestController
+@RequestMapping("/accountStatement")
+@RequiredArgsConstructor
+@Tag(name = "璐㈠姟绠＄悊-瀵硅处鍗�")
+public class AccountStatementController {
+
+ private final AccountStatementService accountStatementService;
+
+ @GetMapping("/getAccountStatementDetailsByMonth")
+ @Log(title = "鏍规嵁瀹㈡埛鍜屾湀浠芥煡璇㈠璐﹀崟鏄庣粏", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁瀹㈡埛鍜屾湀浠芥煡璇㈠璐﹀崟鏄庣粏")
+ public R getAccountStatementDetailsByMonth(StatementAccountDto statementAccountDto) {
+ return R.ok(accountStatementService.getAccountStatementDetailsByMonth(statementAccountDto));
+ }
+
+ @PostMapping("/addAccountStatement")
+ @Log(title = "鏂板瀵硅处鍗�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板瀵硅处鍗�")
+ public R addAccountStatement(@RequestBody StatementAccountVo statementAccountVo) {
+ return R.ok(accountStatementService.addAccountStatement(statementAccountVo));
+ }
+
+ @DeleteMapping("/deleteAccountStatement")
+ @Log(title = "鍒犻櫎瀵硅处鍗�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎瀵硅处鍗�")
+ public R deleteAccountStatement(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountStatementService.deleteAccountStatement(Arrays.asList(ids)));
+ }
+
+ @GetMapping("/listPageAccountStatement")
+ @Log(title = "瀵硅处鍗曞彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--瀵硅处鍗曞彴璐�")
+ public R<IPage<StatementAccountVo>> listPageAccountStatement(Page page, StatementAccountDto statementAccountDto) {
+ IPage<StatementAccountVo> listPage = accountStatementService.listPageAccountStatement(page,statementAccountDto);
+ return R.ok(listPage);
+ }
+
+ @PostMapping("/exportAccountStatement")
+ @Operation(summary = "瀵煎嚭瀵硅处鍗曟枃浠�")
+ @Log(title = "瀵煎嚭瀵硅处鍗曟枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountStatement(HttpServletResponse response, StatementAccountDto statementAccountDto) {
+ accountStatementService.exportAccountStatement(response,statementAccountDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 630694e..4688942 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.service.impl.AccountingServiceImpl;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -27,19 +27,19 @@
@Operation(summary = "鎬昏")
@GetMapping("/total")
- public R<?> total(@RequestParam Integer year) {
+ public AjaxResult total(@RequestParam Integer year) {
return accountingService.total(year);
}
@Operation(summary = "璁惧绫诲瀷鍒嗗竷")
@GetMapping("/deviceTypeDistribution")
- public R<?> deviceTypeDistribution(@RequestParam Integer year) {
+ public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
return accountingService.deviceTypeDistribution(year);
}
@Operation(summary = "璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
@GetMapping("/calculateDepreciation")
- public R<?> calculateDepreciation(Page page, @RequestParam Integer year) {
+ public AjaxResult calculateDepreciation(Page page, @RequestParam Integer year) {
return accountingService.calculateDepreciation(page,year);
}
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
index fd39de0..7620c19 100644
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
@@ -6,11 +6,11 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,13 +29,13 @@
@RestController
@RequestMapping("/borrowInfo")
@AllArgsConstructor
-public class BorrowInfoController extends BaseController {
+public class BorrowInfoController {
private BorrowInfoService borrowInfoService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, BorrowInfo borrowInfo) {
+ public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
return borrowInfoService.listPage(page,borrowInfo);
}
@@ -45,7 +45,7 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鏂板鍊熸淇℃伅", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody BorrowInfo borrowInfo) {
+ public AjaxResult add(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.add(borrowInfo);
}
@@ -55,7 +55,7 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Log(title = "淇敼鍊熸淇℃伅", businessType = BusinessType.UPDATE)
- public R<?> updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
+ public AjaxResult updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.updateBorrowInfo(borrowInfo);
}
@@ -66,7 +66,7 @@
@DeleteMapping("/delete")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍒犻櫎鍊熸淇℃伅", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
return borrowInfoService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java b/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java
new file mode 100644
index 0000000..423d0ef
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java
@@ -0,0 +1,86 @@
+package com.ruoyi.account.controller.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPaymentApplicationDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import com.ruoyi.account.service.purchase.AccountPaymentApplicationService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@RestController
+@RequestMapping("/accountPaymentApplication")
+@Tag(name = "璐㈠姟绠＄悊--浠樻鐢宠")
+@RequiredArgsConstructor
+public class AccountPaymentApplicationController {
+
+ private final AccountPaymentApplicationService accountPaymentApplicationService;
+
+ @GetMapping("/listPageAccountPaymentApplication")
+ @Log(title = "浠樻鐢宠鍙拌处", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--浠樻鐢宠鍙拌处")
+ public R<IPage<AccountPaymentApplicationVo>> listPageAccountPaymentApplication(Page page, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+ IPage<AccountPaymentApplicationVo> listPage = accountPaymentApplicationService.listPageAccountPaymentApplication(page,accountPaymentApplicationDto);
+ return R.ok(listPage);
+ }
+
+ @GetMapping("/getInboundBatchesBySupplier")
+ @Log(title = "鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(浠樻鐢宠)", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(浠樻鐢宠)")
+ public R getInboundBatchesBySupplier(Integer supplierId) {
+ return R.ok(accountPaymentApplicationService.getInboundBatchesBySupplier(supplierId));
+ }
+
+ @PostMapping("/addAccountPaymentApplication")
+ @Log(title = "鏂板浠樻鐢宠", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板浠樻鐢宠")
+ public R addAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+ return R.ok(accountPaymentApplicationService.addAccountPaymentApplication(accountPaymentApplication));
+ }
+
+ @PutMapping("/updateAccountPaymentApplication")
+ @Log(title = "淇敼浠樻鐢宠", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--淇敼浠樻鐢宠")
+ public R updateAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+ return R.ok(accountPaymentApplicationService.updateById(accountPaymentApplication));
+ }
+
+ @PutMapping("/auditAccountPaymentApplication")
+ @Log(title = "瀹℃牳浠樻鐢宠", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--瀹℃牳浠樻鐢宠")
+ public R auditAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+ return R.ok(accountPaymentApplicationService.updateById(accountPaymentApplication));
+ }
+
+ @DeleteMapping("/deleteAccountPaymentApplication")
+ @Log(title = "鍒犻櫎浠樻鐢宠", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎浠樻鐢宠")
+ public R deleteAccountPaymentApplication(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountPaymentApplicationService.deleteAccountPaymentApplication(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountPaymentApplication")
+ @Operation(summary = "瀵煎嚭浠樻鐢宠鏂囦欢")
+ @Log(title = "瀵煎嚭浠樻鐢宠鏂囦欢", businessType = BusinessType.EXPORT)
+ public void exportAccountPaymentApplication(HttpServletResponse response, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+ accountPaymentApplicationService.exportAccountPaymentApplication(response,accountPaymentApplicationDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchaseInvoiceController.java b/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchaseInvoiceController.java
new file mode 100644
index 0000000..c755aad
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchaseInvoiceController.java
@@ -0,0 +1,79 @@
+package com.ruoyi.account.controller.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchaseInvoiceDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchaseInvoiceVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice;
+import com.ruoyi.account.service.purchase.AccountPurchaseInvoiceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--杩涢」鍙戠エ 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:06:17
+ */
+@RestController
+@RequestMapping("/accountPurchaseInvoice")
+@Tag(name = "璐㈠姟绠＄悊--杩涢」鍙戠エ")
+@RequiredArgsConstructor
+public class AccountPurchaseInvoiceController {
+
+ private final AccountPurchaseInvoiceService accountPurchaseInvoiceService;
+
+ @GetMapping("/listPageAccountPurchaseInvoice")
+ @Log(title = "杩涢」鍙戠エ鍙拌处", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--杩涢」鍙戠エ鍙拌处")
+ public R<IPage<AccountPurchaseInvoiceVo>> listPageAccountPurchaseInvoice(Page page, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto) {
+ IPage<AccountPurchaseInvoiceVo> listPage = accountPurchaseInvoiceService.listPageAccountPurchaseInvoice(page,accountPurchaseInvoiceDto);
+ return R.ok(listPage);
+ }
+
+ @GetMapping("/getInboundBatchesBySupplier")
+ @Log(title = "鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(杩涢」鍙戠エ)", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(杩涢」鍙戠エ)")
+ public R getInboundBatchesBySupplier(Integer supplierId) {
+ return R.ok(accountPurchaseInvoiceService.getInboundBatchesBySupplier(supplierId));
+ }
+
+ @PostMapping("/addAccountPurchaseInvoice")
+ @Log(title = "鏂板杩涢」鍙戠エ", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板杩涢」鍙戠エ")
+ public R addAccountPurchaseInvoice(@RequestBody AccountPurchaseInvoice accountPurchaseInvoice) {
+ return R.ok(accountPurchaseInvoiceService.save(accountPurchaseInvoice));
+ }
+
+ @PutMapping("/cancelAccountPurchaseInvoice")
+ @Log(title = "浣滃簾杩涢」鍙戠エ", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--浣滃簾閿�椤瑰彂绁�")
+ public R cancelAccountPurchaseInvoice(@RequestBody AccountPurchaseInvoice accountPurchaseInvoice) {
+ return R.ok(accountPurchaseInvoiceService.updateById(accountPurchaseInvoice));
+ }
+
+ @DeleteMapping("/deleteAccountPurchaseInvoice")
+ @Log(title = "鍒犻櫎杩涢」鍙戠エ", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎杩涢」鍙戠エ")
+ public R deleteAccountPurchaseInvoice(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountPurchaseInvoiceService.deleteAccountPurchaseInvoice(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountPurchaseInvoice")
+ @Operation(summary = "瀵煎嚭杩涢」鍙戠エ鏂囦欢")
+ @Log(title = "瀵煎嚭杩涢」鍙戠エ鏂囦欢", businessType = BusinessType.EXPORT)
+ public void exportAccountPurchaseInvoice(HttpServletResponse response, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto) {
+ accountPurchaseInvoiceService.exportAccountPurchaseInvoice(response,accountPurchaseInvoiceDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchasePaymentController.java b/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchasePaymentController.java
new file mode 100644
index 0000000..c73e547
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/purchase/AccountPurchasePaymentController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.account.controller.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchasePaymentDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.account.service.purchase.AccountPurchasePaymentService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鍗� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 04:14:51
+ */
+@RestController
+@RequestMapping("/accountPurchasePayment")
+@Tag(name = "璐㈠姟绠＄悊--浠樻鍗�")
+@RequiredArgsConstructor
+public class AccountPurchasePaymentController {
+
+ private final AccountPurchasePaymentService accountPurchasePaymentService;
+
+ @GetMapping("/listPageAccountPurchasePayment")
+ @Log(title = "浠樻鍗曞彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--浠樻鍗曞彴璐�")
+ public R<IPage<AccountPurchasePaymentVo>> listPageAccountPurchasePayment(Page page, AccountPurchasePaymentDto accountPurchasePaymentDto) {
+ IPage<AccountPurchasePaymentVo> listPage = accountPurchasePaymentService.listPageAccountPurchasePayment(page,accountPurchasePaymentDto);
+ return R.ok(listPage);
+ }
+
+ @PostMapping("/addAccountPurchasePayment")
+ @Log(title = "鏂板浠樻鍗�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板浠樻鍗�")
+ public R addAccountPurchasePayment(@RequestBody AccountPurchasePayment accountPurchasePayment) {
+ return R.ok(accountPurchasePaymentService.addAccountPurchasePayment(accountPurchasePayment));
+ }
+
+ @PutMapping("/updateAccountPurchasePayment")
+ @Log(title = "缂栬緫浠樻鍗�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--缂栬緫浠樻鍗�")
+ public R updateAccountPurchasePayment(@RequestBody AccountPurchasePayment accountPurchasePayment) {
+ return R.ok(accountPurchasePaymentService.updateById(accountPurchasePayment));
+ }
+
+ @DeleteMapping("/deleteAccountPurchasePayment")
+ @Log(title = "鍒犻櫎浠樻鍗�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎浠樻鍗�")
+ public R deleteAccountPurchasePayment(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountPurchasePaymentService.deleteAccountPurchasePayment(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountPurchasePayment")
+ @Operation(summary = "瀵煎嚭浠樻鍗曟枃浠�")
+ @Log(title = "瀵煎嚭浠樻鍗曟枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountPurchasePayment(HttpServletResponse response, AccountPurchasePaymentDto accountPurchasePaymentDto) {
+ accountPurchasePaymentService.exportAccountPurchasePayment(response,accountPurchasePaymentDto);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/controller/sales/AccountInvoiceApplicationController.java b/src/main/java/com/ruoyi/account/controller/sales/AccountInvoiceApplicationController.java
new file mode 100644
index 0000000..00b490f
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/sales/AccountInvoiceApplicationController.java
@@ -0,0 +1,86 @@
+package com.ruoyi.account.controller.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountInvoiceApplicationDto;
+import com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo;
+import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
+import com.ruoyi.account.service.sales.AccountInvoiceApplicationService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--寮�绁ㄧ敵璇� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 01:38:32
+ */
+@RestController
+@RequestMapping("/accountInvoiceApplication")
+@Tag(name = "璐㈠姟绠＄悊--寮�绁ㄧ敵璇�")
+@RequiredArgsConstructor
+public class AccountInvoiceApplicationController {
+
+ private final AccountInvoiceApplicationService accountInvoiceApplicationService;
+
+ @GetMapping("/listPageAccountInvoiceApplication")
+ @Log(title = "寮�绁ㄧ敵璇峰彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--寮�绁ㄧ敵璇峰彴璐�")
+ public R<IPage<AccountInvoiceApplicationVo>> listPageAccountInvoiceApplication(Page page, AccountInvoiceApplicationDto accountInvoiceApplicationDto) {
+ IPage<AccountInvoiceApplicationVo> listPage = accountInvoiceApplicationService.listPageAccountInvoiceApplication(page,accountInvoiceApplicationDto);
+ return R.ok(listPage);
+ }
+
+ @GetMapping("/getOutboundBatchesByCustomer")
+ @Log(title = "鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(寮�绁ㄧ敵璇�)", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(寮�绁ㄧ敵璇�)")
+ public R getOutboundBatchesByCustomer(Integer customerId) {
+ return R.ok(accountInvoiceApplicationService.getOutboundBatchesByCustomer(customerId));
+ }
+
+ @PostMapping("/addAccountInvoiceApplication")
+ @Log(title = "鏂板寮�绁ㄧ敵璇�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板寮�绁ㄧ敵璇�")
+ public R addAccountInvoiceApplication(@RequestBody AccountInvoiceApplication accountInvoiceApplication) {
+ return R.ok(accountInvoiceApplicationService.addAccountInvoiceApplication(accountInvoiceApplication));
+ }
+
+ @PutMapping("/updateAccountInvoiceApplication")
+ @Log(title = "淇敼寮�绁ㄧ敵璇�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--淇敼寮�绁ㄧ敵璇�")
+ public R updateAccountInvoiceApplication(@RequestBody AccountInvoiceApplication accountInvoiceApplication) {
+ return R.ok(accountInvoiceApplicationService.updateById(accountInvoiceApplication));
+ }
+
+ @PutMapping("/auditAccountInvoiceApplication")
+ @Log(title = "瀹℃牳寮�绁ㄧ敵璇�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--瀹℃牳寮�绁ㄧ敵璇�")
+ public R auditAccountInvoiceApplication(@RequestBody AccountInvoiceApplication accountInvoiceApplication) {
+ return R.ok(accountInvoiceApplicationService.updateById(accountInvoiceApplication));
+ }
+
+ @DeleteMapping("/deleteAccountInvoiceApplication")
+ @Log(title = "鍒犻櫎寮�绁ㄧ敵璇�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎寮�绁ㄧ敵璇�")
+ public R deleteAccountInvoiceApplication(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountInvoiceApplicationService.deleteAccountInvoiceApplication(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountInvoiceApplication")
+ @Operation(summary = "瀵煎嚭寮�绁ㄧ敵璇锋枃浠�")
+ @Log(title = "瀵煎嚭寮�绁ㄧ敵璇锋枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountInvoiceApplication(HttpServletResponse response, AccountInvoiceApplicationDto accountInvoiceApplicationDto) {
+ accountInvoiceApplicationService.exportAccountInvoiceApplication(response,accountInvoiceApplicationDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java
new file mode 100644
index 0000000..6ab1f2a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java
@@ -0,0 +1,79 @@
+package com.ruoyi.account.controller.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesCollectionDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.ruoyi.account.service.sales.AccountSalesCollectionService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--鏀舵鍗� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:49:56
+ */
+@RestController
+@RequestMapping("/accountSalesCollection")
+@Tag(name = "璐㈠姟绠＄悊--鏀舵鍗�")
+@RequiredArgsConstructor
+public class AccountSalesCollectionController {
+
+ private final AccountSalesCollectionService accountSalesCollectionService;
+
+ @GetMapping("/listPageAccountSalesCollection")
+ @Log(title = "鏀舵鍗曞彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏀舵鍗曞彴璐�")
+ public R<IPage<AccountSalesCollectionVo>> listPageAccountSalesCollection(Page page, AccountSalesCollectionDto accountSalesCollectionDto) {
+ IPage<AccountSalesCollectionVo> listPage = accountSalesCollectionService.listPageAccountSalesCollection(page,accountSalesCollectionDto);
+ return R.ok(listPage);
+ }
+
+ @GetMapping("/getOutboundBatchesByCustomer")
+ @Log(title = "鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(鏀舵鍗�)", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(鏀舵鍗�)")
+ public R getOutboundBatchesByCustomer(Integer customerId) {
+ return R.ok(accountSalesCollectionService.getOutboundBatchesByCustomer(customerId));
+ }
+
+ @PostMapping("/addAccountSalesCollection")
+ @Log(title = "鏂板鏀舵鍗�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板鏀舵鍗�")
+ public R addAccountSalesCollection(@RequestBody AccountSalesCollection accountSalesCollection) {
+ return R.ok(accountSalesCollectionService.addAccountSalesCollection(accountSalesCollection));
+ }
+
+ @PutMapping("/updateAccountSalesCollection")
+ @Log(title = "缂栬緫鏀舵鍗�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--缂栬緫鏀舵鍗�")
+ public R updateAccountSalesCollection(@RequestBody AccountSalesCollection accountSalesCollection) {
+ return R.ok(accountSalesCollectionService.updateById(accountSalesCollection));
+ }
+
+ @DeleteMapping("/deleteAccountSalesCollection")
+ @Log(title = "鍒犻櫎鏀舵鍗�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎鏀舵鍗�")
+ public R deleteAccountSalesCollection(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountSalesCollectionService.deleteAccountSalesCollection(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountSalesCollection")
+ @Operation(summary = "瀵煎嚭鏀舵鍗曟枃浠�")
+ @Log(title = "瀵煎嚭鏀舵鍗曟枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountSalesCollection(HttpServletResponse response, AccountSalesCollectionDto accountSalesCollectionDto) {
+ accountSalesCollectionService.exportAccountSalesCollection(response,accountSalesCollectionDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/controller/sales/AccountSalesInvoiceController.java b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesInvoiceController.java
new file mode 100644
index 0000000..05c13b0
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesInvoiceController.java
@@ -0,0 +1,72 @@
+package com.ruoyi.account.controller.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesInvoiceDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import com.ruoyi.account.service.sales.AccountSalesInvoiceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--閿�椤瑰彂绁� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:10:20
+ */
+@RestController
+@RequestMapping("/accountSalesInvoice")
+@Tag(name = "璐㈠姟绠＄悊--閿�椤瑰彂绁�")
+@RequiredArgsConstructor
+public class AccountSalesInvoiceController {
+
+ private final AccountSalesInvoiceService accountSalesInvoiceService;
+
+ @GetMapping("/listPageAccountSalesInvoice")
+ @Log(title = "閿�椤瑰彂绁ㄥ彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--閿�椤瑰彂绁ㄥ彴璐�")
+ public R<IPage<AccountSalesInvoiceVo>> listPageAccountSalesInvoice(Page page, AccountSalesInvoiceDto accountSalesInvoiceDto) {
+ IPage<AccountSalesInvoiceVo> listPage = accountSalesInvoiceService.listPageAccountSalesInvoice(page,accountSalesInvoiceDto);
+ return R.ok(listPage);
+ }
+
+ @PostMapping("/addAccountSalesInvoice")
+ @Log(title = "鏂板閿�椤瑰彂绁�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板閿�椤瑰彂绁�")
+ public R addAccountSalesInvoice(@RequestBody AccountSalesInvoice accountSalesInvoice) {
+ return R.ok(accountSalesInvoiceService.save(accountSalesInvoice));
+ }
+
+ @PutMapping("/cancelAccountSalesInvoice")
+ @Log(title = "浣滃簾閿�椤瑰彂绁�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--浣滃簾閿�椤瑰彂绁�")
+ public R cancelAccountSalesInvoice(@RequestBody AccountSalesInvoice accountSalesInvoice) {
+ return R.ok(accountSalesInvoiceService.updateById(accountSalesInvoice));
+ }
+
+ @DeleteMapping("/deleteAccountSalesInvoice")
+ @Log(title = "鍒犻櫎閿�椤瑰彂绁�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎閿�椤瑰彂绁�")
+ public R deleteAccountSalesInvoice(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountSalesInvoiceService.deleteAccountSalesInvoice(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountSalesInvoice")
+ @Operation(summary = "瀵煎嚭閿�椤瑰彂绁ㄦ枃浠�")
+ @Log(title = "瀵煎嚭閿�椤瑰彂绁ㄦ枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountSalesInvoice(HttpServletResponse response, AccountSalesInvoiceDto accountSalesInvoiceDto) {
+ accountSalesInvoiceService.exportAccountSalesInvoice(response,accountSalesInvoiceDto);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/AccountStatementDetailsMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountStatementDetailsMapper.java
new file mode 100644
index 0000000..7b6e72f
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/AccountStatementDetailsMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--瀵硅处鍗曟槑缁� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 10:12:42
+ */
+@Mapper
+public interface AccountStatementDetailsMapper extends BaseMapper<AccountStatementDetails> {
+
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/AccountStatementMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountStatementMapper.java
new file mode 100644
index 0000000..307cf1a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/AccountStatementMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.StatementAccountDto;
+import com.ruoyi.account.bean.vo.StatementAccountVo;
+import com.ruoyi.account.pojo.AccountStatement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 09:42:47
+ */
+@Mapper
+public interface AccountStatementMapper extends BaseMapper<AccountStatement> {
+
+
+ IPage<StatementAccountVo> listPageAccountStatement(Page page, @Param("req") StatementAccountDto statementAccountDto);
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/purchase/AccountPaymentApplicationMapper.java b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPaymentApplicationMapper.java
new file mode 100644
index 0000000..f6d90f9
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPaymentApplicationMapper.java
@@ -0,0 +1,32 @@
+package com.ruoyi.account.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPaymentApplicationDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@Mapper
+public interface AccountPaymentApplicationMapper extends BaseMapper<AccountPaymentApplication> {
+
+ IPage<AccountPaymentApplicationVo> listPageAccountPaymentApplication(Page page, @Param("req") AccountPaymentApplicationDto accountPaymentApplicationDto);
+
+ List<PurchaseInboundVo> getInboundBatchesBySupplier(@Param("supplierId") Integer supplierId);
+
+ //鍒ゆ柇璇ュ嚭搴撹褰曟槸鍚︽湁寮�绁ㄧ敵璇�
+ boolean existsByStockInRecordId(@Param("stockInRecordIds") List<Long> stockInRecordIds);
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchaseInvoiceMapper.java b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchaseInvoiceMapper.java
new file mode 100644
index 0000000..bd8e25a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchaseInvoiceMapper.java
@@ -0,0 +1,29 @@
+package com.ruoyi.account.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchaseInvoiceDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchaseInvoiceVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--杩涢」鍙戠エ Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:06:17
+ */
+@Mapper
+public interface AccountPurchaseInvoiceMapper extends BaseMapper<AccountPurchaseInvoice> {
+
+ IPage<AccountPurchaseInvoiceVo> listPageAccountPurchaseInvoice(Page page, @Param("req") AccountPurchaseInvoiceDto accountPurchaseInvoiceDto);
+
+ List<PurchaseInboundVo> getInboundBatchesBySupplier(@Param("supplierId") Integer supplierId);
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java
new file mode 100644
index 0000000..10b1247
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.account.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchasePaymentDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鍗� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 04:14:51
+ */
+@Mapper
+public interface AccountPurchasePaymentMapper extends BaseMapper<AccountPurchasePayment> {
+
+ IPage<AccountPurchasePaymentVo> listPageAccountPurchasePayment(Page page, @Param("req") AccountPurchasePaymentDto accountPurchasePaymentDto);
+
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/sales/AccountInvoiceApplicationMapper.java b/src/main/java/com/ruoyi/account/mapper/sales/AccountInvoiceApplicationMapper.java
new file mode 100644
index 0000000..463f178
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/sales/AccountInvoiceApplicationMapper.java
@@ -0,0 +1,32 @@
+package com.ruoyi.account.mapper.sales;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountInvoiceApplicationDto;
+import com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--寮�绁ㄧ敵璇� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 01:38:32
+ */
+@Mapper
+public interface AccountInvoiceApplicationMapper extends BaseMapper<AccountInvoiceApplication> {
+
+ IPage<AccountInvoiceApplicationVo> listPageAccountInvoiceApplication(Page page, @Param("req") AccountInvoiceApplicationDto accountInvoiceApplicationDto);
+
+ List<SalesOutboundVo> getOutboundBatchesByCustomer(@Param("customerId") Integer customerId);
+
+ //鍒ゆ柇璇ュ嚭搴撹褰曟槸鍚︽湁寮�绁ㄧ敵璇�
+ boolean existsByStockOutRecordId(@Param("stockOutRecordIds") List<Long> stockOutRecordIds);
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesCollectionMapper.java b/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesCollectionMapper.java
new file mode 100644
index 0000000..7c424d9
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesCollectionMapper.java
@@ -0,0 +1,32 @@
+package com.ruoyi.account.mapper.sales;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesCollectionDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--鏀舵鍗� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:49:56
+ */
+@Mapper
+public interface AccountSalesCollectionMapper extends BaseMapper<AccountSalesCollection> {
+
+ IPage<AccountSalesCollectionVo> listPageAccountSalesCollection(Page page, @Param("req") AccountSalesCollectionDto accountSalesCollectionDto);
+
+ //鍒ゆ柇璇ュ嚭搴撹褰曟槸鍚︽湁鏀舵鍗�
+ boolean existsByStockOutRecordId(@Param("stockOutRecordIds") List<Long> stockOutRecordIds);
+
+ List<SalesOutboundVo> getOutboundBatchesByCustomer(@Param("customerId") Integer customerId);
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesInvoiceMapper.java b/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesInvoiceMapper.java
new file mode 100644
index 0000000..ea88e8f
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/sales/AccountSalesInvoiceMapper.java
@@ -0,0 +1,24 @@
+package com.ruoyi.account.mapper.sales;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesInvoiceDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--閿�椤瑰彂绁� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:10:20
+ */
+@Mapper
+public interface AccountSalesInvoiceMapper extends BaseMapper<AccountSalesInvoice> {
+
+ IPage<AccountSalesInvoiceVo> listPageAccountSalesInvoice(Page page, @Param("req") AccountSalesInvoiceDto accountSalesInvoiceDto);
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountStatement.java b/src/main/java/com/ruoyi/account/pojo/AccountStatement.java
new file mode 100644
index 0000000..20d2495
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/AccountStatement.java
@@ -0,0 +1,127 @@
+package com.ruoyi.account.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 09:42:47
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_statement")
+@ApiModel(value = "AccountStatement瀵硅薄", description = "璐㈠姟绠＄悊--瀵硅处鍗�")
+public class AccountStatement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 瀹㈡埛id(搴旀敹鏄鎴穋ustomer,搴斾粯鏄緵搴斿晢supplier)
+ */
+ @ApiModelProperty("瀹㈡埛id")
+ private Integer customerId;
+
+ /**
+ * 瀵硅处鏈堜唤(yyyy-MM)
+ */
+ @ApiModelProperty("瀵硅处鏈堜唤(yyyy-MM)")
+ @Excel(name = "瀵硅处鏈堜唤")
+ private String statementMonth;
+
+ /**
+ * 涓氬姟绫诲瀷(1搴旀敹瀵硅处;2搴斾粯瀵硅处)
+ */
+ @ApiModelProperty("涓氬姟绫诲瀷(1搴旀敹瀵硅处;2搴斾粯瀵硅处)")
+ @Excel(name = "涓氬姟绫诲瀷",readConverterExp = "1=搴旀敹瀵硅处,2=搴斾粯瀵硅处")
+ private Integer accountType;
+
+ /**
+ * 瀵硅处鍗曞彿
+ */
+ @ApiModelProperty("瀵硅处鍗曞彿")
+ @Excel(name = "瀵硅处鍗曞彿")
+ private String statementNumber;
+
+ /**
+ * 鏈熷垵浣欓
+ */
+ @ApiModelProperty("鏈熷垵浣欓")
+ @Excel(name = "鏈熷垵浣欓")
+ private BigDecimal openingBalance;
+
+ /**
+ * 鏈湡搴旀敹/搴斾粯
+ */
+ @ApiModelProperty("鏈湡搴旀敹/搴斾粯")
+ @Excel(name = "鏈湡搴旀敹/搴斾粯")
+ private BigDecimal currentPlan;
+
+ /**
+ * 鏈湡鏀舵/浠樻
+ */
+ @ApiModelProperty("鏈湡鏀舵/浠樻")
+ @Excel(name = "鏈湡鏀舵/浠樻")
+ private BigDecimal currentActually;
+
+ /**
+ * 鏈熸湯浣欓
+ */
+ @ApiModelProperty("鏈熸湯浣欓")
+ @Excel(name = "鏈熸湯浣欓")
+ private BigDecimal closingBalance;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountStatementDetails.java b/src/main/java/com/ruoyi/account/pojo/AccountStatementDetails.java
new file mode 100644
index 0000000..016a099
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/AccountStatementDetails.java
@@ -0,0 +1,115 @@
+package com.ruoyi.account.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--瀵硅处鍗曟槑缁�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 10:12:42
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_statement_details")
+@ApiModel(value = "AccountStatementDetails瀵硅薄", description = "璐㈠姟绠＄悊--瀵硅处鍗曟槑缁�")
+public class AccountStatementDetails implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍏宠仈瀵硅处鍗昳d
+ */
+ @ApiModelProperty("鍏宠仈瀵硅处鍗昳d")
+ private Integer accountStatementId;
+
+ /**
+ * 鏁版嵁鏃ユ湡
+ */
+ @ApiModelProperty("鏁版嵁鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate occurrenceDate;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty("鍗曟嵁缂栧彿")
+ private String receiptNumber;
+
+ /**
+ * 鏁版嵁绫诲瀷(1鍑哄簱;2鍏ュ簱;3鏀舵;4浠樻;5閫�璐�)
+ */
+ @ApiModelProperty("鏁版嵁绫诲瀷(1鍑哄簱;2鍏ュ簱;3鏀舵;4浠樻;5閫�璐�)")
+ private Integer type;
+
+ /**
+ * 閲戦
+ */
+ @ApiModelProperty("閲戦")
+ private BigDecimal amount;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
index 222ee6c..2548a9c 100644
--- a/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
+++ b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
@@ -85,7 +85,7 @@
*/
@ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
- private String createUser;
+ private Integer createUser;
/**
* 鍒涘缓鏃堕棿
@@ -99,7 +99,7 @@
*/
@ApiModelProperty("淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateUser;
+ private Integer updateUser;
/**
* 淇敼鏃堕棿
diff --git a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
new file mode 100644
index 0000000..9a01df7
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
@@ -0,0 +1,141 @@
+package com.ruoyi.account.pojo.purchase;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_payment_application")
+@ApiModel(value = "AccountPaymentApplication瀵硅薄", description = "璐㈠姟绠＄悊--浠樻鐢宠")
+public class AccountPaymentApplication implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 渚涘簲鍟唅d
+ */
+ @ApiModelProperty("渚涘簲鍟唅d")
+ private Integer supplierId;
+
+ /**
+ * 鍏宠仈鍏ュ簱鍗昳d(澶氶��)
+ */
+ @ApiModelProperty("鍏宠仈鍏ュ簱鍗昳d(澶氶��)")
+ private String stockInRecordIds;
+
+ /**
+ * 浠樻鐢宠鍗曞彿
+ */
+ @ApiModelProperty("浠樻鐢宠鍗曞彿")
+ @Excel(name = "浠樻鐢宠鍗曞彿")
+ private String invoiceApplicationNo;
+
+ /**
+ * 浠樻鏂瑰紡
+ */
+ @ApiModelProperty("浠樻鏂瑰紡")
+ @Excel(name = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ /**
+ * 浠樻浜嬬敱
+ */
+ @ApiModelProperty("浠樻浜嬬敱")
+ @Excel(name = "浠樻浜嬬敱")
+ private String paymentContent;
+
+ /**
+ * 鐢宠鏃ユ湡
+ */
+ @ApiModelProperty("鐢宠鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐢宠鏃ユ湡")
+ private LocalDate applyDate;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃
+ */
+ @ApiModelProperty("瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃")
+ @Excel(name = "瀹℃牳鐘舵��",readConverterExp = "0=寰呭鏍�,1=瀹℃牳閫氳繃,2=瀹℃牳涓嶉�氳繃")
+ private Integer status;
+
+ /**
+ * 浠樻閲戦
+ */
+ @ApiModelProperty("浠樻閲戦")
+ @Excel(name = "浠樻閲戦")
+ private BigDecimal paymentAmount;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchaseInvoice.java b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchaseInvoice.java
new file mode 100644
index 0000000..c71ecd0
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchaseInvoice.java
@@ -0,0 +1,168 @@
+package com.ruoyi.account.pojo.purchase;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--杩涢」鍙戠エ
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:06:17
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_purchase_invoice")
+@ApiModel(value = "AccountPurchaseInvoice瀵硅薄", description = "璐㈠姟绠＄悊--杩涢」鍙戠エ")
+public class AccountPurchaseInvoice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 鍙戠エ鍙风爜
+ */
+ @ApiModelProperty("鍙戠エ鍙风爜")
+ @Excel(name = "鍙戠エ鍙风爜")
+ private String invoiceNumber;
+
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty("绋庣巼")
+ @Excel(name = "绋庣巼")
+ private Integer taxRate;
+
+ /**
+ * 鍙戠エ绫诲瀷
+ */
+ @ApiModelProperty("鍙戠エ绫诲瀷")
+ @Excel(name = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ /**
+ * 寮�绁ㄦ棩鏈�
+ */
+ @ApiModelProperty("寮�绁ㄦ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�绁ㄦ棩鏈�")
+ private LocalDate issueDate;
+
+ /**
+ * 閲戦(涓嶅惈绋�)
+ */
+ @ApiModelProperty("閲戦(涓嶅惈绋�)")
+ @Excel(name = "閲戦(涓嶅惈绋�)")
+ private BigDecimal taxExclusivelPrice;
+
+ /**
+ * 绋庨
+ */
+ @ApiModelProperty("绋庨")
+ @Excel(name = "绋庨")
+ private BigDecimal taxPrice;
+
+ /**
+ * 浠风◣鍚堣
+ */
+ @ApiModelProperty("浠风◣鍚堣")
+ @Excel(name = "浠风◣鍚堣")
+ private BigDecimal taxInclusivePrice;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鍙戠エ鍐呭
+ */
+ @ApiModelProperty("鍙戠エ鍐呭")
+ @Excel(name = "鍙戠エ鍐呭")
+ private String invoiceContent;
+
+ /**
+ * 渚涘簲鍟唅d
+ */
+ @ApiModelProperty("渚涘簲鍟唅d")
+ private Integer supplierId;
+
+ /**
+ * 鍏宠仈涓婁紶鐨勫彂绁ㄩ檮浠秈d
+ */
+ @ApiModelProperty("鍏宠仈涓婁紶鐨勫彂绁ㄩ檮浠秈d")
+ private Integer storageAttachmentId;
+
+ /**
+ * 鍏宠仈鍏ュ簱鍗昳d(澶氶��)
+ */
+ @ApiModelProperty("鍏宠仈鍏ュ簱鍗昳d(澶氶��)")
+ private String stockInRecordIds;
+
+ /**
+ * 鐘舵�� 0鍚敤 1绂佺敤
+ */
+ @ApiModelProperty("鐘舵�� 0鍚敤 1绂佺敤")
+ @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=浣滃簾")
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchasePayment.java b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchasePayment.java
new file mode 100644
index 0000000..7fc2d4e
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPurchasePayment.java
@@ -0,0 +1,127 @@
+package com.ruoyi.account.pojo.purchase;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鍗�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 04:14:51
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_purchase_payment")
+@ApiModel(value = "AccountPurchasePayment瀵硅薄", description = "璐㈠姟绠＄悊--浠樻鍗�")
+public class AccountPurchasePayment implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍏宠仈浠樻鐢宠id
+ */
+ @ApiModelProperty("鍏宠仈浠樻鐢宠id")
+ private Integer accountPaymentApplicationId;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 渚涘簲鍟唅d
+ */
+ @ApiModelProperty("渚涘簲鍟唅d")
+ private Integer supplierId;
+
+ /**
+ * 浠樻鏃ユ湡
+ */
+ @ApiModelProperty("浠樻鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浠樻鏃ユ湡")
+ private LocalDate paymentDate;
+
+ /**
+ * 浠樻鏂瑰紡
+ */
+ @ApiModelProperty("浠樻鏂瑰紡")
+ @Excel(name = "浠樻鏂瑰紡",dictType = "checkout_payment")
+ private String paymentMethod;
+
+ /**
+ * 浠樻閲戦
+ */
+ @ApiModelProperty("浠樻閲戦")
+ @Excel(name = "浠樻閲戦")
+ private BigDecimal paymentAmount;
+
+ /**
+ * 浠樻鍗曞彿
+ */
+ @ApiModelProperty("浠樻鍗曞彿")
+ @Excel(name = "浠樻鍗曞彿")
+ private String paymentNumber;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/sales/AccountInvoiceApplication.java b/src/main/java/com/ruoyi/account/pojo/sales/AccountInvoiceApplication.java
new file mode 100644
index 0000000..ed4b72a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/sales/AccountInvoiceApplication.java
@@ -0,0 +1,138 @@
+package com.ruoyi.account.pojo.sales;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--寮�绁ㄧ敵璇�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 01:38:32
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_invoice_application")
+@ApiModel(value = "AccountInvoiceApplication瀵硅薄", description = "璐㈠姟绠＄悊--寮�绁ㄧ敵璇�")
+public class AccountInvoiceApplication implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 瀹㈡埛id
+ */
+ @ApiModelProperty("瀹㈡埛id")
+ private Integer customerId;
+
+ /**
+ * 鍏宠仈鍑哄簱鍗昳d(澶氶��)
+ */
+ @ApiModelProperty("鍏宠仈鍑哄簱鍗昳d(澶氶��)")
+ private String stockOutRecordIds;
+
+ /**
+ * 寮�绁ㄧ敵璇峰崟鍙�
+ */
+ @ApiModelProperty("寮�绁ㄧ敵璇峰崟鍙�")
+ @Excel(name = "寮�绁ㄧ敵璇峰崟鍙�")
+ private String invoiceApplicationNo;
+
+ /**
+ * 鍙戠エ绫诲瀷
+ */
+ @ApiModelProperty("鍙戠エ绫诲瀷")
+ @Excel(name = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ /**
+ * 鐢宠鏃ユ湡
+ */
+ @ApiModelProperty("鐢宠鏃ユ湡")
+ @Excel(name = "鐢宠鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate applyDate;
+
+ /**
+ * 鍙戠エ鍐呭
+ */
+ @ApiModelProperty("鍙戠エ鍐呭")
+ @Excel(name = "鍙戠エ鍐呭")
+ private String invoiceContent;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃
+ */
+ @ApiModelProperty("瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃")
+ @Excel(name = "瀹℃牳鐘舵��",readConverterExp = "0=寰呭鏍�,1=瀹℃牳閫氳繃,2=瀹℃牳涓嶉�氳繃")
+ private Integer status;
+
+ @ApiModelProperty("寮�绁ㄩ噾棰�")
+ @Excel(name = "寮�绁ㄩ噾棰�")
+ private BigDecimal invoiceAmount;
+
+ @ApiModelProperty("绋庣巼")
+ @Excel(name = "绋庣巼")
+ private BigDecimal taxRate;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesCollection.java b/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesCollection.java
new file mode 100644
index 0000000..40ea9a8
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesCollection.java
@@ -0,0 +1,127 @@
+package com.ruoyi.account.pojo.sales;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--鏀舵鍗�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:49:56
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_sales_collection")
+@ApiModel(value = "AccountSalesCollection瀵硅薄", description = "璐㈠姟绠＄悊--鏀舵鍗�")
+public class AccountSalesCollection implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍏宠仈鍑哄簱鍗昳d(澶氶��)
+ */
+ @ApiModelProperty("鍏宠仈鍑哄簱鍗昳d(澶氶��)")
+ private String stockOutRecordIds;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 瀹㈡埛id
+ */
+ @ApiModelProperty("瀹㈡埛id")
+ private Integer customerId;
+
+ /**
+ * 鏀舵鏃ユ湡
+ */
+ @ApiModelProperty("鏀舵鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏀舵鏃ユ湡")
+ private LocalDate collectionDate;
+
+ /**
+ * 鏀舵閲戦
+ */
+ @ApiModelProperty("鏀舵閲戦")
+ @Excel(name = "鏀舵閲戦")
+ private BigDecimal collectionAmount;
+
+ /**
+ * 鏀舵鏂瑰紡
+ */
+ @ApiModelProperty("鏀舵鏂瑰紡")
+ @Excel(name = "鏀舵鏂瑰紡",dictType = "payment_methods")
+ private String collectionMethod;
+
+ /**
+ * 鏀舵鍗曞彿
+ */
+ @ApiModelProperty("鏀舵鍗曞彿")
+ @Excel(name = "鏀舵鍗曞彿")
+ private String collectionNumber;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesInvoice.java b/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesInvoice.java
new file mode 100644
index 0000000..7551cb3
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/sales/AccountSalesInvoice.java
@@ -0,0 +1,168 @@
+package com.ruoyi.account.pojo.sales;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--閿�椤瑰彂绁�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:10:20
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_sales_invoice")
+@ApiModel(value = "AccountSalesInvoice瀵硅薄", description = "璐㈠姟绠＄悊--閿�椤瑰彂绁�")
+public class AccountSalesInvoice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍏宠仈寮�绁ㄧ敵璇穒d
+ */
+ @ApiModelProperty("鍏宠仈寮�绁ㄧ敵璇穒d")
+ private Integer accountInvoiceApplicationId;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼浜�
+ */
+ @ApiModelProperty("淇敼浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 鍙戠エ鍙风爜
+ */
+ @ApiModelProperty("鍙戠エ鍙风爜")
+ @Excel(name = "鍙戠エ鍙风爜")
+ private String invoiceNumber;
+
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty("绋庣巼")
+ @Excel(name = "绋庣巼")
+ private BigDecimal taxRate;
+
+ /**
+ * 鍙戠エ绫诲瀷
+ */
+ @ApiModelProperty("鍙戠エ绫诲瀷")
+ @Excel(name = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ /**
+ * 寮�绁ㄦ棩鏈�
+ */
+ @ApiModelProperty("寮�绁ㄦ棩鏈�")
+ @Excel(name = "寮�绁ㄦ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ /**
+ * 閲戦(涓嶅惈绋�)
+ */
+ @ApiModelProperty("閲戦(涓嶅惈绋�)")
+ @Excel(name = "閲戦(涓嶅惈绋�)")
+ private BigDecimal taxExclusivelPrice;
+
+ /**
+ * 绋庨
+ */
+ @ApiModelProperty("绋庨")
+ @Excel(name = "绋庨")
+ private BigDecimal taxPrice;
+
+ /**
+ * 浠风◣鍚堣
+ */
+ @ApiModelProperty("浠风◣鍚堣")
+ @Excel(name = "浠风◣鍚堣")
+ private BigDecimal taxInclusivePrice;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鍙戠エ鍐呭
+ */
+ @ApiModelProperty("鍙戠エ鍐呭")
+ @Excel(name = "鍙戠エ鍐呭")
+ private String invoiceContent;
+
+ /**
+ * 瀹㈡埛id
+ */
+ @ApiModelProperty("瀹㈡埛id")
+ private Integer customerId;
+
+ /**
+ * 鍏宠仈涓婁紶鐨勫彂绁ㄩ檮浠秈d
+ */
+ @ApiModelProperty("鍏宠仈涓婁紶鐨勫彂绁ㄩ檮浠秈d")
+ private Integer storageAttachmentId;
+
+ /**
+ * 鐘舵�� 0鍚敤 1绂佺敤
+ */
+ @ApiModelProperty("鐘舵�� 0鍚敤 1绂佺敤")
+ @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=浣滃簾")
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/account/service/AccountStatementDetailsService.java b/src/main/java/com/ruoyi/account/service/AccountStatementDetailsService.java
new file mode 100644
index 0000000..c9a4928
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/AccountStatementDetailsService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--瀵硅处鍗曟槑缁� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 10:12:42
+ */
+public interface AccountStatementDetailsService extends IService<AccountStatementDetails> {
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/AccountStatementService.java b/src/main/java/com/ruoyi/account/service/AccountStatementService.java
new file mode 100644
index 0000000..a0bc218
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/AccountStatementService.java
@@ -0,0 +1,32 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.bean.dto.StatementAccountDto;
+import com.ruoyi.account.bean.vo.StatementAccountVo;
+import com.ruoyi.account.pojo.AccountStatement;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 09:42:47
+ */
+public interface AccountStatementService extends IService<AccountStatement> {
+
+ StatementAccountVo getAccountStatementDetailsByMonth(StatementAccountDto statementAccountDto);
+
+ boolean addAccountStatement(StatementAccountVo statementAccountVo);
+
+ boolean deleteAccountStatement(List<Long> ids);
+
+ IPage<StatementAccountVo> listPageAccountStatement(Page page, StatementAccountDto statementAccountDto);
+
+ void exportAccountStatement(HttpServletResponse response, StatementAccountDto statementAccountDto);
+}
diff --git a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java b/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
index 7d2384f..eb1c83b 100644
--- a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
+++ b/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.BorrowInfo;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import java.util.List;
@@ -17,11 +17,11 @@
*/
public interface BorrowInfoService extends IService<BorrowInfo> {
- R<?> listPage(Page page, BorrowInfo borrowInfo);
+ AjaxResult listPage(Page page, BorrowInfo borrowInfo);
- R<?> add(BorrowInfo borrowInfo);
+ AjaxResult add(BorrowInfo borrowInfo);
- R<?> updateBorrowInfo(BorrowInfo borrowInfo);
+ AjaxResult updateBorrowInfo(BorrowInfo borrowInfo);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountStatementDetailsServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountStatementDetailsServiceImpl.java
new file mode 100644
index 0000000..6d1ba1c
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountStatementDetailsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.mapper.AccountStatementDetailsMapper;
+import com.ruoyi.account.service.AccountStatementDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--瀵硅处鍗曟槑缁� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 10:12:42
+ */
+@Service
+public class AccountStatementDetailsServiceImpl extends ServiceImpl<AccountStatementDetailsMapper, AccountStatementDetails> implements AccountStatementDetailsService {
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountStatementServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountStatementServiceImpl.java
new file mode 100644
index 0000000..411d595
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountStatementServiceImpl.java
@@ -0,0 +1,298 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.StatementAccountDto;
+import com.ruoyi.account.bean.dto.purchase.PurchaseInboundDto;
+import com.ruoyi.account.bean.dto.purchase.PurchaseReturnDto;
+import com.ruoyi.account.bean.dto.sales.SalesOutboundDto;
+import com.ruoyi.account.bean.dto.sales.SalesReturnDto;
+import com.ruoyi.account.bean.vo.StatementAccountVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.bean.vo.sales.SalesReturnVo;
+import com.ruoyi.account.mapper.AccountStatementDetailsMapper;
+import com.ruoyi.account.mapper.AccountStatementMapper;
+import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;
+import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;
+import com.ruoyi.account.pojo.AccountStatement;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.ruoyi.account.service.AccountStatementService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.stock.mapper.StockInRecordMapper;
+import com.ruoyi.stock.mapper.StockOutRecordMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 09:42:47
+ */
+@Service
+@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
+public class AccountStatementServiceImpl extends ServiceImpl<AccountStatementMapper, AccountStatement> implements AccountStatementService {
+
+ private final AccountStatementMapper accountStatementMapper;
+ private final AccountSalesCollectionMapper accountSalesCollectionMapper;
+ private final StockOutRecordMapper stockOutRecordMapper;
+ private final StockInRecordMapper stockInRecordMapper;
+ private final ReturnManagementMapper returnManagementMapper;
+ private final AccountStatementDetailsMapper accountStatementDetailsMapper;
+ private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;
+ private final PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ private static final DateTimeFormatter CODE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMdd");
+
+ @Override
+ public StatementAccountVo getAccountStatementDetailsByMonth(StatementAccountDto statementAccountDto) {
+ //瀵硅处鏈堜唤杞崲鎴愬紑濮嬫棩鏈熷拰缁撴潫鏃ユ湡鍖洪棿
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ YearMonth yearMonth = YearMonth.parse(statementAccountDto.getStatementMonth(), formatter);
+ statementAccountDto.setStartDate(yearMonth.atDay(1));
+ statementAccountDto.setEndDate(yearMonth.atEndOfMonth());
+ if (statementAccountDto.getAccountType() == 1){
+ //搴旀敹瀵硅处--Customer
+ return getAccountStatementDetailsByCustomerAndMonth(statementAccountDto);
+ }else {
+ //搴斾粯瀵硅处--SupplierManage
+ return getAccountStatementDetailsBySupplierAndMonth(statementAccountDto);
+ }
+ }
+
+ @Override
+ public boolean addAccountStatement(StatementAccountVo statementAccountVo) {
+ //鍚屼竴瀹㈡埛鎴栬�呭悓涓�渚涘簲鍟�,涓�涓湀浠藉彧鑳芥湁涓�涓璐﹀崟
+ List<AccountStatement> accountStatements = accountStatementMapper.selectList(Wrappers.<AccountStatement>lambdaQuery()
+ .eq(AccountStatement::getStatementMonth, statementAccountVo.getStatementMonth())
+ .eq(AccountStatement::getAccountType, statementAccountVo.getAccountType())
+ .eq(AccountStatement::getCustomerId, statementAccountVo.getCustomerId()));
+ if (CollectionUtils.isNotEmpty(accountStatements)){
+ throw new ServiceException("鍚屼竴瀹㈡埛鎴栬�呭悓涓�渚涘簲鍟�,涓�涓湀浠藉彧鑳芥湁涓�涓璐﹀崟");
+ }
+ AccountStatement accountStatement = new AccountStatement();
+ BeanUtils.copyProperties(statementAccountVo, accountStatement);
+ accountStatement.setStatementNumber(genStatementAccountNo());
+ boolean save = save(accountStatement);
+ statementAccountVo.getAccountStatementDetails().stream().forEach(accountStatementDetails -> {
+ accountStatementDetails.setAccountStatementId(accountStatement.getId());
+ //娣诲姞瀵硅处鍗曟槑缁�
+ accountStatementDetailsMapper.insert(accountStatementDetails);
+ });
+ return save;
+ }
+
+ @Override
+ public boolean deleteAccountStatement(List<Long> ids) {
+ //鍒犻櫎瀵硅处鍗曟槑缁�
+ accountStatementDetailsMapper.delete(Wrappers.<AccountStatementDetails>lambdaQuery().in(AccountStatementDetails::getAccountStatementId, ids));
+ return removeByIds(ids);
+ }
+
+ @Override
+ public IPage<StatementAccountVo> listPageAccountStatement(Page page, StatementAccountDto statementAccountDto) {
+ return accountStatementMapper.listPageAccountStatement(page, statementAccountDto);
+ }
+
+ @Override
+ public void exportAccountStatement(HttpServletResponse response, StatementAccountDto statementAccountDto) {
+ List<StatementAccountVo> list = accountStatementMapper.listPageAccountStatement(new Page(1,-1),statementAccountDto).getRecords();
+ ExcelUtil<StatementAccountVo> util = new ExcelUtil<>(StatementAccountVo.class);
+ util.exportExcel(response, list , "瀵硅处鍗�");
+ }
+
+ //鏍规嵁瀹㈡埛鍜屾湀浠借幏鍙栧璐﹁鎯�(閿�鍞�)
+ private StatementAccountVo getAccountStatementDetailsByCustomerAndMonth(StatementAccountDto statementAccountDto) {
+ StatementAccountVo statementAccountVo = new StatementAccountVo();
+ statementAccountVo.setAccountType(1);//搴旀敹瀵硅处
+ List<AccountStatementDetails> accountStatementDetailsList = new ArrayList<>();
+ /*鏌ヨ鍑哄簱鏄庣粏*/
+ SalesOutboundDto salesOutboundDto = new SalesOutboundDto();
+ salesOutboundDto.setCustomerId(statementAccountDto.getCustomerId());
+ salesOutboundDto.setStartDate(statementAccountDto.getStartDate());
+ salesOutboundDto.setEndDate(statementAccountDto.getEndDate());
+ List<SalesOutboundVo> salesOutboundVos = stockOutRecordMapper.listPageAccountSales(new Page(1, -1), salesOutboundDto).getRecords();
+ salesOutboundVos.stream().forEach(salesOutboundVo -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=鍑哄簱鏃ユ湡
+ accountStatementDetails.setOccurrenceDate(salesOutboundVo.getShippingDate());
+ //鍗曟嵁缂栧彿=鍑哄簱鍗曞彿
+ accountStatementDetails.setReceiptNumber(salesOutboundVo.getOutboundBatches());
+ //绫诲瀷=鍑哄簱
+ accountStatementDetails.setType(1);
+ //閲戦=鍑哄簱閲戦
+ accountStatementDetails.setAmount(salesOutboundVo.getOutboundAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("浜у搧閿�鍞嚭搴擄紝浜у搧锛�"+salesOutboundVo.getProductName());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ /*鏌ヨ鏀舵鏄庣粏*/
+ List<AccountSalesCollection> accountSalesCollections = accountSalesCollectionMapper.selectList(Wrappers.<AccountSalesCollection>lambdaQuery()
+ .eq(AccountSalesCollection::getCustomerId, statementAccountDto.getCustomerId())
+ .between(AccountSalesCollection::getCollectionDate, statementAccountDto.getStartDate(), statementAccountDto.getEndDate()));
+ accountSalesCollections.stream().forEach(accountSalesCollection -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=鏀舵鏃ユ湡
+ accountStatementDetails.setOccurrenceDate(accountSalesCollection.getCollectionDate());
+ //鍗曟嵁缂栧彿=鏀舵鍗曞彿
+ accountStatementDetails.setReceiptNumber(accountSalesCollection.getCollectionNumber());
+ //绫诲瀷=鏀舵
+ accountStatementDetails.setType(3);
+ //閲戦=鏀舵閲戦
+ accountStatementDetails.setAmount(accountSalesCollection.getCollectionAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("瀹㈡埛鍥炴锛屽娉細"+accountSalesCollection.getRemark());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ /*鏌ヨ閫�璐ф槑缁�*/
+ SalesReturnDto salesReturnDto = new SalesReturnDto();
+ salesReturnDto.setCustomerId(statementAccountDto.getCustomerId());
+ salesReturnDto.setStartDate(statementAccountDto.getStartDate());
+ salesReturnDto.setEndDate(statementAccountDto.getEndDate());
+ List<SalesReturnVo> salesReturnVos = returnManagementMapper.listPageAccountSalesReturn(new Page(1, -1), salesReturnDto).getRecords();
+ salesReturnVos.stream().forEach(salesReturnVo -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=閫�璐ф棩鏈�
+ accountStatementDetails.setOccurrenceDate(salesReturnVo.getMakeTime().toLocalDate());
+ //鍗曟嵁缂栧彿=閫�璐у崟鍙�
+ accountStatementDetails.setReceiptNumber(salesReturnVo.getReturnNo());
+ //绫诲瀷=閫�璐�
+ accountStatementDetails.setType(5);
+ //閲戦=閫�娆鹃噾棰�
+ accountStatementDetails.setAmount(salesReturnVo.getRefundAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("浜у搧閫�璐э紝鍘熷洜锛�"+salesReturnVo.getReturnReason());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ //鏈熷垵浣欓=涓婁釜鏈堢殑鏈熸湯浣欓
+ statementAccountVo.setOpeningBalance(BigDecimal.ZERO);
+ List<AccountStatement> accountStatements = accountStatementMapper.selectList(Wrappers.<AccountStatement>lambdaQuery()
+ .eq(AccountStatement::getAccountType, 1)
+ .eq(AccountStatement::getCustomerId, statementAccountDto.getCustomerId())
+ .eq(AccountStatement::getStatementMonth,
+ YearMonth.parse(statementAccountDto.getStatementMonth()).minusMonths(1).toString()));
+ if (CollectionUtils.isNotEmpty(accountStatements)){
+ statementAccountVo.setOpeningBalance(accountStatements.get(accountStatements.size() - 1).getClosingBalance());
+ }
+ //鏈湡搴旀敹=鍑哄簱-閫�璐ч噾棰濈疮璁�
+ statementAccountVo.setCurrentPlan(salesOutboundVos.stream().map(SalesOutboundVo::getOutboundAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .subtract(salesReturnVos.stream().map(SalesReturnVo::getRefundAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ //鏈湡鏀舵=鏀舵閲戦绱
+ statementAccountVo.setCurrentActually(accountSalesCollections.stream().map(AccountSalesCollection::getCollectionAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+ //鏈熸湯浣欓=鏈熷垵+搴旀敹-鏀舵
+ statementAccountVo.setClosingBalance(statementAccountVo.getOpeningBalance().add(statementAccountVo.getCurrentPlan()).subtract(statementAccountVo.getCurrentActually()));
+ statementAccountVo.setAccountStatementDetails(accountStatementDetailsList);
+ return statementAccountVo;
+ }
+
+ //鏍规嵁渚涘簲鍟嗗拰鏈堜唤鑾峰彇瀵硅处璇︽儏(閲囪喘)
+ private StatementAccountVo getAccountStatementDetailsBySupplierAndMonth(StatementAccountDto statementAccountDto) {
+ StatementAccountVo statementAccountVo = new StatementAccountVo();
+ statementAccountVo.setAccountType(2);//搴斾粯瀵硅处
+ List<AccountStatementDetails> accountStatementDetailsList = new ArrayList<>();
+ /*鏌ヨ鍏ュ簱鏄庣粏*/
+ PurchaseInboundDto purchaseInboundDto = new PurchaseInboundDto();
+ purchaseInboundDto.setSupplierId(statementAccountDto.getCustomerId());
+ purchaseInboundDto.setStartDate(statementAccountDto.getStartDate());
+ purchaseInboundDto.setEndDate(statementAccountDto.getEndDate());
+ List<PurchaseInboundVo> purchaseInboundVos = stockInRecordMapper.listPageAccountPurchase(new Page(1, -1), purchaseInboundDto).getRecords();
+ purchaseInboundVos.stream().forEach(purchaseInboundVo -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=鍏ュ簱鏃ユ湡
+ accountStatementDetails.setOccurrenceDate(purchaseInboundVo.getInboundDate());
+ //鍗曟嵁缂栧彿=鍏ュ簱鍗曞彿
+ accountStatementDetails.setReceiptNumber(purchaseInboundVo.getInboundBatches());
+ //绫诲瀷=鍏ュ簱
+ accountStatementDetails.setType(2);
+ //閲戦=鍏ュ簱閲戦
+ accountStatementDetails.setAmount(purchaseInboundVo.getInboundAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("浜у搧閲囪喘鍏ュ簱锛屼骇鍝侊細"+purchaseInboundVo.getProductName());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ /*鏌ヨ浠樻鏄庣粏*/
+ List<AccountPurchasePayment> accountPurchasePayments = accountPurchasePaymentMapper.selectList(Wrappers.<AccountPurchasePayment>lambdaQuery()
+ .eq(AccountPurchasePayment::getSupplierId, statementAccountDto.getCustomerId())
+ .between(AccountPurchasePayment::getPaymentDate, statementAccountDto.getStartDate(), statementAccountDto.getEndDate()));
+ accountPurchasePayments.stream().forEach(accountPurchasePayment -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=浠樻鏃ユ湡
+ accountStatementDetails.setOccurrenceDate(accountPurchasePayment.getPaymentDate());
+ //鍗曟嵁缂栧彿=浠樻鍗曞彿
+ accountStatementDetails.setReceiptNumber(accountPurchasePayment.getPaymentNumber());
+ //绫诲瀷=浠樻
+ accountStatementDetails.setType(4);
+ //閲戦=浠樻閲戦
+ accountStatementDetails.setAmount(accountPurchasePayment.getPaymentAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("鏀粯璐ф锛屽娉細"+accountPurchasePayment.getRemark());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ /*鏌ヨ閫�璐ф槑缁�*/
+ PurchaseReturnDto purchaseReturnDto = new PurchaseReturnDto();
+ purchaseReturnDto.setSupplierId(statementAccountDto.getCustomerId());
+ purchaseReturnDto.setStartDate(statementAccountDto.getStartDate());
+ purchaseReturnDto.setEndDate(statementAccountDto.getEndDate());
+ List<PurchaseReturnVo> purchaseReturnVos = purchaseReturnOrdersMapper.listPageAccountPurchaseReturn(new Page(1, -1), purchaseReturnDto).getRecords();
+ purchaseReturnVos.stream().forEach(purchaseReturnVo -> {
+ AccountStatementDetails accountStatementDetails = new AccountStatementDetails();
+ //鏁版嵁鏃ユ湡=閫�璐ф棩鏈�
+ accountStatementDetails.setOccurrenceDate(purchaseReturnVo.getPreparedAt().toLocalDate());
+ //鍗曟嵁缂栧彿=閫�璐у崟鍙�
+ accountStatementDetails.setReceiptNumber(purchaseReturnVo.getReturnNo());
+ //绫诲瀷=閫�璐�
+ accountStatementDetails.setType(5);
+ //閲戦=閫�娆鹃噾棰�
+ accountStatementDetails.setAmount(purchaseReturnVo.getTotalAmount());
+ //澶囨敞
+ accountStatementDetails.setRemark("浜у搧閫�璐э紝閫�璐ф柟寮忥細"+purchaseReturnVo.getReturnType());
+ accountStatementDetailsList.add(accountStatementDetails);
+ });
+ //鏈熷垵浣欓=涓婁釜鏈堢殑鏈熸湯浣欓
+ statementAccountVo.setOpeningBalance(BigDecimal.ZERO);
+ List<AccountStatement> accountStatements = accountStatementMapper.selectList(Wrappers.<AccountStatement>lambdaQuery()
+ .eq(AccountStatement::getAccountType, 2)
+ .eq(AccountStatement::getCustomerId, statementAccountDto.getCustomerId())
+ .eq(AccountStatement::getStatementMonth,
+ YearMonth.parse(statementAccountDto.getStatementMonth()).minusMonths(1).toString()));
+ if (CollectionUtils.isNotEmpty(accountStatements)){
+ statementAccountVo.setOpeningBalance(accountStatements.get(accountStatements.size() - 1).getClosingBalance());
+ }
+ //鏈湡搴斾粯=鍏ュ簱-閫�璐ч噾棰濈疮璁�
+ statementAccountVo.setCurrentPlan(purchaseInboundVos.stream().map(PurchaseInboundVo::getInboundAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .subtract(purchaseReturnVos.stream().map(PurchaseReturnVo::getTotalAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ //鏈湡浠樻=浠樻閲戦绱
+ statementAccountVo.setCurrentActually(accountPurchasePayments.stream().map(AccountPurchasePayment::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+ //鏈熸湯浣欓=鏈熷垵+搴旀敹-鏀舵
+ statementAccountVo.setClosingBalance(statementAccountVo.getOpeningBalance().add(statementAccountVo.getCurrentPlan()).subtract(statementAccountVo.getCurrentActually()));
+ statementAccountVo.setAccountStatementDetails(accountStatementDetailsList);
+ return statementAccountVo;
+ }
+
+ private String genStatementAccountNo() {
+ return "DZ" + LocalDateTime.now().format(CODE_TIME_FORMATTER) + new Random().nextInt(10);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
index 7df89e6..ab38285 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
@@ -10,7 +10,7 @@
import com.ruoyi.account.pojo.BorrowInfo;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
@@ -43,7 +43,7 @@
private final ProcurementRecordMapper procurementRecordMapper;
private final ProcurementRecordOutMapper procurementRecordOutMapper;
- public R<?> total(Integer year) {
+ public AjaxResult total(Integer year) {
Map<String,Object> map = new HashMap<>();
map.put("deprAmount",0); // 鎶樻棫閲戦
map.put("deviceTotal",0); // 璁惧鎬绘暟
@@ -150,7 +150,7 @@
});
}
map.put("inventoryValue",procurementRecordTotal.add(customStorageTotal));
- return R.ok(map);
+ return AjaxResult.success( map);
}
/**
@@ -245,7 +245,7 @@
return totalDepreciation.setScale(2, BigDecimal.ROUND_HALF_UP);
}
- public R<?> deviceTypeDistribution(Integer year) {
+ public AjaxResult deviceTypeDistribution(Integer year) {
// 2. 缁勮杩斿洖VO
DeviceTypeDistributionVO vo = new DeviceTypeDistributionVO();
List<DeviceTypeDetail> details = deviceLedgerMapper.getDeviceTypeDistributionByYear( year);
@@ -265,10 +265,10 @@
.collect(Collectors.toList()));
vo.setTotalCount(vo.getCategories().size());
}
- return R.ok(vo);
+ return AjaxResult.success(vo);
}
- public R<?> calculateDepreciation(Page page, Integer year) {
+ public AjaxResult calculateDepreciation(Page page, Integer year) {
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
deviceLedgerLambdaQueryWrapper.like(DeviceLedger::getCreateTime,year)
.eq(DeviceLedger::getIsDepr,1);
@@ -277,6 +277,6 @@
record.setDeprAmount(calculatePreciseDepreciation(record));
record.setNetValue(record.getTaxIncludingPriceTotal().subtract(record.getDeprAmount()));
}
- return R.ok(deviceLedgerIPage);
+ return AjaxResult.success(deviceLedgerIPage);
}
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
index 950237f..773799d 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.account.service.BorrowInfoService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@
private final AccountExpenseService accountExpenseService;
@Override
- public R<?> listPage(Page page, BorrowInfo borrowInfo) {
+ public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(borrowInfo != null){
if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
@@ -51,11 +51,11 @@
borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
}
}
- return R.ok(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
+ return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
}
@Override
- public R<?> add(BorrowInfo borrowInfo) {
+ public AjaxResult add(BorrowInfo borrowInfo) {
int insert = borrowInfoMapper.insert(borrowInfo);
if(insert > 0){
// 娣诲姞鎴愬姛锛岃繘鍏ユ敹鍏ョ鐞�
@@ -70,13 +70,13 @@
accountIncome.setInputTime(DateUtils.getNowDate());
accountIncome.setInputUser(borrowInfo.getBorrowerName());
accountIncomeService.save(accountIncome);
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
- return R.ok(null, "娣诲姞澶辫触");
+ return AjaxResult.success("娣诲姞澶辫触");
}
@Override
- public R<?> updateBorrowInfo(BorrowInfo borrowInfo) {
+ public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
int update = borrowInfoMapper.updateById(borrowInfo);
if(update > 0){
// 淇敼鎴愬姛锛屼慨鏀规敹鍏ョ鐞�
@@ -103,13 +103,13 @@
accountExpense.setInputUser(borrowInfo.getBorrowerName());
accountExpenseService.save(accountExpense);
}
- return R.ok(null, "淇敼鎴愬姛");
+ return AjaxResult.success("淇敼鎴愬姛");
}
- return R.ok(null, "淇敼澶辫触");
+ return AjaxResult.success("淇敼澶辫触");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
int delete = borrowInfoMapper.deleteBatchIds(ids);
if(delete > 0){
// 鍒犻櫎鎴愬姛锛屽垹闄ゆ敹鍏ョ鐞�
@@ -120,8 +120,8 @@
accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
.in(AccountExpense::getBusinessId, ids)
.eq(AccountExpense::getBusinessType, 2));
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
- return R.ok(null, "鍒犻櫎澶辫触");
+ return AjaxResult.success("鍒犻櫎澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPaymentApplicationServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPaymentApplicationServiceImpl.java
new file mode 100644
index 0000000..9eecc49
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPaymentApplicationServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ruoyi.account.service.impl.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.purchase.AccountPaymentApplicationDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.mapper.purchase.AccountPaymentApplicationMapper;
+import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.account.service.purchase.AccountPaymentApplicationService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountPaymentApplicationServiceImpl extends ServiceImpl<AccountPaymentApplicationMapper, AccountPaymentApplication> implements AccountPaymentApplicationService {
+
+ private final AccountPaymentApplicationMapper accountPaymentApplicationMapper;
+ private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;
+ private static final DateTimeFormatter CODE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+
+ @Override
+ public IPage<AccountPaymentApplicationVo> listPageAccountPaymentApplication(Page page, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+ return accountPaymentApplicationMapper.listPageAccountPaymentApplication(page, accountPaymentApplicationDto);
+ }
+
+ @Override
+ public List<PurchaseInboundVo> getInboundBatchesBySupplier(Integer supplierId) {
+ return accountPaymentApplicationMapper.getInboundBatchesBySupplier(supplierId);
+ }
+
+ @Override
+ public boolean addAccountPaymentApplication(AccountPaymentApplication accountPaymentApplication) {
+ if (StringUtils.isEmpty(accountPaymentApplication.getInvoiceApplicationNo())) {
+ accountPaymentApplication.setInvoiceApplicationNo(genPaymentApplicationNo());
+ }
+ String stockInRecordIds= accountPaymentApplication.getStockInRecordIds();
+ if (stockInRecordIds != null && !stockInRecordIds.isEmpty()) {
+ List<Long> ids = Arrays.stream(stockInRecordIds.split(","))
+ .map(Long::valueOf)
+ .toList();
+ if (accountPaymentApplicationMapper.existsByStockInRecordId(ids)){
+ throw new ServiceException("瀛樺湪閲嶅鐨勫叆搴撳崟");
+ }
+ }
+ return save(accountPaymentApplication);
+ }
+
+ @Override
+ public boolean deleteAccountPaymentApplication(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new ServiceException("鍒犻櫎澶辫触锛岃閫夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ }
+ //鍒ゆ柇鏄惁宸茬粡鏈夊搴旂殑浠樻鍗�,濡傛灉鏈夊垯鏃犳硶鍒犻櫎
+ List<AccountPurchasePayment> accountPurchasePayments = accountPurchasePaymentMapper.selectList(Wrappers.<AccountPurchasePayment>lambdaQuery().in(AccountPurchasePayment::getAccountPaymentApplicationId, ids));
+ if (CollectionUtils.isNotEmpty(accountPurchasePayments)){
+ throw new ServiceException("鍒犻櫎澶辫触锛屽凡缁忔湁鍏宠仈鐨勪粯娆惧崟");
+ }
+ //鍒犻櫎寮�绁ㄧ敵璇�
+ return removeBatchByIds(ids);
+ }
+
+ @Override
+ public void exportAccountPaymentApplication(HttpServletResponse response, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+ List<AccountPaymentApplicationVo> list = accountPaymentApplicationMapper.listPageAccountPaymentApplication(new Page(1,-1),accountPaymentApplicationDto).getRecords();
+ ExcelUtil<AccountPaymentApplicationVo> util = new ExcelUtil<>(AccountPaymentApplicationVo.class);
+ util.exportExcel(response, list , "浠樻鐢宠");
+ }
+
+ private String genPaymentApplicationNo() {
+ return "FK" + LocalDateTime.now().format(CODE_TIME_FORMATTER) + new Random().nextInt(10);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchaseInvoiceServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchaseInvoiceServiceImpl.java
new file mode 100644
index 0000000..5ca2efe
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchaseInvoiceServiceImpl.java
@@ -0,0 +1,59 @@
+package com.ruoyi.account.service.impl.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchaseInvoiceDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchaseInvoiceVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.mapper.purchase.AccountPurchaseInvoiceMapper;
+import com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice;
+import com.ruoyi.account.service.purchase.AccountPurchaseInvoiceService;
+import com.ruoyi.basic.mapper.StorageAttachmentMapper;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--杩涢」鍙戠エ 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:06:17
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountPurchaseInvoiceServiceImpl extends ServiceImpl<AccountPurchaseInvoiceMapper, AccountPurchaseInvoice> implements AccountPurchaseInvoiceService {
+
+ private final AccountPurchaseInvoiceMapper accountPurchaseInvoiceMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
+
+ @Override
+ public IPage<AccountPurchaseInvoiceVo> listPageAccountPurchaseInvoice(Page page, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto) {
+ return accountPurchaseInvoiceMapper.listPageAccountPurchaseInvoice(page, accountPurchaseInvoiceDto);
+ }
+
+ @Override
+ public boolean deleteAccountPurchaseInvoice(List<Long> ids) {
+ List<AccountPurchaseInvoice> accountPurchaseInvoices = accountPurchaseInvoiceMapper.selectByIds(ids);
+ //鍒犻櫎闄勪欢
+ storageAttachmentMapper.deleteBatchIds(accountPurchaseInvoices.stream().map(AccountPurchaseInvoice::getStorageAttachmentId).toList());
+ return removeBatchByIds(ids);
+ }
+
+ @Override
+ public void exportAccountPurchaseInvoice(HttpServletResponse response, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto) {
+ List<AccountPurchaseInvoiceVo> list = accountPurchaseInvoiceMapper.listPageAccountPurchaseInvoice(new Page(1,-1),accountPurchaseInvoiceDto).getRecords();
+ ExcelUtil<AccountPurchaseInvoiceVo> util = new ExcelUtil<>(AccountPurchaseInvoiceVo.class);
+ util.exportExcel(response, list , "杩涢」鍙戠エ");
+ }
+
+ @Override
+ public List<PurchaseInboundVo> getInboundBatchesBySupplier(Integer supplierId) {
+ return accountPurchaseInvoiceMapper.getInboundBatchesBySupplier(supplierId);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchasePaymentServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchasePaymentServiceImpl.java
new file mode 100644
index 0000000..14936f2
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchasePaymentServiceImpl.java
@@ -0,0 +1,79 @@
+package com.ruoyi.account.service.impl.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchasePaymentDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo;
+import com.ruoyi.account.mapper.AccountStatementDetailsMapper;
+import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.account.service.purchase.AccountPurchasePaymentService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鍗� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 04:14:51
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountPurchasePaymentServiceImpl extends ServiceImpl<AccountPurchasePaymentMapper, AccountPurchasePayment> implements AccountPurchasePaymentService {
+
+ private static final DateTimeFormatter CODE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+ private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;
+ private final AccountStatementDetailsMapper accountStatementDetailsMapper;
+
+ @Override
+ public IPage<AccountPurchasePaymentVo> listPageAccountPurchasePayment(Page page, AccountPurchasePaymentDto accountPurchasePaymentDto) {
+ return accountPurchasePaymentMapper.listPageAccountPurchasePayment(page, accountPurchasePaymentDto);
+ }
+
+ @Override
+ public boolean addAccountPurchasePayment(AccountPurchasePayment accountPurchasePayment) {
+ if (StringUtils.isEmpty(accountPurchasePayment.getPaymentNumber())) {
+ accountPurchasePayment.setPaymentNumber(genAccountPurchasePaymentNo());
+ }
+ return save(accountPurchasePayment);
+ }
+
+ @Override
+ public void exportAccountPurchasePayment(HttpServletResponse response, AccountPurchasePaymentDto accountPurchasePaymentDto) {
+ List<AccountPurchasePaymentVo> list = accountPurchasePaymentMapper.listPageAccountPurchasePayment(new Page(1,-1),accountPurchasePaymentDto).getRecords();
+ ExcelUtil<AccountPurchasePaymentVo> util = new ExcelUtil<>(AccountPurchasePaymentVo.class);
+ util.exportExcel(response, list , "浠樻鍗�");
+ }
+
+ @Override
+ public boolean deleteAccountPurchasePayment(List<Long> ids) {
+ //濡傛灉璇ヤ粯娆惧崟宸茬粡鐢熸垚瀵硅处鍗曞垯鏃犳硶鍒犻櫎
+ List<AccountPurchasePayment> accountPurchasePayments = accountPurchasePaymentMapper.selectByIds(ids);
+ List<String> strings = accountPurchasePayments.stream().map(AccountPurchasePayment::getPaymentNumber).toList();
+ List<AccountStatementDetails> accountStatementDetails = accountStatementDetailsMapper.selectList(Wrappers.<AccountStatementDetails>lambdaQuery()
+ .in(AccountStatementDetails::getReceiptNumber, strings));
+ if (CollectionUtils.isNotEmpty(accountStatementDetails)){
+ throw new ServiceException("璇ヤ粯娆惧崟宸茬粡鐢熸垚瀵硅处鍗曪紝鏃犳硶鍒犻櫎");
+ }
+ return removeByIds(ids);
+ }
+
+ private String genAccountPurchasePaymentNo() {
+ return "SK" + LocalDateTime.now().format(CODE_TIME_FORMATTER) + new Random().nextInt(10);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/sales/AccountInvoiceApplicationServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/sales/AccountInvoiceApplicationServiceImpl.java
new file mode 100644
index 0000000..74cec42
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/sales/AccountInvoiceApplicationServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ruoyi.account.service.impl.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.sales.AccountInvoiceApplicationDto;
+import com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.mapper.sales.AccountInvoiceApplicationMapper;
+import com.ruoyi.account.mapper.sales.AccountSalesInvoiceMapper;
+import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import com.ruoyi.account.service.sales.AccountInvoiceApplicationService;
+import com.ruoyi.basic.mapper.StorageAttachmentMapper;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--寮�绁ㄧ敵璇� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 01:38:32
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountInvoiceApplicationServiceImpl extends ServiceImpl<AccountInvoiceApplicationMapper, AccountInvoiceApplication> implements AccountInvoiceApplicationService {
+
+ private final AccountInvoiceApplicationMapper accountInvoiceApplicationMapper;
+ private final AccountSalesInvoiceMapper accountSalesInvoiceMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
+ private static final DateTimeFormatter CODE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+
+ @Override
+ public IPage<AccountInvoiceApplicationVo> listPageAccountInvoiceApplication(Page page, AccountInvoiceApplicationDto accountInvoiceApplicationDto) {
+ return accountInvoiceApplicationMapper.listPageAccountInvoiceApplication(page, accountInvoiceApplicationDto);
+ }
+
+ @Override
+ public List<SalesOutboundVo> getOutboundBatchesByCustomer(Integer customerId) {
+ return accountInvoiceApplicationMapper.getOutboundBatchesByCustomer(customerId);
+ }
+
+ @Override
+ public boolean addAccountInvoiceApplication(AccountInvoiceApplication accountInvoiceApplication) {
+ if (StringUtils.isEmpty(accountInvoiceApplication.getInvoiceApplicationNo())) {
+ accountInvoiceApplication.setInvoiceApplicationNo(genInvoiceApplicationNo());
+ }
+ String stockOutRecordIds = accountInvoiceApplication.getStockOutRecordIds();
+ if (stockOutRecordIds != null && !stockOutRecordIds.isEmpty()) {
+ List<Long> ids = Arrays.stream(stockOutRecordIds.split(","))
+ .map(Long::valueOf)
+ .toList();
+ if (accountInvoiceApplicationMapper.existsByStockOutRecordId(ids)){
+ throw new ServiceException("瀛樺湪閲嶅鐨勫嚭搴撳崟");
+ }
+ }
+ return save(accountInvoiceApplication);
+ }
+
+ @Override
+ public void exportAccountInvoiceApplication(HttpServletResponse response, AccountInvoiceApplicationDto accountInvoiceApplicationDto) {
+ List<AccountInvoiceApplicationVo> list = accountInvoiceApplicationMapper.listPageAccountInvoiceApplication(new Page(1,-1),accountInvoiceApplicationDto).getRecords();
+ ExcelUtil<AccountInvoiceApplicationVo> util = new ExcelUtil<>(AccountInvoiceApplicationVo.class);
+ util.exportExcel(response, list , "寮�绁ㄧ敵璇�");
+ }
+
+ @Override
+ public boolean deleteAccountInvoiceApplication(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new ServiceException("鍒犻櫎澶辫触锛岃閫夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ }
+ //鍒犻櫎鐩稿叧闄勪欢
+ List<AccountSalesInvoice> accountSalesInvoices = accountSalesInvoiceMapper.selectList(Wrappers.<AccountSalesInvoice>lambdaQuery().in(AccountSalesInvoice::getAccountInvoiceApplicationId,ids));
+ storageAttachmentMapper.deleteBatchIds(accountSalesInvoices.stream().map(AccountSalesInvoice::getStorageAttachmentId).toList());
+ //鍒犻櫎鐩稿叧鐨勯攢椤瑰彂绁�
+ accountSalesInvoiceMapper.delete(Wrappers.<AccountSalesInvoice>lambdaQuery().in(AccountSalesInvoice::getAccountInvoiceApplicationId,ids));
+ //鍒犻櫎寮�绁ㄧ敵璇�
+ return removeBatchByIds(ids);
+ }
+
+ private String genInvoiceApplicationNo() {
+ return "KP" + LocalDateTime.now().format(CODE_TIME_FORMATTER) + new Random().nextInt(10);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesCollectionServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesCollectionServiceImpl.java
new file mode 100644
index 0000000..5f328bc
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesCollectionServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ruoyi.account.service.impl.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.sales.AccountSalesCollectionDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.mapper.AccountStatementDetailsMapper;
+import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.ruoyi.account.service.sales.AccountSalesCollectionService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--鏀舵鍗� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:49:56
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountSalesCollectionServiceImpl extends ServiceImpl<AccountSalesCollectionMapper, AccountSalesCollection> implements AccountSalesCollectionService {
+
+ private final AccountSalesCollectionMapper accountSalesCollectionMapper;
+ private final AccountStatementDetailsMapper accountStatementDetailsMapper;
+ private static final DateTimeFormatter CODE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+
+
+ @Override
+ public IPage<AccountSalesCollectionVo> listPageAccountSalesCollection(Page page, AccountSalesCollectionDto accountSalesCollectionDto) {
+ return accountSalesCollectionMapper.listPageAccountSalesCollection(page, accountSalesCollectionDto);
+ }
+
+ @Override
+ public boolean addAccountSalesCollection(AccountSalesCollection accountSalesCollection) {
+ if (StringUtils.isEmpty(accountSalesCollection.getCollectionNumber())) {
+ accountSalesCollection.setCollectionNumber(genAccountSalesCollectionNo());
+ }
+ String stockOutRecordIds = accountSalesCollection.getStockOutRecordIds();
+ if (stockOutRecordIds != null && !stockOutRecordIds.isEmpty()) {
+ List<Long> ids = Arrays.stream(stockOutRecordIds.split(","))
+ .map(Long::valueOf)
+ .toList();
+ if (accountSalesCollectionMapper.existsByStockOutRecordId(ids)){
+ throw new ServiceException("瀛樺湪閲嶅鐨勫嚭搴撳崟");
+ }
+ }
+ return save(accountSalesCollection);
+ }
+
+ @Override
+ public void exportAccountSalesCollection(HttpServletResponse response, AccountSalesCollectionDto accountSalesCollectionDto) {
+ List<AccountSalesCollectionVo> list = accountSalesCollectionMapper.listPageAccountSalesCollection(new Page(1,-1),accountSalesCollectionDto).getRecords();
+ ExcelUtil<AccountSalesCollectionVo> util = new ExcelUtil<>(AccountSalesCollectionVo.class);
+ util.exportExcel(response, list , "鏀舵鍗�");
+ }
+
+ @Override
+ public boolean deleteAccountSalesCollection(List<Long> ids) {
+ //濡傛灉璇ユ敹娆惧崟宸茬粡鐢熸垚瀵硅处鍗曞垯鏃犳硶鍒犻櫎
+ List<AccountSalesCollection> accountSalesCollections = accountSalesCollectionMapper.selectByIds(ids);
+ List<String> strings = accountSalesCollections.stream().map(AccountSalesCollection::getCollectionNumber).toList();
+ List<AccountStatementDetails> accountStatementDetails = accountStatementDetailsMapper.selectList(Wrappers.<AccountStatementDetails>lambdaQuery()
+ .in(AccountStatementDetails::getReceiptNumber, strings));
+ if (CollectionUtils.isNotEmpty(accountStatementDetails)){
+ throw new ServiceException("璇ユ敹娆惧崟宸茬粡鐢熸垚瀵硅处鍗曪紝鏃犳硶鍒犻櫎");
+ }
+ return removeByIds(ids);
+ }
+
+ @Override
+ public List<SalesOutboundVo> getOutboundBatchesByCustomer(Integer customerId) {
+ return accountSalesCollectionMapper.getOutboundBatchesByCustomer(customerId);
+ }
+
+ private String genAccountSalesCollectionNo() {
+ return "SK" + LocalDateTime.now().format(CODE_TIME_FORMATTER) + new Random().nextInt(10);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesInvoiceServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesInvoiceServiceImpl.java
new file mode 100644
index 0000000..b2fe7e3
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesInvoiceServiceImpl.java
@@ -0,0 +1,53 @@
+package com.ruoyi.account.service.impl.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.bean.dto.sales.AccountSalesInvoiceDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo;
+import com.ruoyi.account.mapper.sales.AccountSalesInvoiceMapper;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import com.ruoyi.account.service.sales.AccountSalesInvoiceService;
+import com.ruoyi.basic.mapper.StorageAttachmentMapper;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--閿�椤瑰彂绁� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:10:20
+ */
+@Service
+@RequiredArgsConstructor
+public class AccountSalesInvoiceServiceImpl extends ServiceImpl<AccountSalesInvoiceMapper, AccountSalesInvoice> implements AccountSalesInvoiceService {
+
+ private final AccountSalesInvoiceMapper accountSalesInvoiceMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
+
+ @Override
+ public IPage<AccountSalesInvoiceVo> listPageAccountSalesInvoice(Page page, AccountSalesInvoiceDto accountSalesInvoiceDto) {
+ return accountSalesInvoiceMapper.listPageAccountSalesInvoice(page, accountSalesInvoiceDto);
+ }
+
+ @Override
+ public void exportAccountSalesInvoice(HttpServletResponse response, AccountSalesInvoiceDto accountSalesInvoiceDto) {
+ List<AccountSalesInvoiceVo> list = accountSalesInvoiceMapper.listPageAccountSalesInvoice(new Page(1,-1),accountSalesInvoiceDto).getRecords();
+ ExcelUtil<AccountSalesInvoiceVo> util = new ExcelUtil<>(AccountSalesInvoiceVo.class);
+ util.exportExcel(response, list , "閿�椤瑰彂绁�");
+ }
+
+ @Override
+ public boolean deleteAccountSalesInvoice(List<Long> ids) {
+ List<AccountSalesInvoice> accountSalesInvoices = accountSalesInvoiceMapper.selectByIds(ids);
+ //鍒犻櫎闄勪欢
+ storageAttachmentMapper.deleteBatchIds(accountSalesInvoices.stream().map(AccountSalesInvoice::getStorageAttachmentId).toList());
+ return removeBatchByIds(ids);
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/purchase/AccountPaymentApplicationService.java b/src/main/java/com/ruoyi/account/service/purchase/AccountPaymentApplicationService.java
new file mode 100644
index 0000000..c2c5c66
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/purchase/AccountPaymentApplicationService.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.service.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.bean.dto.purchase.AccountPaymentApplicationDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+public interface AccountPaymentApplicationService extends IService<AccountPaymentApplication> {
+
+ IPage<AccountPaymentApplicationVo> listPageAccountPaymentApplication(Page page, AccountPaymentApplicationDto accountPaymentApplicationDto);
+
+ List<PurchaseInboundVo> getInboundBatchesBySupplier(Integer supplierId);
+
+ boolean addAccountPaymentApplication(AccountPaymentApplication accountPaymentApplication);
+
+ boolean deleteAccountPaymentApplication(List<Long> ids);
+
+ void exportAccountPaymentApplication(HttpServletResponse response, AccountPaymentApplicationDto accountPaymentApplicationDto);
+}
diff --git a/src/main/java/com/ruoyi/account/service/purchase/AccountPurchaseInvoiceService.java b/src/main/java/com/ruoyi/account/service/purchase/AccountPurchaseInvoiceService.java
new file mode 100644
index 0000000..d799c5e
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/purchase/AccountPurchaseInvoiceService.java
@@ -0,0 +1,31 @@
+package com.ruoyi.account.service.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchaseInvoiceDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchaseInvoiceVo;
+import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--杩涢」鍙戠エ 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:06:17
+ */
+public interface AccountPurchaseInvoiceService extends IService<AccountPurchaseInvoice> {
+
+ IPage<AccountPurchaseInvoiceVo> listPageAccountPurchaseInvoice(Page page, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto);
+
+ boolean deleteAccountPurchaseInvoice(List<Long> ids);
+
+ void exportAccountPurchaseInvoice(HttpServletResponse response, AccountPurchaseInvoiceDto accountPurchaseInvoiceDto);
+
+ List<PurchaseInboundVo> getInboundBatchesBySupplier(Integer supplierId);
+}
diff --git a/src/main/java/com/ruoyi/account/service/purchase/AccountPurchasePaymentService.java b/src/main/java/com/ruoyi/account/service/purchase/AccountPurchasePaymentService.java
new file mode 100644
index 0000000..018a497
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/purchase/AccountPurchasePaymentService.java
@@ -0,0 +1,30 @@
+package com.ruoyi.account.service.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPurchasePaymentDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo;
+import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鍗� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 04:14:51
+ */
+public interface AccountPurchasePaymentService extends IService<AccountPurchasePayment> {
+
+ IPage<AccountPurchasePaymentVo> listPageAccountPurchasePayment(Page page, AccountPurchasePaymentDto accountPurchasePaymentDto);
+
+ boolean addAccountPurchasePayment(AccountPurchasePayment accountPurchasePayment);
+
+ void exportAccountPurchasePayment(HttpServletResponse response, AccountPurchasePaymentDto accountPurchasePaymentDto);
+
+ boolean deleteAccountPurchasePayment(List<Long> ids);
+}
diff --git a/src/main/java/com/ruoyi/account/service/sales/AccountInvoiceApplicationService.java b/src/main/java/com/ruoyi/account/service/sales/AccountInvoiceApplicationService.java
new file mode 100644
index 0000000..7f55ba5
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/sales/AccountInvoiceApplicationService.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.service.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.bean.dto.sales.AccountInvoiceApplicationDto;
+import com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.pojo.sales.AccountInvoiceApplication;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--寮�绁ㄧ敵璇� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 01:38:32
+ */
+public interface AccountInvoiceApplicationService extends IService<AccountInvoiceApplication> {
+
+ IPage<AccountInvoiceApplicationVo> listPageAccountInvoiceApplication(Page page, AccountInvoiceApplicationDto accountInvoiceApplicationDto);
+
+ List<SalesOutboundVo> getOutboundBatchesByCustomer(Integer customerId);
+
+ boolean addAccountInvoiceApplication(AccountInvoiceApplication accountInvoiceApplication);
+
+ void exportAccountInvoiceApplication(HttpServletResponse response, AccountInvoiceApplicationDto accountInvoiceApplicationDto);
+
+ boolean deleteAccountInvoiceApplication(List<Long> ids);
+}
diff --git a/src/main/java/com/ruoyi/account/service/sales/AccountSalesCollectionService.java b/src/main/java/com/ruoyi/account/service/sales/AccountSalesCollectionService.java
new file mode 100644
index 0000000..d5172fb
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/sales/AccountSalesCollectionService.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.service.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesCollectionDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo;
+import com.ruoyi.account.bean.vo.sales.SalesOutboundVo;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--鏀舵鍗� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:49:56
+ */
+public interface AccountSalesCollectionService extends IService<AccountSalesCollection> {
+
+ IPage<AccountSalesCollectionVo> listPageAccountSalesCollection(Page page, AccountSalesCollectionDto accountSalesCollectionDto);
+
+ boolean addAccountSalesCollection(AccountSalesCollection accountSalesCollection);
+
+ void exportAccountSalesCollection(HttpServletResponse response, AccountSalesCollectionDto accountSalesCollectionDto);
+
+ boolean deleteAccountSalesCollection(List<Long> ids);
+
+ List<SalesOutboundVo> getOutboundBatchesByCustomer(Integer customerId);
+}
diff --git a/src/main/java/com/ruoyi/account/service/sales/AccountSalesInvoiceService.java b/src/main/java/com/ruoyi/account/service/sales/AccountSalesInvoiceService.java
new file mode 100644
index 0000000..1809177
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/sales/AccountSalesInvoiceService.java
@@ -0,0 +1,28 @@
+package com.ruoyi.account.service.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesInvoiceDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo;
+import com.ruoyi.account.pojo.sales.AccountSalesInvoice;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--閿�椤瑰彂绁� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:10:20
+ */
+public interface AccountSalesInvoiceService extends IService<AccountSalesInvoice> {
+
+ IPage<AccountSalesInvoiceVo> listPageAccountSalesInvoice(Page page, AccountSalesInvoiceDto accountSalesInvoiceDto);
+
+ void exportAccountSalesInvoice(HttpServletResponse response, AccountSalesInvoiceDto accountSalesInvoiceDto);
+
+ boolean deleteAccountSalesInvoice(List<Long> ids);
+}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
index 1bb2125..ccc13b9 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -36,9 +36,9 @@
@PostMapping("/add")
@Operation(summary = "鏂板涓存湡鍞悗")
@Log(title = "鏂板涓存湡鍞悗", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody AfterSalesNearExpiry entity) {
+ public AjaxResult add(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.add(entity);
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
/**
@@ -47,9 +47,9 @@
@PostMapping("/update")
@Operation(summary = "鏇存柊涓存湡鍞悗")
@Log(title = "鏇存柊涓存湡鍞悗", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody AfterSalesNearExpiry entity) {
+ public AjaxResult update(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.update(entity);
- return R.ok(null, "鏇存柊鎴愬姛");
+ return AjaxResult.success("鏇存柊鎴愬姛");
}
/**
@@ -58,9 +58,9 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎涓存湡鍞悗")
@Log(title = "鍒犻櫎涓存湡鍞悗", businessType = BusinessType.DELETE)
- public R<?> delete(Long[] ids) {
+ public AjaxResult delete(Long[] ids) {
afterSalesNearExpiryService.delete(ids);
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
/**
@@ -69,9 +69,9 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ涓存湡鍞悗")
@Log(title = "鍒嗛〉鏌ヨ涓存湡鍞悗", businessType = BusinessType.OTHER)
- public R<?> listPage(Page<AfterSalesNearExpiry> page, AfterSalesNearExpiry entity) {
+ public AjaxResult listPage(Page<AfterSalesNearExpiry> page, AfterSalesNearExpiry entity) {
IPage<AfterSalesNearExpiry> listPage = afterSalesNearExpiryService.listPage(page, entity);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 0c424fb..5f4c3a8 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -10,7 +10,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -45,9 +45,9 @@
@GetMapping("/listPage")
@Operation(summary = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
+ public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
@@ -85,14 +85,14 @@
@PostMapping("/add")
@Operation(summary = "鍞悗鏈嶅姟-鏂板")
@Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
- return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? R.ok() : R.fail();
+ public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
.map(String::valueOf)
@@ -100,24 +100,24 @@
afterSalesServiceNewDto.setProductModelIds(productModelIds);
}
boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "鍞悗鏈嶅姟-鍒犻櫎")
@Log(title = "鍞悗鏈嶅姟-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean delete = afterSalesServiceService.removeByIds(ids);
- return delete ? R.ok() : R.fail();
+ return delete ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/dispose")
@Operation(summary = "鍞悗鏈嶅姟-澶勭悊")
@Log(title = "鍞悗鏈嶅姟-澶勭悊", businessType = BusinessType.UPDATE)
- public R<?> dispose(@RequestBody AfterSalesService afterSalesService) {
+ public AjaxResult dispose(@RequestBody AfterSalesService afterSalesService) {
AfterSalesService byId = afterSalesServiceService.getById(afterSalesService.getId());
if(byId == null) throw new RuntimeException("鏈壘鍒拌鏁版嵁");
if(byId.getStatus().equals(2)) throw new RuntimeException("璇ユ暟鎹凡澶勭悊");
@@ -126,28 +126,28 @@
afterSalesService.setDisposeNickName(sysUser.getNickName());
afterSalesService.setStatus(2);
boolean update = afterSalesServiceService.updateById(afterSalesService);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@GetMapping("listSalesLedger")
@Operation(summary = "鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
- public R<?> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
+ public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("getById")
@Operation(summary = "鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
- public R<?> getById(Long id) {
- return R.ok(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
+ public AjaxResult getById(Long id) {
+ return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
@Operation(summary = "鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
@GetMapping("count")
- public R<?> count() {
- return R.ok(afterSalesServiceService.countAfterSalesService());
+ public AjaxResult count() {
+ return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
}
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
index 2290e5b..9032852 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -34,24 +34,24 @@
@PostMapping("/upload")
@Operation(summary = "鍞悗鏈嶅姟-鏂囦欢涓婁紶")
@Log(title = "鍞悗鏈嶅姟-鏂囦欢涓婁紶", businessType = BusinessType.INSERT)
- public R<?> fileUpload(@RequestParam("file") MultipartFile file,
+ public AjaxResult fileUpload(@RequestParam("file") MultipartFile file,
@RequestParam("id") Long afterSalesServiceId) {
afterSalesServiceFileService.fileUpload(file, afterSalesServiceId);
- return R.ok(null, "涓婁紶鎴愬姛");
+ return AjaxResult.success("涓婁紶鎴愬姛");
}
@GetMapping("/listPage")
@Operation(summary = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃")
@Log(title = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃", businessType = BusinessType.OTHER)
- public R<?> fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
- return R.ok(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
+ public AjaxResult fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
+ return AjaxResult.success(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
}
@DeleteMapping("/del/{fileId}")
@Operation(summary = "鍞悗澶勭悊-鍒犻櫎闄勪欢")
@Log(title = "鍞悗澶勭悊-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
- public R<?> delFile(@PathVariable Long fileId) {
+ public AjaxResult delFile(@PathVariable Long fileId) {
afterSalesServiceFileService.delFile(fileId);
- return R.ok(null, "鍒犻櫎鎴愬姛!");
+ return AjaxResult.success("鍒犻櫎鎴愬姛!");
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
index 8e2948e..cb7c0ba 100644
--- a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -83,21 +83,20 @@
@Operation(summary = "鍒堕�犱細璇濆垪琛�")
@GetMapping("/history/sessions")
- public R<?> listSessions() {
- return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public AjaxResult listSessions() {
+ return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒堕�犱細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public R<?> listMessages(@PathVariable String memoryId) {
- return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public AjaxResult listMessages(@PathVariable String memoryId) {
+ return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎鍒堕�犱細璇�")
@DeleteMapping("/history/{memoryId}")
- public R<?> deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
- return R.ok();
+ return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
index e1e605e..158ea61 100644
--- a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
@@ -6,10 +6,17 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
@@ -42,28 +49,28 @@
@Operation(summary = "閲囪喘澶氭枃浠跺垎鏋愮‘璁ゅ鐞�")
@PostMapping("/analyze-files/confirm")
- public R confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
+ public AjaxResult confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
return purchaseAiService.confirmAnalyzeResult(request);
}
@Operation(summary = "閲囪喘浼氳瘽鍒楄〃")
@GetMapping("/history/sessions")
- public R listSessions() {
+ public AjaxResult listSessions() {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.listSessions(loginUser));
+ return success(purchaseAiService.listSessions(loginUser));
}
@Operation(summary = "閲囪喘浼氳瘽娑堟伅")
@GetMapping("/history/messages/{memoryId}")
- public R listMessages(@PathVariable String memoryId) {
+ public AjaxResult listMessages(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.listMessages(memoryId, loginUser));
+ return success(purchaseAiService.listMessages(memoryId, loginUser));
}
@Operation(summary = "鍒犻櫎閲囪喘浼氳瘽")
@DeleteMapping("/history/{memoryId}")
- public R deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return R.ok(purchaseAiService.deleteSession(memoryId, loginUser));
+ return toAjax(purchaseAiService.deleteSession(memoryId, loginUser));
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
index b5de9d1..c3a569b 100644
--- a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -93,22 +93,21 @@
@Operation(summary = "閿�鍞姪鎵嬩細璇濆垪琛�")
@GetMapping("/history/sessions")
- public R<?> listSessions() {
- return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public AjaxResult listSessions() {
+ return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "閿�鍞姪鎵嬩細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public R<?> listMessages(@PathVariable String memoryId) {
- return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public AjaxResult listMessages(@PathVariable String memoryId) {
+ return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎閿�鍞姪鎵嬩細璇�")
@DeleteMapping("/history/{memoryId}")
- public R<?> deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
- return R.ok();
+ return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
}
private boolean isBusinessDataIntent(String message) {
diff --git a/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java b/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
index 668dd31..affa347 100644
--- a/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
@@ -12,12 +12,19 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
@@ -146,21 +153,21 @@
@Operation(summary = "浼氳瘽鍒楄〃")
@GetMapping("/history/sessions")
- public R listSessions() {
- return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public AjaxResult listSessions() {
+ return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "浼氳瘽娑堟伅")
@GetMapping("/history/messages/{memoryId}")
- public R listMessages(@PathVariable String memoryId) {
- return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public AjaxResult listMessages(@PathVariable String memoryId) {
+ return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎浼氳瘽")
@DeleteMapping("/history/{memoryId}")
- public R deleteSession(@PathVariable String memoryId) {
+ public AjaxResult deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- return R.ok(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
+ return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
}
private boolean isApproveTodoBusinessIntent(String message) {
diff --git a/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java b/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
index 616aa6c..0f24d64 100644
--- a/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
+++ b/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
@@ -17,7 +17,7 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -26,7 +26,13 @@
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import dev.langchain4j.data.image.Image;
-import dev.langchain4j.data.message.*;
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.Content;
+import dev.langchain4j.data.message.ImageContent;
+import dev.langchain4j.data.message.SystemMessage;
+import dev.langchain4j.data.message.TextContent;
+import dev.langchain4j.data.message.UserMessage;
import dev.langchain4j.model.chat.StreamingChatLanguageModel;
import dev.langchain4j.model.chat.response.ChatResponse;
import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
@@ -41,12 +47,22 @@
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.nio.file.Files;
+import java.util.Base64;
+import java.util.Arrays;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.nio.file.Files;
@Service
public class PurchaseAiService {
@@ -193,12 +209,12 @@
.doOnError(ex -> aiChatSessionService.refreshSessionStats(finalMemoryId, loginUser));
}
- public R confirmAnalyzeResult(PurchaseAiConfirmRequest request) {
+ public AjaxResult confirmAnalyzeResult(PurchaseAiConfirmRequest request) {
if (request == null || !StringUtils.hasText(request.getBusinessType())) {
- return R.fail("businessType涓嶈兘涓虹┖");
+ return AjaxResult.error("businessType涓嶈兘涓虹┖");
}
if (request.getPayload() == null || request.getPayload().isEmpty()) {
- return R.fail("payload涓嶈兘涓虹┖");
+ return AjaxResult.error("payload涓嶈兘涓虹┖");
}
try {
@@ -207,10 +223,10 @@
case "purchase_ledger" -> processPurchaseLedger(request.getPayload());
case "payment_registration" -> processPaymentRegistration(request.getPayload());
case "purchase_return_order" -> processPurchaseReturnOrder(request.getPayload());
- default -> R.fail("鏆備笉鏀寔璇ヤ笟鍔＄被鍨�: " + businessType);
+ default -> AjaxResult.error("鏆備笉鏀寔璇ヤ笟鍔＄被鍨�: " + businessType);
};
} catch (Exception ex) {
- return R.fail(toCustomerMessage(ex));
+ return AjaxResult.error(toCustomerMessage(ex));
}
}
@@ -465,7 +481,7 @@
杈撳嚭瑕佹眰:
1. 鍙緭鍑哄悎娉� JSON锛屼笉瑕� Markdown锛屼笉瑕侀澶栬В閲娿��
2. JSON 椤跺眰瀛楁鍥哄畾涓�:
- - ok: boolean
+ - success: boolean
- businessType: purchase_ledger | payment_registration | purchase_return_order | unknown
- action: confirm_required
- description: 涓枃璇存槑
@@ -501,33 +517,33 @@
""".formatted(message, fileContent);
}
- private R processPurchaseLedger(Map<String, Object> payload) throws Exception {
+ private AjaxResult processPurchaseLedger(Map<String, Object> payload) throws Exception {
if (payload.containsKey("purchaseLedgers")) {
return processPurchaseLedgerBatch(payload);
}
Map<String, Object> normalizedPayload = normalizePurchaseLedgerMap(payload);
PurchaseLedgerDto dto = objectMapper.convertValue(normalizedPayload, PurchaseLedgerDto.class);
- R ledgerResult = validatePurchaseLedger(dto, 0);
+ AjaxResult ledgerResult = validatePurchaseLedger(dto, 0);
if (ledgerResult != null) {
return ledgerResult;
}
- R supplierResult = fillSupplierIdByName(dto);
+ AjaxResult supplierResult = fillSupplierIdByName(dto);
if (supplierResult != null) {
return supplierResult;
}
- R productResult = validatePurchaseProducts(dto.getProductData(), 0);
+ AjaxResult productResult = validatePurchaseProducts(dto.getProductData(), 0);
if (productResult != null) {
return productResult;
}
int result = purchaseLedgerService.addOrEditPurchase(dto);
- return R.ok( result,"閲囪喘鍙拌处宸插鐞�");
+ return AjaxResult.success("閲囪喘鍙拌处宸插鐞�", result);
}
- private R processPurchaseLedgerBatch(Map<String, Object> payload) throws Exception {
+ private AjaxResult processPurchaseLedgerBatch(Map<String, Object> payload) throws Exception {
List<Map<String, Object>> purchaseLedgers = toMapList(payload.get("purchaseLedgers"));
if (purchaseLedgers.isEmpty()) {
- return R.fail("purchaseLedgers涓嶈兘涓虹┖");
+ return AjaxResult.error("purchaseLedgers涓嶈兘涓虹┖");
}
List<Map<String, Object>> topLevelProductData = toMapList(payload.get("productData"));
@@ -535,11 +551,11 @@
for (int i = 0; i < purchaseLedgers.size(); i++) {
Map<String, Object> ledgerMap = normalizePurchaseLedgerMap(purchaseLedgers.get(i));
PurchaseLedgerDto dto = objectMapper.convertValue(ledgerMap, PurchaseLedgerDto.class);
- R ledgerResult = validatePurchaseLedger(dto, i);
+ AjaxResult ledgerResult = validatePurchaseLedger(dto, i);
if (ledgerResult != null) {
return ledgerResult;
}
- R supplierResult = fillSupplierIdByName(dto);
+ AjaxResult supplierResult = fillSupplierIdByName(dto);
if (supplierResult != null) {
return supplierResult;
}
@@ -549,7 +565,7 @@
products = matchProductsForLedger(ledgerMap, dto, topLevelProductData, purchaseLedgers.size() == 1);
dto.setProductData(products);
}
- R productResult = validatePurchaseProducts(products, i);
+ AjaxResult productResult = validatePurchaseProducts(products, i);
if (productResult != null) {
return productResult;
}
@@ -564,7 +580,7 @@
item.put("result", result);
results.add(item);
}
- return R.ok( results,"閲囪喘鍙拌处宸叉壒閲忓鐞�");
+ return AjaxResult.success("閲囪喘鍙拌处宸叉壒閲忓鐞�", results);
}
private List<SalesLedgerProduct> matchProductsForLedger(Map<String, Object> ledgerMap,
@@ -770,7 +786,7 @@
}
}
- private R validatePurchaseProducts(List<SalesLedgerProduct> products, int ledgerIndex) {
+ private AjaxResult validatePurchaseProducts(List<SalesLedgerProduct> products, int ledgerIndex) {
if (products == null || products.isEmpty()) {
return null;
}
@@ -778,34 +794,34 @@
SalesLedgerProduct product = products.get(i);
String prefix = "绗�" + (ledgerIndex + 1) + "涓噰璐彴璐︾殑绗�" + (i + 1) + "鏉′骇鍝�";
if (!StringUtils.hasText(product.getProductCategory())) {
- return R.fail(prefix + "缂哄皯浜у搧鍚嶇О锛岃琛ュ厖鍚庡啀纭");
+ return AjaxResult.error(prefix + "缂哄皯浜у搧鍚嶇О锛岃琛ュ厖鍚庡啀纭");
}
if (!StringUtils.hasText(product.getSpecificationModel())) {
- return R.fail(prefix + "缂哄皯瑙勬牸鍨嬪彿锛岃琛ュ厖鍚庡啀纭");
+ return AjaxResult.error(prefix + "缂哄皯瑙勬牸鍨嬪彿锛岃琛ュ厖鍚庡啀纭");
}
if (!StringUtils.hasText(product.getUnit())) {
- return R.fail(prefix + "缂哄皯鍗曚綅锛岃琛ュ厖鍚庡啀纭");
+ return AjaxResult.error(prefix + "缂哄皯鍗曚綅锛岃琛ュ厖鍚庡啀纭");
}
if (product.getQuantity() == null) {
- return R.fail(prefix + "缂哄皯鏁伴噺");
+ return AjaxResult.error(prefix + "缂哄皯鏁伴噺");
}
if (product.getTaxInclusiveUnitPrice() == null) {
- return R.fail(prefix + "缂哄皯鍚◣鍗曚环锛岃琛ュ厖鍚庡啀纭");
+ return AjaxResult.error(prefix + "缂哄皯鍚◣鍗曚环锛岃琛ュ厖鍚庡啀纭");
}
if (product.getTaxInclusiveTotalPrice() == null) {
- return R.fail(prefix + "缂哄皯鍚◣鎬讳环锛岃琛ュ厖鍚庡啀纭");
+ return AjaxResult.error(prefix + "缂哄皯鍚◣鎬讳环锛岃琛ュ厖鍚庡啀纭");
}
}
return null;
}
- private R validatePurchaseLedger(PurchaseLedgerDto dto, int ledgerIndex) {
+ private AjaxResult validatePurchaseLedger(PurchaseLedgerDto dto, int ledgerIndex) {
String prefix = "绗�" + (ledgerIndex + 1) + "涓噰璐彴璐�";
if (!StringUtils.hasText(dto.getPurchaseContractNumber())) {
- return R.fail(prefix + "缂哄皯閲囪喘鍚堝悓鍙凤紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
+ return AjaxResult.error(prefix + "缂哄皯閲囪喘鍚堝悓鍙凤紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
}
if (dto.getSupplierId() == null && !StringUtils.hasText(dto.getSupplierName())) {
- return R.fail(prefix + "缂哄皯渚涘簲鍟嗗悕绉帮紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
+ return AjaxResult.error(prefix + "缂哄皯渚涘簲鍟嗗悕绉帮紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
}
return null;
}
@@ -976,25 +992,25 @@
return "澶勭悊澶辫触锛�" + message;
}
- private R fillSupplierIdByName(PurchaseLedgerDto dto) {
+ private AjaxResult fillSupplierIdByName(PurchaseLedgerDto dto) {
if (dto.getSupplierId() != null) {
return null;
}
if (!StringUtils.hasText(dto.getSupplierName())) {
- return R.fail("渚涘簲鍟咺D涓嶈兘涓虹┖锛涙湭璇嗗埆鍒颁緵搴斿晢鍚嶇О锛屾棤娉曡嚜鍔ㄥ尮閰嶄緵搴斿晢ID");
+ return AjaxResult.error("渚涘簲鍟咺D涓嶈兘涓虹┖锛涙湭璇嗗埆鍒颁緵搴斿晢鍚嶇О锛屾棤娉曡嚜鍔ㄥ尮閰嶄緵搴斿晢ID");
}
SupplierManage supplier = supplierManageMapper.selectOne(new LambdaQueryWrapper<SupplierManage>()
.eq(SupplierManage::getSupplierName, dto.getSupplierName().trim())
.last("limit 1"));
if (supplier == null) {
- return R.fail("鏈壘鍒颁緵搴斿晢锛�" + dto.getSupplierName() + "锛岃鍏堢淮鎶や緵搴斿晢鎴栨墜鍔ㄩ�夋嫨渚涘簲鍟咺D");
+ return AjaxResult.error("鏈壘鍒颁緵搴斿晢锛�" + dto.getSupplierName() + "锛岃鍏堢淮鎶や緵搴斿晢鎴栨墜鍔ㄩ�夋嫨渚涘簲鍟咺D");
}
dto.setSupplierId(supplier.getId());
return null;
}
- private R processPaymentRegistration(Map<String, Object> payload) {
+ private AjaxResult processPaymentRegistration(Map<String, Object> payload) {
Object recordsValue = payload.get("records");
List<PaymentRegistration> records;
if (recordsValue == null) {
@@ -1004,12 +1020,12 @@
});
}
int result = paymentRegistrationService.insertPaymentRegistration(records);
- return R.ok( result,"浠樻鐧昏宸插鐞�");
+ return AjaxResult.success("浠樻鐧昏宸插鐞�", result);
}
- private R processPurchaseReturnOrder(Map<String, Object> payload) {
+ private AjaxResult processPurchaseReturnOrder(Map<String, Object> payload) {
PurchaseReturnOrderDto dto = objectMapper.convertValue(payload, PurchaseReturnOrderDto.class);
Boolean result = purchaseReturnOrdersService.add(dto);
- return R.ok( result,"閲囪喘閫�璐у崟宸插鐞�");
+ return AjaxResult.success("閲囪喘閫�璐у崟宸插鐞�", result);
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index cdd5e0a..d0af196 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,8 +2,7 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -16,7 +15,7 @@
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController extends BaseController {
+public class ApproveNodeController {
private IApproveNodeService approveNodeService;
@@ -27,8 +26,8 @@
*/
@GetMapping("/details/{id}")
@Operation(summary = "娴佺▼鐘舵�佽鎯�")
- public R<?> details(@PathVariable String id) {
- return R.ok(approveNodeService.details(id));
+ public AjaxResult details(@PathVariable String id) {
+ return AjaxResult.success(approveNodeService.details(id));
}
/**
@@ -39,9 +38,9 @@
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "瀹℃壒鑺傜偣")
- public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
+ public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -50,9 +49,9 @@
* @return
*/
@PostMapping("/init")
- public R<?> init(String id) {
+ public AjaxResult init(String id) {
approveNodeService.initApproveNodes("",id,1L);
- return R.ok();
+ return AjaxResult.success();
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 5c2c09c..ed02564 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -9,9 +9,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +25,7 @@
@RequestMapping("/approveProcess")
@AllArgsConstructor
@Tag(name = "瀹℃壒")
-public class ApproveProcessController extends BaseController {
+public class ApproveProcessController {
private IApproveProcessService approveProcessService;
/**銆�
@@ -35,13 +33,13 @@
* @return
*/
@GetMapping("/getDept")
- public R<?> getDept() {
+ public AjaxResult getDept() {
Long userId = SecurityUtils.getUserId();
LoginUser user = SecurityUtils.getLoginUser();
Long[] deptIds = SecurityUtils.getDeptId();
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
- return R.ok(sysDeptList);
+ return AjaxResult.success(sysDeptList);
}
/**
@@ -52,13 +50,13 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "娣诲姞瀹℃壒")
- public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+ public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.addApprove(approveProcessVO);
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
/**
@@ -68,11 +66,11 @@
*/
@GetMapping("/get")
@Operation(summary = "瀹℃壒璇︽儏")
- public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
- return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+ return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
}
/**
@@ -83,12 +81,12 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "鏇存柊瀹℃壒")
- public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.updateByApproveId(approveGetAndUpdateVo);
- return R.ok(null, "鎿嶄綔鎴愬姛");
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
* 鑾峰彇瀹℃壒鍒楄〃
@@ -96,8 +94,8 @@
*/
@GetMapping("/list")
@Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
- public R<?> list(Page page, ApproveProcess approveProcess) {
- return R.ok(approveProcessService.listAll(page, approveProcess));
+ public AjaxResult list(Page page, ApproveProcess approveProcess) {
+ return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -108,12 +106,12 @@
@DeleteMapping("/deleteIds")
@Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public R<?> deleteIds(@RequestBody List<Long> ids) {
+ public AjaxResult deleteIds(@RequestBody List<Long> ids) {
if (ids == null || ids.size() == 0) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
- return R.ok(null, "鎿嶄綔鎴愬姛");
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index dfe6a7d..97abe9f 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -7,8 +7,7 @@
import com.ruoyi.approve.mapper.WorkingHoursSettingMapper;
import com.ruoyi.approve.pojo.*;
import com.ruoyi.approve.service.HolidaySettingsService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +17,7 @@
@RestController
@RequestMapping("/holidaySettings")
@AllArgsConstructor
-public class HolidaySettingsController extends BaseController {
+public class HolidaySettingsController {
private HolidaySettingsService holidaySettingsService;
private AnnualLeaveSettingMapper annualLeaveSettingMapper;
private OvertimeSettingMapper overtimeSettingMapper;
@@ -29,70 +28,70 @@
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, HolidaySettings holidaySettings) {
Page page = new Page(current, size);
- return R.ok(holidaySettingsService.listpage(page,holidaySettings));
+ return AjaxResult.success(holidaySettingsService.listpage(page,holidaySettings));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody HolidaySettings holidaySettings){
- return R.ok(holidaySettingsService.save(holidaySettings));
+ public AjaxResult add(@RequestBody HolidaySettings holidaySettings){
+ return AjaxResult.success(holidaySettingsService.save(holidaySettings));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody HolidaySettings holidaySettings){
- return R.ok(holidaySettingsService.updateById(holidaySettings));
+ public AjaxResult update(@RequestBody HolidaySettings holidaySettings){
+ return AjaxResult.success(holidaySettingsService.updateById(holidaySettings));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(holidaySettingsService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(holidaySettingsService.removeByIds(ids));
}
/**銆�
* 鑾峰彇骞村亣瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getAnnualLeaveSettingList")
- public R<?> getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, AnnualLeaveSetting annualLeaveSetting) {
Page page = new Page(current, size);
- return R.ok(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
+ return AjaxResult.success(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
}
/**銆�
* 澧炴坊骞村亣瑙勫垯
* @return
*/
@PostMapping("/addAnnualLeaveSetting")
- public R<?> addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return R.ok(annualLeaveSettingMapper.insert(annualLeaveSetting));
+ public AjaxResult addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return AjaxResult.success(annualLeaveSettingMapper.insert(annualLeaveSetting));
}
/**銆�
* 鏇存柊骞村亣瑙勫垯
* @return
*/
@PostMapping("/updateAnnualLeaveSetting")
- public R<?> updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return R.ok(annualLeaveSettingMapper.updateById(annualLeaveSetting));
+ public AjaxResult updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return AjaxResult.success(annualLeaveSettingMapper.updateById(annualLeaveSetting));
}
/**銆�
* 鍒犻櫎骞村亣瑙勫垯
* @return
*/
@DeleteMapping("/deleteAnnualLeaveSetting")
- public R<?> deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(annualLeaveSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(annualLeaveSettingMapper.deleteBatchIds(ids));
}
/**銆�
@@ -100,70 +99,70 @@
* @return
*/
@GetMapping("/getOvertimeSettingList")
- public R<?> getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, OvertimeSetting overtimeSetting) {
Page page = new Page(current, size);
- return R.ok(overtimeSettingMapper.listPage(page,overtimeSetting));
+ return AjaxResult.success(overtimeSettingMapper.listPage(page,overtimeSetting));
}
/**銆�
* 澧炴坊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/addOvertimeSetting")
- public R<?> addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return R.ok(overtimeSettingMapper.insert(overtimeSetting));
+ public AjaxResult addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return AjaxResult.success(overtimeSettingMapper.insert(overtimeSetting));
}
/**銆�
* 鏇存柊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/updateOvertimeSetting")
- public R<?> updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return R.ok(overtimeSettingMapper.updateById(overtimeSetting));
+ public AjaxResult updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return AjaxResult.success(overtimeSettingMapper.updateById(overtimeSetting));
}
/**銆�
* 鍒犻櫎鍔犵彮瑙勫垯
* @return
*/
@DeleteMapping("/deleteOvertimeSetting")
- public R<?> deleteOvertimeSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(overtimeSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteOvertimeSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(overtimeSettingMapper.deleteBatchIds(ids));
}
/**銆�
* 鑾峰彇涓婄彮鏃堕棿璁剧疆-鐝埗瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getWorkingHoursSettingList")
- public R<?> getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, WorkingHoursSetting workingHoursSetting) {
Page page = new Page(current, size);
- return R.ok(workingHoursSettingMapper.listPage(page,workingHoursSetting));
+ return AjaxResult.success(workingHoursSettingMapper.listPage(page,workingHoursSetting));
}
/**銆�
* 澧炴坊鐝埗瑙勫垯
* @return
*/
@PostMapping("/addWorkingHoursSetting")
- public R<?> addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return R.ok(workingHoursSettingMapper.insert(workingHoursSetting));
+ public AjaxResult addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return AjaxResult.success(workingHoursSettingMapper.insert(workingHoursSetting));
}
/**銆�
* 鏇存柊鐝埗瑙勫垯
* @return
*/
@PostMapping("/updateWorkingHoursSetting")
- public R<?> updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return R.ok(workingHoursSettingMapper.updateById(workingHoursSetting));
+ public AjaxResult updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return AjaxResult.success(workingHoursSettingMapper.updateById(workingHoursSetting));
}
/**銆�
* 鍒犻櫎鐝埗瑙勫垯
* @return
*/
@DeleteMapping("/deleteWorkingHoursSetting")
- public R<?> deleteWorkingHoursSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(workingHoursSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteWorkingHoursSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(workingHoursSettingMapper.deleteBatchIds(ids));
}
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index dd12369..3ebb782 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -5,8 +5,7 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,7 +18,7 @@
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
@Tag(name = "鐭ヨ瘑搴撶鐞�")
-public class KnowledgeBaseController extends BaseController {
+public class KnowledgeBaseController {
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -27,35 +26,35 @@
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
Page page = new Page(current, size);
- return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
+ return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
- return R.ok(knowledgeBaseService.save(knowledgeBase));
+ public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
+ return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
- return R.ok(knowledgeBaseService.updateById(knowledgeBase));
+ public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
+ return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(knowledgeBaseService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
}
@Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
diff --git a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
index 2749dcf..a1796f8 100644
--- a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
+++ b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
@@ -8,8 +8,7 @@
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.pojo.OnlineMeeting;
import com.ruoyi.approve.service.NotificationManagementService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +18,7 @@
@RestController
@RequestMapping("/notificationManagement")
@AllArgsConstructor
-public class NotificationManagementController extends BaseController {
+public class NotificationManagementController {
private NotificationManagementService notificationManagementService ;
private OnlineMeetingMapper onlineMeetingMapper;
private FileSharingMapper fileSharingMapper;
@@ -28,35 +27,35 @@
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, NotificationManagement notificationManagement) {
Page page = new Page(current, size);
- return R.ok(notificationManagementService.listpage(page,notificationManagement));
+ return AjaxResult.success(notificationManagementService.listpage(page,notificationManagement));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody NotificationManagement notificationManagement){
- return R.ok(notificationManagementService.save(notificationManagement));
+ public AjaxResult add(@RequestBody NotificationManagement notificationManagement){
+ return AjaxResult.success(notificationManagementService.save(notificationManagement));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody NotificationManagement notificationManagement){
- return R.ok(notificationManagementService.updateById(notificationManagement));
+ public AjaxResult update(@RequestBody NotificationManagement notificationManagement){
+ return AjaxResult.success(notificationManagementService.updateById(notificationManagement));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(notificationManagementService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(notificationManagementService.removeByIds(ids));
}
/**
*鏂板浼氳
@@ -64,16 +63,16 @@
* @return
*/
@PostMapping("/addOnlineMeeting")
- public R<?> addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
- return R.ok(onlineMeetingMapper.insert(onlineMeeting));
+ public AjaxResult addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
+ return AjaxResult.success(onlineMeetingMapper.insert(onlineMeeting));
}
/**
*鏂板鏂囦欢鍏变韩
*
*/
@PostMapping("/addFileSharing")
- public R<?> addFileSharing(@RequestBody FileSharing fileSharing){
- return R.ok(fileSharingMapper.insert(fileSharing));
+ public AjaxResult addFileSharing(@RequestBody FileSharing fileSharing){
+ return AjaxResult.success(fileSharingMapper.insert(fileSharing));
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index 1e26526..06a0f6d 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -5,8 +5,7 @@
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,42 +18,42 @@
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
@Tag(name = "RPA娴佺▼鑷姩鍖�")
-public class RpaProcessAutomationController extends BaseController {
+public class RpaProcessAutomationController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
* 鑾峰彇鍒楄〃
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "100") long size, RpaProcessAutomation rpaProcessAutomation) {
Page page = new Page(current, size);
- return R.ok(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
+ return AjaxResult.success(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return R.ok(rpaProcessAutomationService.save(rpaProcessAutomation));
+ public AjaxResult add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return AjaxResult.success(rpaProcessAutomationService.save(rpaProcessAutomation));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return R.ok(rpaProcessAutomationService.updateById(rpaProcessAutomation));
+ public AjaxResult update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return AjaxResult.success(rpaProcessAutomationService.updateById(rpaProcessAutomation));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(rpaProcessAutomationService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
}
@Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index bc829fd..a5dcc83 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -55,8 +55,8 @@
*/
@Operation(summary = "鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public R getInfo(@PathVariable("id") Integer id) {
- return R.ok(customerFollowUpService.getFollowUpWithFiles(id));
+ public AjaxResult getInfo(@PathVariable("id") Integer id) {
+ return AjaxResult.success(customerFollowUpService.getFollowUpWithFiles(id));
}
/**
@@ -65,8 +65,8 @@
@PostMapping("/add")
@Operation(summary = "鏂板瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-鏂板", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody CustomerFollowUp customerFollowUp) {
- return R.ok();
+ public AjaxResult add(@RequestBody CustomerFollowUp customerFollowUp) {
+ return toAjax(customerFollowUpService.insertCustomerFollowUp(customerFollowUp));
}
/**
@@ -75,8 +75,8 @@
@PutMapping("/edit")
@Operation(summary = "淇敼瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-淇敼", businessType = BusinessType.UPDATE)
- public R<?> edit(@RequestBody CustomerFollowUp customerFollowUp) {
- return R.ok();
+ public AjaxResult edit(@RequestBody CustomerFollowUp customerFollowUp) {
+ return toAjax(customerFollowUpService.updateCustomerFollowUp(customerFollowUp));
}
/**
@@ -85,8 +85,8 @@
@Operation(summary = "涓婁紶璺熻繘闄勪欢")
@PostMapping("/upload/{followUpId}")
@Log(title = "瀹㈡埛璺熻繘-涓婁紶闄勪欢", businessType = BusinessType.INSERT)
- public R uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
- return R.ok(customerFollowUpService.addFollowUpFiles(files, followUpId));
+ public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
+ return AjaxResult.success(customerFollowUpService.addFollowUpFiles(files, followUpId));
}
/**
@@ -95,9 +95,9 @@
@Operation(summary = "涓婁紶闄勪欢(澶嶇敤)")
@PostMapping("/upload")
@Log(title = "涓婁紶闄勪欢(澶嶇敤)", businessType = BusinessType.INSERT)
- public R uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
+ public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
List<CustomerFollowUpFileDto> uploadedFiles = customerFollowUpService.addFollowUpFiles(files, null);
- return R.ok(uploadedFiles);
+ return AjaxResult.success(uploadedFiles);
}
/**
@@ -105,8 +105,8 @@
*/
@Operation(summary = "鎵归噺鏌ヨ闄勪欢鍒楄〃")
@PostMapping("/file/list")
- public R getFileList(@RequestBody List<Long> ids) {
- return R.ok(customerFollowUpService.getFollowUpFilesByIds(ids));
+ public AjaxResult getFileList(@RequestBody List<Long> ids) {
+ return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
}
/**
@@ -115,9 +115,9 @@
@Operation(summary = "鍒犻櫎璺熻繘闄勪欢")
@DeleteMapping("/file/{fileId}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
- public R deleteFile(@PathVariable Integer fileId) {
+ public AjaxResult deleteFile(@PathVariable Integer fileId) {
customerFollowUpService.deleteFollowUpFile(fileId);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -126,8 +126,8 @@
@Operation(summary = "鍒犻櫎瀹㈡埛璺熻繘")
@DeleteMapping("/{id}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎", businessType = BusinessType.DELETE)
- public R remove(@PathVariable Integer id) {
- return R.ok(customerFollowUpService.deleteCustomerFollowUpById(id));
+ public AjaxResult remove(@PathVariable Integer id) {
+ return toAjax(customerFollowUpService.deleteCustomerFollowUpById(id));
}
/**
@@ -136,8 +136,8 @@
@Operation(summary = "鏂板/鏇存柊鍥炶鎻愰啋")
@PostMapping("/return-visit")
@Log(title = "鍥炶鎻愰啋-鏂板/鏇存柊", businessType = BusinessType.UPDATE)
- public R saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
- return R.ok(customerReturnVisitService.saveOrUpdateReturnVisit(customerReturnVisit));
+ public AjaxResult saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
+ return toAjax(customerReturnVisitService.saveOrUpdateReturnVisit(customerReturnVisit));
}
/**
@@ -145,8 +145,8 @@
*/
@Operation(summary = "鑾峰彇鍥炶鎻愰啋璇︽儏")
@GetMapping("/return-visit/{customerId}")
- public R getReturnVisit(@PathVariable Integer customerId) {
- return R.ok(customerReturnVisitService.getByCustomerId(customerId));
+ public AjaxResult getReturnVisit(@PathVariable Integer customerId) {
+ return AjaxResult.success(customerReturnVisitService.getByCustomerId(customerId));
}
/**
@@ -155,9 +155,9 @@
@Operation(summary = "鏍囪鍥炶鎻愰啋宸茶")
@PutMapping("/return-visit/read/{id}")
@Log(title = "鍥炶鎻愰啋-鏍囪宸茶", businessType = BusinessType.UPDATE)
- public R markAsRead(@PathVariable Long id) {
+ public AjaxResult markAsRead(@PathVariable Long id) {
customerReturnVisitService.markAsRead(id);
- return R.ok();
+ return AjaxResult.success();
}
}
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 5109662..1c5224b 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -15,7 +15,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import io.swagger.v3.oas.annotations.Operation;
@@ -55,9 +55,8 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProduct")
- public R<?> addOrEditProduct(@RequestBody ProductDto productDto) {
- productService.addOrEditProduct(productDto);
- return R.ok();
+ public AjaxResult addOrEditProduct(@RequestBody ProductDto productDto) {
+ return toAjax(productService.addOrEditProduct(productDto));
}
/**
@@ -65,9 +64,8 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProductModel")
- public R<?> addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
- productModelService.addOrEditProductModel(productModelDto);
- return R.ok();
+ public AjaxResult addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
+ return toAjax(productModelService.addOrEditProductModel(productModelDto));
}
/**
@@ -75,19 +73,18 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public R<?> remove(@RequestBody Long[] ids) {
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return R.fail("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return AjaxResult.error("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- productService.delProductByIds(ids);
- return R.ok();
+ return toAjax(productService.delProductByIds(ids));
}
/**
@@ -95,19 +92,18 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.DELETE)
@DeleteMapping("/delProductModel")
- public R<?> delProductModel(@RequestBody Long[] ids) {
+ public AjaxResult delProductModel(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧瑙勬牸鍨嬪彿
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductModelId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return R.fail("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return AjaxResult.error("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- productModelService.delProductModel(ids);
- return R.ok();
+ return toAjax(productModelService.delProductModel(ids));
}
/**
@@ -129,7 +125,7 @@
*/
@PostMapping("/import")
@Log(title = "瀵煎叆浜у搧", businessType = BusinessType.IMPORT)
- public R<?> importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
+ public AjaxResult importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
return productModelService.importProductModel(file, productId);
}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index f1a45d1..1a58500 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -7,7 +7,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -29,9 +29,9 @@
* @return
*/
@PostMapping("/add")
- public R add(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -40,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public R delSupplier(@RequestBody List<Integer> ids) {
+ public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
supplierService.delSupplier(ids);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -54,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public R supplierDetail(@PathVariable("id") Integer id) {
- return R.ok(supplierService.supplierDetail(id));
+ public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(supplierService.supplierDetail(id));
}
/**
@@ -64,9 +64,9 @@
* @return
*/
@PostMapping("/update")
- public R update(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -76,8 +76,8 @@
* @return
*/
@GetMapping("/listPage")
- public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
- return R.ok(supplierService.supplierListPage(page, supplierManageDto));
+ public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+ return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
}
/**
@@ -102,8 +102,12 @@
*/
@PostMapping("/import")
@Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
- public R importData(MultipartFile file) throws Exception {
- return supplierService.importData(file);
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
}
@@ -112,7 +116,7 @@
* @return
*/
@GetMapping("/getOptions")
- public R getOptions() {
- return R.ok(supplierService.list());
+ public AjaxResult getOptions() {
+ return AjaxResult.success(supplierService.list());
}
}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
index 3829aa4..2d43f65 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.SupplierManageFile;
import com.ruoyi.basic.service.SupplierManageFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +15,7 @@
*/
@RestController
@RequestMapping("/basic/supplierManageFile")
-public class SupplierManageFileController extends BaseController {
+public class SupplierManageFileController {
@Resource
@@ -29,8 +28,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody SupplierManageFile supplierManageFile) {
- return R.ok(supplierManageFileService.save(supplierManageFile));
+ public AjaxResult add(@RequestBody SupplierManageFile supplierManageFile) {
+ return AjaxResult.success(supplierManageFileService.save(supplierManageFile));
}
/**
@@ -39,12 +38,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delSupplierManageFile(@RequestBody List<Integer> ids) {
+ public AjaxResult delSupplierManageFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(supplierManageFileService.removeBatchByIds(ids));
+ return AjaxResult.success(supplierManageFileService.removeBatchByIds(ids));
}
/**
@@ -54,8 +53,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
- return R.ok(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
+ public AjaxResult supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
+ return AjaxResult.success(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
}
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index ef7e57c..549d333 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -205,7 +205,9 @@
SALES_RECEIPT_RETURN("sales_receipt_return"),
ACCOUNT_EXPENSE("account_expense"),
FIN_VOUCHER("fin_voucher"),
- ACCOUNT_FILE("account_file");
+ ACCOUNT_FILE("account_file"),
+ ACCOUNT_INVOICE_APPLICATION("account_invoice_application"),
+ ACCOUNT_PURCHASE_INVOICE("account_purchase_invoice");
private final String type;
RecordTypeEnum(String type) { this.type = type; }
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index d4e63de..87b197f 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -15,9 +15,6 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @Excel(name = "渚涘簲鍟嗙被鍨�")
- private String supplierType;
-
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index cb32b58..fa10c92 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -20,11 +20,6 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @Schema(description = "渚涘簲鍟嗙被鍨�")
- @TableField(value = "supplier_type")
- @Excel(name = "渚涘簲鍟嗙被鍨�")
- private String supplierType;
-
@Schema(description = "绾崇◣浜鸿瘑鍒彿")
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
@@ -85,6 +80,10 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @Schema(description = "渚涘簲鍟嗙被鍨�")
+ @TableField(value = "supplier_type")
+ private String supplierType;
+
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/basic/service/IProductModelService.java b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
index 6b96d61..dd268d6 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductModelService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
@@ -6,7 +6,7 @@
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -34,5 +34,5 @@
*/
IPage<ProductModel> modelListPage(Page page , ProductDto productDto);
- R<?> importProductModel(MultipartFile file, Integer productId);
+ AjaxResult importProductModel(MultipartFile file, Integer productId);
}
diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index 02b7d91..b54c2ad 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
@@ -56,5 +56,5 @@
*/
void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);
- R importData(MultipartFile file);
+ Boolean importData(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 263a52a..be34fc0 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.LossProductModelDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -124,14 +124,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> importProductModel(MultipartFile file, Integer productId) {
+ public AjaxResult importProductModel(MultipartFile file, Integer productId) {
if (productId == null) {
- return R.fail("璇峰厛閫夋嫨浜у搧鍐嶅鍏ヨ鏍煎瀷鍙�");
+ return AjaxResult.error("璇峰厛閫夋嫨浜у搧鍐嶅鍏ヨ鏍煎瀷鍙�");
}
Product product = productMapper.selectById(productId);
if (product == null) {
- return R.fail("閫夋嫨鐨勪骇鍝佷笉瀛樺湪");
+ return AjaxResult.error("閫夋嫨鐨勪骇鍝佷笉瀛樺湪");
}
try {
@@ -139,7 +139,7 @@
List<ProductModel> productModelList = productModelExcelUtil.importExcel(file.getInputStream());
if (CollectionUtils.isEmpty(productModelList)) {
- return R.fail("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ return AjaxResult.error("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
// 鑾峰彇褰撳墠浜у搧涓嬫墍鏈夌殑瑙勬牸鍨嬪彿鍚�
@@ -154,13 +154,13 @@
int rowNum = i + 2;
if (StringUtils.isEmpty(item.getProductCode())) {
- return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [浜у搧缂栫爜] 涓嶈兘涓虹┖");
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [浜у搧缂栫爜] 涓嶈兘涓虹┖");
}
if (StringUtils.isEmpty(item.getModel())) {
- return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
}
if (StringUtils.isEmpty(item.getUnit())) {
- return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
}
// 鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
@@ -180,9 +180,9 @@
}
if (skipCount == 0) {
- return R.ok(null, String.format("鎴愬姛瀵煎叆 %d 鏉℃暟鎹�", waitToSaveList.size()));
+ return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉℃暟鎹�", waitToSaveList.size()));
} else {
- return R.ok(null, String.format("鎴愬姛瀵煎叆 %d 鏉★紝璺宠繃宸插瓨鍦ㄦ暟鎹� %d 鏉�", waitToSaveList.size(), skipCount));
+ return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉★紝璺宠繃宸插瓨鍦ㄦ暟鎹� %d 鏉�", waitToSaveList.size(), skipCount));
}
} catch (Exception e) {
log.error("瀵煎叆浜у搧瑙勬牸寮傚父", e);
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index 98b3f23..6adaf2a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.SupplierManageDto;
@@ -13,8 +12,6 @@
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import jakarta.servlet.http.HttpServletResponse;
@@ -33,7 +30,6 @@
private final SupplierManageMapper supplierMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final SysDictDataMapper sysDictDataMapper;
/**
* 渚涘簲鍟嗘柊澧�
@@ -111,22 +107,13 @@
}
@Override
- public R importData(MultipartFile file) {
+ public Boolean importData(MultipartFile file) {
+
try {
ExcelUtil<SupplierManageExcelDto> util = new ExcelUtil<SupplierManageExcelDto>(SupplierManageExcelDto.class);
List<SupplierManageExcelDto> list = util.importExcel(file.getInputStream());
-
- if (CollectionUtils.isEmpty(list)) {
- return R.fail("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
- }
-
ArrayList<SupplierManage> supplierManages = new ArrayList<>();
list.stream().forEach(dto -> {
- // 渚涘簲鍟嗙被鍨嬫槸鍚﹀瓨鍦� 锛堢敳涔欎笝涓侊級
- String supplierType = dto.getSupplierType();
- if (!supplierType.equals("鐢�") && !supplierType.equals("涔�") && !supplierType.equals("涓�") && !supplierType.equals("涓�")) {
- throw new RuntimeException("渚涘簲鍟嗙被鍨� " + supplierType + " 涓嶅瓨鍦紒");
- }
SupplierManage supplierManage = new SupplierManage();
BeanUtils.copyProperties(dto,supplierManage);
supplierManage.setMaintainTime(LocalDate.now());
@@ -137,10 +124,10 @@
});
this.saveOrUpdateBatch(supplierManages);
- return R.ok("瀵煎叆鎴愬姛");
+ return true;
}catch (Exception e){
e.printStackTrace();
- return R.fail(e.getMessage());
}
+ return false;
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index 8be45b5..d622e99 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -7,8 +7,7 @@
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,39 +20,39 @@
@RestController
@RequestMapping("/dutyPlan")
@AllArgsConstructor
-public class DutyPlanController extends BaseController {
+public class DutyPlanController {
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, DutyPlanDTO dutyPlanDTO){
- return R.ok(dutyPlanService.listPage(page, dutyPlanDTO));
+ public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
+ return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
@Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
- public R<?> getNum(){
- return R.ok(dutyPlanService.getNum());
+ public AjaxResult getNum(){
+ return AjaxResult.success(dutyPlanService.getNum());
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody DutyPlan dutyPlan){
- return R.ok(dutyPlanService.save(dutyPlan));
+ public AjaxResult add(@RequestBody DutyPlan dutyPlan){
+ return AjaxResult.success(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody DutyPlan dutyPlan){
- return R.ok(dutyPlanService.updateById(dutyPlan));
+ public AjaxResult update(@RequestBody DutyPlan dutyPlan){
+ return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(dutyPlanService.removeBatchByIds(ids));
+ return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
@Operation(summary = "瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index e3ef9b6..ba1df00 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -9,7 +9,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -32,27 +32,27 @@
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, NoticeDTO noticeDTO){
- return R.ok(noticeService.listPage(page, noticeDTO));
+ public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
+ return AjaxResult.success(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody NoticeDTO noticeDTO){
+ public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
if (noticeDTO.getStatus()==1){
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
noticeDTO.getTitle(),
"/collaborativeApproval/noticeManagement?type="+noticeDTO.getType());
}
- return R.ok(noticeService.save(noticeDTO));
+ return AjaxResult.success(noticeService.save(noticeDTO));
}
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody NoticeDTO noticeDTO){
+ public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
Notice notice = noticeService.getById(noticeDTO.getId());
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
@@ -60,23 +60,23 @@
notice.getTitle(),
"/collaborativeApproval/noticeManagement?type="+notice.getType());
}
- return R.ok(noticeService.updateById(noticeDTO));
+ return AjaxResult.success(noticeService.updateById(noticeDTO));
}
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("ids") List<Long> ids){
+ public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(noticeService.removeBatchByIds(ids));
+ return AjaxResult.success(noticeService.removeBatchByIds(ids));
}
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
@Operation(summary = "鑾峰彇鍏憡鏁伴噺")
- public R<?> count(){
- return R.ok(noticeService.selectCount());
+ public AjaxResult count(){
+ return AjaxResult.success(noticeService.selectCount());
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
index e90d5d1..dba3e77 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
@@ -5,8 +5,7 @@
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.collaborativeApproval.pojo.NoticeType;
import com.ruoyi.collaborativeApproval.service.NoticeTypeService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -25,7 +24,7 @@
@RestController
@RequestMapping("/noticeType")
@AllArgsConstructor
-public class NoticeTypeController extends BaseController {
+public class NoticeTypeController {
private NoticeTypeService noticeTypeService;
@@ -35,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody NoticeType noticeType) {
- return R.ok(noticeTypeService.saveOrUpdate(noticeType));
+ public AjaxResult add(@RequestBody NoticeType noticeType) {
+ return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
}
/**
@@ -45,11 +44,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delNoticeType(@RequestBody List<Integer> ids) {
+ public AjaxResult delNoticeType(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(noticeTypeService.removeBatchByIds(ids));
+ return AjaxResult.success(noticeTypeService.removeBatchByIds(ids));
}
/**
@@ -57,8 +56,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> noticeTypeList() {
- return R.ok(noticeTypeService.list());
+ public AjaxResult noticeTypeList() {
+ return AjaxResult.success(noticeTypeService.list());
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index 2496515..5e59117 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -8,8 +8,7 @@
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -24,57 +23,57 @@
@RequestMapping("/rulesRegulationsManagement")
@AllArgsConstructor
@Tag(name = "鍒跺害绠＄悊")
-public class RulesRegulationsManagementController extends BaseController {
+public class RulesRegulationsManagementController {
private RulesRegulationsManagementService rulesRegulationsManagementService;
private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
- return R.ok(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
+ public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
+ return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+ public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
rulesRegulationsManagementService.save(rulesRegulationsManagement);
- return R.ok(rulesRegulationsManagement.getId());
+ return AjaxResult.success(rulesRegulationsManagement.getId());
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
- return R.ok(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
+ public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+ return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("ids") List<Long> ids){
+ public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(rulesRegulationsManagementService.removeBatchByIds(ids));
+ return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
}
//瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
@PostMapping("/addReadingStatus")
@Operation(summary = "鏂板闃呰鐘舵��")
- public R<?> addReadingStatus(@RequestBody ReadingStatus readingStatus){
- return R.ok(readingStatusMapper.insert(readingStatus));
+ public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.insert(readingStatus));
}
@PostMapping("/updateReadingStatus")
@Operation(summary = "淇敼闃呰鐘舵��")
- public R<?> updateReadingStatus(@RequestBody ReadingStatus readingStatus){
- return R.ok(readingStatusMapper.updateById(readingStatus));
+ public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
}
@GetMapping("/getReadingStatusList")
@Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
- public R<?> listPage(Page page, ReadingStatus readingStatus){
- return R.ok(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+ public AjaxResult listPage(Page page, ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
}
@GetMapping("/getReadingStatusByRuleId/{ruleId}")
@Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
- public R<?> getReadingStatusByRuleId(@PathVariable Long ruleId){
- return R.ok(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+ public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
+ return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
}
@Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
index 4d77ff7..3f770f8 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
import org.springframework.util.CollectionUtils;
@@ -23,7 +22,7 @@
*/
@RestController
@RequestMapping("/rulesRegulationsManagementFile")
-public class RulesRegulationsManagementFileController extends BaseController {
+public class RulesRegulationsManagementFileController {
@Resource
private RulesRegulationsManagementFileService rulesRegulationsManagementFileService;
@@ -35,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return R.ok(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
+ public AjaxResult add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return AjaxResult.success(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
}
/**
@@ -45,12 +44,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(rulesRegulationsManagementFileService.removeBatchByIds(ids));
+ return AjaxResult.success(rulesRegulationsManagementFileService.removeBatchByIds(ids));
}
/**
@@ -60,8 +59,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return R.ok(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
+ public AjaxResult listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return AjaxResult.success(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index e9e411f..dc6a64e 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -11,8 +11,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -29,20 +28,20 @@
@RestController
@RequestMapping("/sealApplicationManagement")
@Tag(name = "鐢ㄥ嵃鐢宠绠＄悊")
-public class SealApplicationManagementController extends BaseController {
+public class SealApplicationManagementController {
private SealApplicationManagementService sealApplicationManagementService;
private ISysNoticeService sysNoticeService;
private FileUtil fileUtil;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, SealApplicationManagement sealApplicationManagement){
- return R.ok(sealApplicationManagementService.listPage(page,sealApplicationManagement));
+ public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
+ return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public AjaxResult add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
sealApplicationManagementService.save(sealApplicationManagement);
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
@@ -55,30 +54,30 @@
+"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
Arrays.asList(sealApplicationManagement.getApproveUserId()),
"/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public AjaxResult update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
sealApplicationManagement.getId(),
sealApplicationManagement.getStorageBlobDTOs());
- return R.ok(sealApplicationManagementService.updateById(sealApplicationManagement));
+ return AjaxResult.success(sealApplicationManagementService.updateById(sealApplicationManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("ids") List<Long> ids){
+ public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
ids);
- return R.ok(sealApplicationManagementService.removeBatchByIds(ids));
+ return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
@Operation(summary = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index fa72a40..3673208 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -4,8 +4,7 @@
import com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO;
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -13,27 +12,27 @@
@RestController
@RequestMapping("/staffContactsPersonal")
@AllArgsConstructor
-public class StaffContactsPersonalController extends BaseController {
+public class StaffContactsPersonalController {
private StaffContactsPersonalService staffContactsPersonalService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
- return R.ok(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
+ public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
+ return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
- return R.ok(staffContactsPersonalService.save(staffContactsPersonal));
+ public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
+ return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("id") Long id) {
+ public AjaxResult delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
// }
- return R.ok(staffContactsPersonalService.removeById(id));
+ return AjaxResult.success(staffContactsPersonalService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index ecde7dd..25f91c5 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,37 +40,37 @@
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "钖叕缁╂晥-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, String staffName, String payDateStr) {
+ public AjaxResult listPage(Page page, String staffName, String payDateStr) {
IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody CompensationPerformance compensationPerformance) {
+ public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
- return save ? R.ok(null, "娣诲姞鎴愬姛") : R.fail("娣诲姞澶辫触");
+ return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
}
@PostMapping("/update")
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody CompensationPerformance compensationPerformance) {
+ public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
- return update ? R.ok(null, "淇敼鎴愬姛") : R.fail("淇敼澶辫触");
+ return update ? AjaxResult.success("淇敼鎴愬姛") : AjaxResult.error("淇敼澶辫触");
}
@DeleteMapping("/delete")
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
boolean delete = compensationPerformanceService.removeBatchByIds(ids);
- return delete ? R.ok(null, "鍒犻櫎鎴愬姛") : R.fail("鍒犻櫎澶辫触");
+ return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@@ -91,7 +91,7 @@
@Log(title = "瀵煎叆钖祫绠＄悊鍒楄〃", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public R<?> importData(MultipartFile file) throws Exception {
+ public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
List<CompensationPerformance> list = util.importExcel(file.getInputStream());
list.forEach(item -> {
@@ -101,7 +101,7 @@
}
});
boolean b = compensationPerformanceService.saveBatch(list);
- return R.ok(b);
+ return AjaxResult.success(b);
}
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 5efdf5a..586ee42 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -31,46 +31,46 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, CustomerVisits customerVisits) {
+ public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@Log(title = "瀹㈡埛鎷滆-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody CustomerVisits customerVisits) {
+ public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
boolean save = customerVisitsService.save(customerVisits);
if (save) {
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
- return R.fail("娣诲姞澶辫触");
+ return AjaxResult.error("娣诲姞澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
@Operation(summary = "瀹㈡埛鎷滆-缂栬緫")
@PostMapping("update")
- public R<?> updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
+ public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
if (updateResult) {
- return R.ok(null, "缂栬緫鎴愬姛");
+ return AjaxResult.success("缂栬緫鎴愬姛");
}
- return R.fail("缂栬緫澶辫触");
+ return AjaxResult.error("缂栬緫澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "瀹㈡埛鎷滆-鍒犻櫎")
@DeleteMapping("{customerId}")
- public R<?> deleteCustomerVisit(@PathVariable Integer customerId) {
+ public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
if (customerId == null) {
- return R.fail("瀹㈡埛ID涓嶈兘涓虹┖");
+ return AjaxResult.error("瀹㈡埛ID涓嶈兘涓虹┖");
}
boolean deleteResult = customerVisitsService.removeById(customerId);
if (deleteResult) {
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
- return R.fail("鍒犻櫎澶辫触");
+ return AjaxResult.error("鍒犻櫎澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
index 0cd35cf..1f8d1ef 100644
--- a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
+++ b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.customervisits.pojo.CustomerVisits;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* @author :yys
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index ba8de8b..1fd1c04 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -4,8 +4,7 @@
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.service.DeviceDefectRecordService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -15,35 +14,35 @@
@RequestMapping("/defect")
@AllArgsConstructor
@RestController
-public class DeviceDefectRecordController extends BaseController {
+public class DeviceDefectRecordController {
private DeviceDefectRecordService deviceDefectRecordService;
@Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
- return R.ok(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
+ public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
+ return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
@Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
- public R<?> find(@PathVariable Long deviceLedgerId) {
+ public AjaxResult find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(deviceLedgerId);
- return R.ok(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
+ return AjaxResult.success(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
- public R<?> add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return R.ok(deviceDefectRecordService.add(deviceDefectRecord));
+ public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
- public R<?> update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return R.ok(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
+ public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
- public R<?> delete(@PathVariable Long id) {
- return R.ok(deviceDefectRecordService.removeById(id));
+ public AjaxResult delete(@PathVariable Long id) {
+ return AjaxResult.success(deviceDefectRecordService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index 40c6dad..f4b807d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -12,8 +12,7 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -29,7 +28,7 @@
@RequestMapping("/device/ledger")
@RestController
@AllArgsConstructor
-public class DeviceLedgerController extends BaseController {
+public class DeviceLedgerController {
private IDeviceLedgerService deviceLedgerService;
private DeviceLedgerMapper deviceLedgerMapper;
@@ -39,37 +38,37 @@
@Operation(summary = "璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceLedgerDto deviceLedger) {
- return R.ok(deviceLedgerService.queryPage(page,deviceLedger));
+ public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {
+ return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧鍙拌处")
- public R<?> add(@RequestBody DeviceLedger deviceLedger) {
+ public AjaxResult add(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.saveDeviceLedger(deviceLedger);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鍙拌处")
@GetMapping("/{id}")
- public R<?> detail(@PathVariable Long id) {
- return R.ok(deviceLedgerService.getById(id));
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(deviceLedgerService.getById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧鍙拌处")
- public R<?> update(@RequestBody DeviceLedger deviceLedger) {
+ public AjaxResult update(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.updateDeviceLedger(deviceLedger);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鍙拌处")
- public R<?> delete(@PathVariable("ids") ArrayList<Long> ids) {
+ public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) {
boolean b = deviceLedgerService.removeBatchByIds(ids);
if (!b) {
- return R.fail("鍒犻櫎澶辫触");
+ return AjaxResult.error("鍒犻櫎澶辫触");
}
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("export")
@@ -87,32 +86,32 @@
@PostMapping("/import")
@Operation(summary = "瀵煎叆璁惧鍙拌处")
- public R<?> importData(MultipartFile file) throws IOException {
+ public AjaxResult importData(MultipartFile file) throws IOException {
Boolean b = deviceLedgerService.importData(file);
if (b) {
- return R.ok(null, "瀵煎叆鎴愬姛");
+ return AjaxResult.success("瀵煎叆鎴愬姛");
}
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
@GetMapping("getDeviceLedger")
@Operation(summary = "鑾峰彇璁惧鍙拌处")
- public R<?> getDeviceLedger( ) {
- return R.ok(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
+ public AjaxResult getDeviceLedger( ) {
+ return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
.select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel)));
}
@GetMapping("scanDevice")
@Operation(summary = "鑾峰彇璁惧鍙拌处")
@Anonymous
- public R<?> scanDevice(Long id) {
+ public AjaxResult scanDevice(Long id) {
List<DeviceMaintenance> list = deviceMaintenanceMapper.list1(id);
DeviceLedger deviceLedger = deviceLedgerMapper.selectById1(id);
if (list.size()>0){
deviceLedger.setUpdateTime(list.get(0).getMaintenanceActuallyTime());//鏈�鍚庣淮鎶ゆ椂闂�
}
deviceLedger.setCreateTime(deviceLedger.getUpdateTime().plusMonths(1));//涓嬫缁存姢鏃堕棿
- return R.ok(deviceLedger);
+ return AjaxResult.success(deviceLedger);
}
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 5442195..e34fc37 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -7,8 +7,7 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -21,7 +20,7 @@
@RestController
@RequestMapping("/device/maintenance")
@AllArgsConstructor
-public class DeviceMaintenanceController extends BaseController {
+public class DeviceMaintenanceController {
private IDeviceMaintenanceService deviceMaintenanceService;
@@ -29,13 +28,13 @@
@Operation(summary = "璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
- return R.ok(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
+ public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
+ return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧淇濆吇")
- public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -44,13 +43,13 @@
@Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
- public R<?> detail(@PathVariable Long id) {
- return R.ok(deviceMaintenanceService.detailById(id));
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧淇濆吇")
- public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -59,19 +58,19 @@
@PostMapping ("maintenance")
@Operation(summary = "淇敼璁惧淇濆吇")
- public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧淇濆吇")
- public R<?> delete(@PathVariable("ids") Long[] ids) {
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return R.fail("鍒犻櫎澶辫触");
+ return AjaxResult.error("鍒犻櫎澶辫触");
}
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("export")
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
index f4e1dd4..d92d334 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +23,7 @@
@RestController
@RequestMapping("/maintenanceTaskFile")
@Tag(name = "璁惧淇濆吇闄勪欢")
-public class DeviceMaintenanceFileController extends BaseController {
+public class DeviceMaintenanceFileController {
@Resource
private DeviceMaintenanceFileService deviceMaintenanceFileService;
@@ -36,8 +35,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
- return R.ok(deviceMaintenanceFileService.save(deviceMaintenanceFile));
+ public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
+ return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
}
/**
@@ -46,12 +45,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(deviceMaintenanceFileService.removeBatchByIds(ids));
+ return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
}
/**
@@ -61,8 +60,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
- return R.ok(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
+ public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
+ return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 1b43372..7df7c26 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,8 +5,7 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,54 +18,54 @@
@RequestMapping("/device/repair")
@RestController
@AllArgsConstructor
-public class DeviceRepairController extends BaseController {
+public class DeviceRepairController {
private IDeviceRepairService deviceRepairService;
@Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public R<?> page(Page page , DeviceRepairDto deviceRepairDto) {
- return R.ok(deviceRepairService.queryPage(page,deviceRepairDto));
+ public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
+ return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧鎶ヤ慨")
- public R<?> add( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.saveDeviceRepair(deviceRepairDto);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
- public R<?> detail(@PathVariable Long id) {
- return R.ok(deviceRepairService.detailById(id));
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(deviceRepairService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧鎶ヤ慨")
- public R<?> update( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
@PostMapping ("/repair")
@Operation(summary = "璁惧缁翠慨")
- public R<?> repair( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.confirmRepair(deviceRepairDto);
}
@PostMapping ("/acceptance")
@Operation(summary = "璁惧鎶ヤ慨楠屾敹瀹℃壒")
- public R<?> acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
+ public AjaxResult acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.approveRepairAcceptance(deviceRepairDto);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
- public R<?> delete(@PathVariable("ids") Long[] ids) {
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return R.fail("鍒犻櫎澶辫触");
+ return AjaxResult.error("鍒犻櫎澶辫触");
}
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("export")
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index 76fefc3..b6f8c27 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -31,7 +31,7 @@
@GetMapping("/listPage")
@Operation(summary = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
- public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
+ public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
return maintenanceTaskService.listPage(page,maintenanceTask);
}
@@ -39,21 +39,21 @@
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody MaintenanceTask maintenanceTask) {
+ public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.add(maintenanceTask);
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody MaintenanceTask maintenanceTask) {
+ public AjaxResult update(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.updateByMaintenanceTaskId(maintenanceTask);
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
return maintenanceTaskService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
index a0d954e..d34ea65 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,9 +14,9 @@
public interface IDeviceLedgerService extends IService<DeviceLedger> {
IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);
- R<?> saveDeviceLedger(DeviceLedger deviceLedger);
+ AjaxResult saveDeviceLedger(DeviceLedger deviceLedger);
- R<?> updateDeviceLedger(DeviceLedger deviceLedger);
+ AjaxResult updateDeviceLedger(DeviceLedger deviceLedger);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
index 6f0077f..e5a4080 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,9 +14,9 @@
IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);
- R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
+ AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
- R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
+ AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index f6e112c..ae0b913 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,13 +15,13 @@
IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);
- R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto);
+ AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto);
- R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto);
+ AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto);
- R<?> confirmRepair(DeviceRepairDto deviceRepairDto);
+ AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto);
- R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
+ AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
index 3364d0a..19cb6ed 100644
--- a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
+++ b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.MaintenanceTask;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import java.util.List;
@@ -12,11 +12,11 @@
* @date : 2025/12/22 14:56
*/
public interface MaintenanceTaskService extends IService<MaintenanceTask> {
- R<?> listPage(Page page, MaintenanceTask maintenanceTask);
+ AjaxResult listPage(Page page, MaintenanceTask maintenanceTask);
- R<?> add(MaintenanceTask maintenanceTask);
+ AjaxResult add(MaintenanceTask maintenanceTask);
- R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
+ AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 2b9c9be..b4c5d65 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -13,7 +13,7 @@
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import jakarta.servlet.http.HttpServletResponse;
@@ -44,25 +44,25 @@
}
@Override
- public R<?> saveDeviceLedger(DeviceLedger deviceLedger) {
+ public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceName,deviceLedger.getDeviceName());
if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
- return R.fail("璁惧鍚嶇О宸插瓨鍦�");
+ return AjaxResult.error("璁惧鍚嶇О宸插瓨鍦�");
}
boolean save = this.save(deviceLedger);
if (save){
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@Override
- public R<?> updateDeviceLedger(DeviceLedger deviceLedger) {
+ public AjaxResult updateDeviceLedger(DeviceLedger deviceLedger) {
if (this.updateById(deviceLedger)) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 779714f..fbf03ad 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -15,7 +15,7 @@
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
@@ -48,19 +48,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
boolean save = this.save(deviceMaintenance);
if (save){
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
+ public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
@@ -85,7 +85,7 @@
record.setQuantity(sparePartUse.getQuantity());
sparePartsRequisitionRecordService.save(record);
} else {
- return R.fail("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
+ return AjaxResult.error("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
}
}
}
@@ -98,9 +98,9 @@
if (this.updateById(deviceMaintenance)) {
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 98f0d27..e5a73ac 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -18,7 +18,7 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
@@ -63,7 +63,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ public AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
deviceRepairDto.setDeviceName(byId.getDeviceName());
deviceRepairDto.setDeviceModel(byId.getDeviceModel());
@@ -74,23 +74,23 @@
if (save) {
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, deviceRepairDto.getId(), deviceRepairDto.getStorageBlobDTOs());
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail("淇濆瓨澶辫触");
+ return AjaxResult.error("淇濆瓨澶辫触");
}
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ public AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (deviceRepairDto.getStatus() != null
&& deviceRepairDto.getStatus() == STATUS_COMPLETED
&& (oldDeviceRepair.getStatus() == null
|| oldDeviceRepair.getStatus() != STATUS_COMPLETED)) {
- return R.fail("璇峰厛鎻愪氦楠屾敹瀹℃壒锛岄獙鏀堕�氳繃鍚庢墠鍙畬缁�");
+ return AjaxResult.error("璇峰厛鎻愪氦楠屾敹瀹℃壒锛岄獙鏀堕�氳繃鍚庢墠鍙畬缁�");
}
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (CollectionUtils.isNotEmpty(deviceRepairDto.getSparePartsUseList())) {
@@ -115,7 +115,7 @@
record.setQuantity(sparePartUse.getQuantity());
sparePartsRequisitionRecordService.save(record);
} else {
- return R.fail("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
+ return AjaxResult.error("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
}
}
}
@@ -142,23 +142,23 @@
if (deviceRepairDto.getStorageBlobDTOs() != null) {
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, id, deviceRepairDto.getStorageBlobDTOs());
}
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> confirmRepair(DeviceRepairDto deviceRepairDto) {
+ public AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto) {
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (oldDeviceRepair.getStatus() != null && oldDeviceRepair.getStatus() == STATUS_COMPLETED) {
- return R.fail("璇ユ姤淇凡瀹岀粨锛屼笉鑳介噸澶嶇‘璁ょ淮淇�");
+ return AjaxResult.error("璇ユ姤淇凡瀹岀粨锛屼笉鑳介噸澶嶇‘璁ょ淮淇�");
}
if (oldDeviceRepair.getStatus() != null && oldDeviceRepair.getStatus() == STATUS_PENDING_ACCEPTANCE) {
- return R.fail("璇ユ姤淇凡鎻愪氦楠屾敹瀹℃壒");
+ return AjaxResult.error("璇ユ姤淇凡鎻愪氦楠屾敹瀹℃壒");
}
deviceRepairDto.setStatus(STATUS_PENDING_ACCEPTANCE);
return updateDeviceRepair(deviceRepairDto);
@@ -166,25 +166,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto) {
+ public AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto) {
if (deviceRepairDto.getId() == null) {
- return R.fail("鎶ヤ慨璁板綍id涓嶈兘涓虹┖");
+ return AjaxResult.error("鎶ヤ慨璁板綍id涓嶈兘涓虹┖");
}
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (oldDeviceRepair.getStatus() == null || oldDeviceRepair.getStatus() != STATUS_PENDING_ACCEPTANCE) {
- return R.fail("璇ユ姤淇湭杩涘叆寰呴獙鏀剁姸鎬侊紝涓嶈兘瀹℃壒");
+ return AjaxResult.error("璇ユ姤淇湭杩涘叆寰呴獙鏀剁姸鎬侊紝涓嶈兘瀹℃壒");
}
if (StringUtils.isBlank(deviceRepairDto.getAcceptanceName())) {
- return R.fail("楠屾敹浜轰笉鑳戒负绌�");
+ return AjaxResult.error("楠屾敹浜轰笉鑳戒负绌�");
}
if (deviceRepairDto.getAcceptanceTime() == null) {
- return R.fail("楠屾敹鏃堕棿涓嶈兘涓虹┖");
+ return AjaxResult.error("楠屾敹鏃堕棿涓嶈兘涓虹┖");
}
if (StringUtils.isBlank(deviceRepairDto.getAcceptanceRemark())) {
- return R.fail("楠屾敹澶囨敞涓嶈兘涓虹┖");
+ return AjaxResult.error("楠屾敹澶囨敞涓嶈兘涓虹┖");
}
DeviceRepair update = new DeviceRepair();
@@ -194,9 +194,9 @@
update.setAcceptanceRemark(deviceRepairDto.getAcceptanceRemark());
update.setStatus(STATUS_COMPLETED);
if (this.updateById(update)) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail("楠屾敹瀹℃壒澶辫触");
+ return AjaxResult.error("楠屾敹瀹℃壒澶辫触");
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 8d0caee..3aaac94 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -6,8 +6,7 @@
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.service.MaintenanceTaskService;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
@@ -34,11 +33,11 @@
private final MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
- public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
+ public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
if (taskPage.getRecords().isEmpty()) {
- return R.ok(taskPage);
+ return AjaxResult.success(taskPage);
}
// 3. 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑鐢ㄦ埛ID
@@ -63,11 +62,11 @@
task.setRegistrant(userNickNameMap.getOrDefault(task.getRegistrantId(), "鏈煡鐢ㄦ埛"));
}
});
- return R.ok(taskPage);
+ return AjaxResult.success(taskPage);
}
@Override
- public R<?> add(MaintenanceTask maintenanceTask) {
+ public AjaxResult add(MaintenanceTask maintenanceTask) {
maintenanceTask.setActive(true);
// 璁＄畻棣栨鎵ц鏃堕棿
TimingTask task = new TimingTask();
@@ -79,31 +78,31 @@
if (insert > 0) {
maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
}
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
@Override
- public R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
+ public AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
MaintenanceTask maintenanceTask1 = maintenanceTaskMapper.selectById(maintenanceTask.getId());
if (maintenanceTask1 == null) {
- return R.fail(HttpStatus.WARN, "娌℃湁姝ゆ暟鎹�");
+ return AjaxResult.warn("娌℃湁姝ゆ暟鎹�");
}
BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
int update = maintenanceTaskMapper.updateById(maintenanceTask1);
if (update > 0) {
maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
}
- return R.ok(null, "鏇存柊鎴愬姛");
+ return AjaxResult.success("鏇存柊鎴愬姛");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
int delete = maintenanceTaskMapper.deleteBatchIds(ids);
if (delete > 0) {
ids.forEach(id -> {
maintenanceTaskScheduler.unscheduleMaintenanceTask(id);
});
}
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
index c08958b..bba6088 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -36,26 +36,26 @@
@GetMapping("/listPage")
@Operation(summary = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
+ public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "鐢ㄧ數鍖哄煙-鏂板")
@Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
+ public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
boolean save = electricityConsumptionAreaService.saveOrUpdate(electricityConsumptionArea);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "鐢ㄧ數鍖哄煙-鍒犻櫎")
@Log(title = "鐢ㄧ數鍖哄煙-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = electricityConsumptionAreaService.removeBatchByIds(ids);
- return remove ? R.ok() : R.fail();
+ return remove ? AjaxResult.success() : AjaxResult.error();
}
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index e0f3ed1..e0409b5 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -28,42 +28,42 @@
@GetMapping("/listPage")
@Operation(summary = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, EnergyPeriod energyPeriod) {
+ public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "鐢ㄧ數鏃舵-鏂板")
@Log(title = "鐢ㄧ數鏃舵-鏂板", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody EnergyPeriod energyPeriod) {
+ public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
boolean save = energyPeriodService.save(energyPeriod);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/addBatch")
@Operation(summary = "鐢ㄧ數鏃舵-鎵归噺鏂板")
@Log(title = "鐢ㄧ數鏃舵-鎵归噺鏂板", businessType = BusinessType.INSERT)
- public R<?> addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
+ public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
boolean save = energyPeriodService.saveBatch(energyPeriods);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "鐢ㄧ數鏃舵-淇敼")
@Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody EnergyPeriod energyPeriod) {
+ public AjaxResult update(@RequestBody EnergyPeriod energyPeriod) {
boolean update = energyPeriodService.updateById(energyPeriod);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "鐢ㄧ數鏃舵-鍒犻櫎")
@Log(title = "鐢ㄧ數鏃舵-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = energyPeriodService.removeBatchByIds(ids);
- return remove ? R.ok() : R.fail("鍒犻櫎澶辫触");
+ return remove ? AjaxResult.success() : AjaxResult.error("鍒犻櫎澶辫触");
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index c18d5f7..d401a99 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -12,7 +12,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -41,50 +41,50 @@
@GetMapping("/listPage")
@Operation(summary = "璁惧鑳借��-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public AjaxResult listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@GetMapping("/deviceList")
@Operation(summary = "璁惧鍙拌处-鏌ヨ")
@Log(title = "璁惧鍙拌处-鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> deviceList(DeviceLedger deviceLedger) {
+ public AjaxResult deviceList(DeviceLedger deviceLedger) {
List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "璁惧鑳借��-鏂板")
@Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/addBatch")
@Operation(summary = "璁惧鑳借��-鎵归噺鏂板")
@Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
- public R<?> addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+ public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
boolean save = equipmentEnergyConsumptionService.saveBatch(list);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "璁惧鑳借��-淇敼")
@Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "璁惧鑳借��-鍒犻櫎")
@Log(title = "璁惧鑳借��-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = equipmentEnergyConsumptionService.removeBatchByIds(ids);
- return remove ? R.ok() : R.fail();
+ return remove ? AjaxResult.success() : AjaxResult.error();
}
/**
@@ -93,7 +93,7 @@
@Log(title = "瀵煎叆璁惧鑳借��", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
@Operation(summary = "瀵煎叆璁惧鑳借��")
- public R<?> importData(MultipartFile file) throws Exception {
+ public AjaxResult importData(MultipartFile file) throws Exception {
return equipmentEnergyConsumptionService.importData(file);
}
@@ -114,9 +114,9 @@
@GetMapping("/listPageByTrend")
@Operation(summary = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
/**
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
index fabe267..830e808 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -19,7 +19,7 @@
IPage<EquipmentEnergyConsumption> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
- R<?> importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
IPage<EquipmentEnergyConsumption> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
index 063a163..486ad48 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -10,8 +10,7 @@
import com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -42,18 +41,18 @@
}
@Override
- public R<?> importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
try {
ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
List<EquipmentEnergyConsumption> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return R.ok(true);
+ return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index 3edde93..5c6fe3e 100644
--- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
@@ -93,69 +93,69 @@
/**
* 杩斿洖鎴愬姛
*/
- public R<?> success()
+ public AjaxResult success()
{
- return R.ok();
+ return AjaxResult.success();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public R<?> success(String message)
+ public AjaxResult success(String message)
{
- return R.ok(null, message);
+ return AjaxResult.success(message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public R<?> success(Object data)
+ public AjaxResult success(Object data)
{
- return R.ok(data);
+ return AjaxResult.success(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public R<?> error()
+ public AjaxResult error()
{
- return R.fail();
+ return AjaxResult.error();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public R<?> error(String message)
+ public AjaxResult error(String message)
{
- return R.fail(message);
+ return AjaxResult.error(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public R<?> warn(String message)
+ public AjaxResult warn(String message)
{
- return R.fail(HttpStatus.WARN, message);
+ return AjaxResult.warn(message);
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected R<?> toAjax(int rows)
+ protected AjaxResult toAjax(int rows)
{
- return rows > 0 ? R.ok() : R.fail();
+ return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected R<?> toAjax(boolean result)
+ protected AjaxResult toAjax(boolean result)
{
return result ? success() : error();
}
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 8ef87a5..41ae224 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -5,12 +5,12 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,288 +37,288 @@
@GetMapping("/todos")
@Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
@Operation(summary = "寰呭姙浜嬮」")
- public R todos(ApproveProcess req) throws ParseException {
+ public AjaxResult todos(ApproveProcess req) throws ParseException {
List<ApproveProcess> approveProcessList = homeService.todos();
- return R.ok(approveProcessList);
+ return AjaxResult.success(approveProcessList);
}
@GetMapping("/approveAndDeviceTodos")
@Operation(summary = "瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
- public R approveAndDeviceTodos(){
+ public AjaxResult approveAndDeviceTodos(){
Map<String, Object> map = homeService.approveAndDeviceTodos();
- return R.ok(map);
+ return AjaxResult.success(map);
}
@GetMapping("/noticesCount")
@Operation(summary = "鏈繃鏈熺殑鍏憡鏁伴噺")
- public R noticesCount(){
+ public AjaxResult noticesCount(){
Long count = homeService.noticesCount();
- return R.ok(count);
+ return AjaxResult.success(count);
}
@GetMapping("/deptStaffDistribution")
@Operation(summary = "鍚勯儴闂ㄤ汉鍛樺垎甯�")
- public R deptStaffDistribution() {
+ public AjaxResult deptStaffDistribution() {
DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
@GetMapping("/summaryStatistics")
@Operation(summary = "鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
- public R summaryStatistics() {
+ public AjaxResult summaryStatistics() {
HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
- return R.ok(homeSummaryDto);
+ return AjaxResult.success(homeSummaryDto);
}
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@Operation(summary = "渚涘簲鍟嗛噰璐帓鍚�")
- public R supplierPurchaseRanking(@DefaultType Integer type) {
+ public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/customerRevenueAnalysis")
@Operation(summary = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
- public R customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
+ public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
@GetMapping("/customerContributionRanking")
@Operation(summary = "瀹㈡埛閲戦璐＄尞鎺掑悕")
- public R customerContributionRanking(@DefaultType Integer type) {
+ public AjaxResult customerContributionRanking(@DefaultType Integer type) {
List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/productSalesAnalysis")
@Operation(summary = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
- public R productSalesAnalysis() {
+ public AjaxResult productSalesAnalysis() {
List<MapDto> list = homeService.productSalesAnalysis();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/rawMaterialPurchaseAmountRatio")
@Operation(summary = "鍘熸潗鏂欓噰璐噾棰濆崰姣�")
- public R rawMaterialPurchaseAmountRatio(){
+ public AjaxResult rawMaterialPurchaseAmountRatio(){
List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
@Operation(summary = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
- public R business(HomeBusinessDto req) {
+ public AjaxResult business(HomeBusinessDto req) {
HomeBusinessDto homeBusinessDto = homeService.business();
- return R.ok(homeBusinessDto);
+ return AjaxResult.success(homeBusinessDto);
}
@GetMapping("/analysisCustomerContractAmounts")
@Log(title = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽", businessType = BusinessType.OTHER)
@Operation(summary = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽")
- public R analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
+ public AjaxResult analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
AnalysisCustomerContractAmountsDto analysisCustomerContractAmounts = homeService.analysisCustomerContractAmounts();
- return R.ok(analysisCustomerContractAmounts);
+ return AjaxResult.success(analysisCustomerContractAmounts);
}
/********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/inputOutputAnalysis")
@Operation(summary = "鎶曞叆浜у嚭鍒嗘瀽")
- public R inputOutputAnalysis(@DefaultType Integer type){
+ public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/processOutputAnalysis")
@Operation(summary = "宸ュ簭浜у嚭鍒嗘瀽")
- public R processOutputAnalysis(@DefaultType Integer type){
+ public AjaxResult processOutputAnalysis(@DefaultType Integer type){
List<MapDto> list = homeService.processOutputAnalysis(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/workOrderEfficiencyAnalysis")
@Operation(summary = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
- public R workOrderEfficiencyAnalysis(@DefaultType Integer type){
+ public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/productionAccountingAnalysis")
@Operation(summary = "鐢熶骇鏍哥畻鍒嗘瀽")
- public R productionAccountingAnalysis(@DefaultType Integer type){
+ public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/orderCount")
@Operation(summary = "璁㈠崟鏁�")
- public R orderCount(){
- return R.ok(homeService.orderCount());
+ public AjaxResult orderCount(){
+ return AjaxResult.success(homeService.orderCount());
}
@GetMapping("/progressStatistics")
@Operation(summary = "鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
- public R progressStatistics(){
+ public AjaxResult progressStatistics(){
ProductionProgressDto productionProgressDto = homeService.productionProgress();
- return R.ok(productionProgressDto);
+ return AjaxResult.success(productionProgressDto);
}
@GetMapping("/workInProcessTurnover")
@Operation(summary = "鍦ㄥ埗鍝佸懆杞儏鍐�")
- public R workInProcessTurnover(){
+ public AjaxResult workInProcessTurnover(){
ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
- return R.ok(productionTurnoverDto);
+ return AjaxResult.success(productionTurnoverDto);
}
@GetMapping("/processDataProductionStatistics")
@Operation(summary = "宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
- public R processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
+ public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
- return R.ok(list);
+ return AjaxResult.success(list);
}
/********************************************************璐ㄩ噺绫�*****************************************************/
@GetMapping("/rawMaterialDetection")
@Operation(summary = "鍘熸潗鏂欐娴�")
- public R rawMaterialDetection(@DefaultType Integer type){
- return R.ok(homeService.rawMaterialDetection(type));
+ public AjaxResult rawMaterialDetection(@DefaultType Integer type){
+ return AjaxResult.success(homeService.rawMaterialDetection(type));
}
@GetMapping("/processDetection")
@Operation(summary = "杩囩▼妫�娴�")
- public R processDetection(@DefaultType Integer type){
- return R.ok(homeService.processDetection(type));
+ public AjaxResult processDetection(@DefaultType Integer type){
+ return AjaxResult.success(homeService.processDetection(type));
}
@GetMapping("/factoryDetection")
@Operation(summary = "鎴愬搧鍑哄巶妫�娴�")
- public R factoryDetection(@DefaultType Integer type){
- return R.ok(homeService.factoryDetection(type));
+ public AjaxResult factoryDetection(@DefaultType Integer type){
+ return AjaxResult.success(homeService.factoryDetection(type));
}
@GetMapping("/qualityInspectionCount")
@Operation(summary = "璐ㄩ噺妫�楠屾暟閲�")
- public R qualityInspectionCount(){
+ public AjaxResult qualityInspectionCount(){
QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
- return R.ok(qualityInspectionCountDto);
+ return AjaxResult.success(qualityInspectionCountDto);
}
@GetMapping("/nonComplianceWarning")
@Operation(summary = "涓嶅悎鏍奸璀�")
- public R nonComplianceWarning(){
+ public AjaxResult nonComplianceWarning(){
NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
- return R.ok(nonComplianceWarningDto);
+ return AjaxResult.success(nonComplianceWarningDto);
}
@GetMapping("/completedInspectionCount")
@Operation(summary = "瀹屾垚妫�楠屾暟")
- public R completedInspectionCount(){
+ public AjaxResult completedInspectionCount(){
List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/unqualifiedProductRanking")
@Operation(summary = "涓嶅悎鏍间骇鍝佹帓鍚�")
- public R unqualifiedProductRanking(){
+ public AjaxResult unqualifiedProductRanking(){
List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/unqualifiedProductProcessingAnalysis")
@Operation(summary = "涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
- public R unqualifiedProductProcessingAnalysis(){
+ public AjaxResult unqualifiedProductProcessingAnalysis(){
List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/qualityStatistics")
@Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
@Operation(summary = "璐ㄩ噺鍒嗘瀽")
- public R qualityStatistics(QualityStatisticsDto req) {
+ public AjaxResult qualityStatistics(QualityStatisticsDto req) {
QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
- return R.ok(qualityStatisticsDto);
+ return AjaxResult.success(qualityStatisticsDto);
}
@GetMapping("/qualityInspectionStatistics")
@Operation(summary = "璐ㄩ噺缁熻")
- public R qualityInspectionStatistics(@DefaultType Integer type) {
+ public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
QualityStatisticsDto dto = homeService.qualityInspectionStatistics(type);
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
/********************************************************璐㈠姟绫�*****************************************************/
@GetMapping("/incomeExpenseAnalysis")
@Operation(summary = "鏀敹瀵规瘮鍒嗘瀽")
- public R incomeExpenseAnalysis(@DefaultType Integer type) {
+ public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/profitTrendAnalysis")
@Operation(summary = "鍒╂鼎瓒嬪娍鍒嗘瀽")
- public R profitTrendAnalysis(){
+ public AjaxResult profitTrendAnalysis(){
List<MapDto> list = homeService.profitTrendAnalysis();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/expenseCompositionAnalysis")
@Operation(summary = "鏋勬垚鍒嗘瀽")
- public R expenseCompositionAnalysis(@DefaultType Integer type) {
+ public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
List<MapDto> list = homeService.expenseCompositionAnalysis(type);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/monthlyIncome")
@Operation(summary = "鏈堝害鏀跺叆")
- public R monthlyIncome(){
+ public AjaxResult monthlyIncome(){
MonthlyIncomeDto dto = homeService.monthlyIncome();
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
@GetMapping("/monthlyExpenditure")
@Operation(summary = "鏈堝害鏀嚭")
- public R monthlyExpenditure(){
+ public AjaxResult monthlyExpenditure(){
MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
@Operation(summary = "搴旀敹搴斾粯缁熻")
- public R statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
+ public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
- return R.ok(statisticsReceivablePayable);
+ return AjaxResult.success(statisticsReceivablePayable);
}
/********************************************************浠撳偍绫�*****************************************************/
@GetMapping("/productCategoryDistribution")
@Operation(summary = "浜у搧澶х被鍒嗗竷")
- public R productCategoryDistribution() {
+ public AjaxResult productCategoryDistribution() {
ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
- return R.ok(dto);
+ return AjaxResult.success(dto);
}
@GetMapping("/salesPurchaseStorageProductCount")
@Operation(summary = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
- public R salesPurchaseStorageProductCount(){
+ public AjaxResult salesPurchaseStorageProductCount(){
List<MapDto> list = homeService.salesPurchaseStorageProductCount();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/productInOutAnalysis")
@Operation(summary = "浜у搧鍑哄叆搴撳垎鏋�")
- public R productInOutAnalysis(@DefaultType Integer type){
+ public AjaxResult productInOutAnalysis(@DefaultType Integer type){
List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/productTurnoverDays")
@Operation(summary = "浜у搧鍛ㄨ浆澶╂暟")
- public R productTurnoverDays(){
+ public AjaxResult productTurnoverDays(){
List<MapDto> list = homeService.productTurnoverDays();
- return R.ok(list);
+ return AjaxResult.success(list);
}
}
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index d1f325f..9b4779e 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
@@ -52,24 +52,24 @@
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, LaborIssue laborIssue){
+ public AjaxResult listPage(Page page, LaborIssue laborIssue){
IPage<LaborIssue> listPage = laborIssueService.listPage(page, laborIssue);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@GetMapping("/statisticsList")
@Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
- public R<?> statisticsList(LaborIssue laborIssue){
+ public AjaxResult statisticsList(LaborIssue laborIssue){
List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody LaborIssue laborIssue){
+ public AjaxResult add(@RequestBody LaborIssue laborIssue){
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
@@ -84,32 +84,32 @@
laborIssue.setOrderNo(String.format("%03d", l + 1));
}
boolean save = laborIssueService.save(laborIssue);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "鍔充繚鍙戞斁-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody LaborIssue laborIssue){
+ public AjaxResult update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍔充繚鍙戞斁-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
- return delete ? R.ok() : R.fail();
+ return delete ? AjaxResult.success() : AjaxResult.error();
}
@GetMapping("/statistics")
@Operation(summary = "鍔充繚鍙戞斁-缁熻")
- public R<?> statistics(StatisticsLaborIssue req) throws Exception {
+ public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
- return R.ok(statisticsLaborIssue);
+ return AjaxResult.success(statisticsLaborIssue);
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index 1104c15..e092741 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerDto;
import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger;
@@ -43,9 +43,9 @@
@GetMapping("/listPage")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
+ public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@@ -53,59 +53,59 @@
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
+ public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
boolean save = measuringInstrumentLedgerService.add(measuringInstrumentLedger);
if (save) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
+ public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
SysUser sysUser = sysUserMapper.selectUserById(measuringInstrumentLedger.getUserId());
if (sysUser == null) {
- return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
+ return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
}
measuringInstrumentLedger.setUserName(sysUser.getUserName());
boolean update = measuringInstrumentLedgerService.updateById(measuringInstrumentLedger);
if (update) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
for (Long id : ids) {
LambdaQueryWrapper<MeasuringInstrumentLedgerRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MeasuringInstrumentLedgerRecord::getMeasuringInstrumentLedgerId,id);
List<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecords = measuringInstrumentLedgerRecordMapper.selectList(queryWrapper);
if(!CollectionUtils.isEmpty(measuringInstrumentLedgerRecords)){
- return R.fail("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
+ return AjaxResult.error("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
}
}
boolean delete = measuringInstrumentLedgerService.removeBatchByIds(ids);
if (delete) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@PostMapping("/verifying")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
+ public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
boolean update = measuringInstrumentLedgerService.verifying(measuringInstrumentLedger);
- return update ? R.ok(null, "妫�瀹氭垚鍔�") : R.fail("妫�瀹氬け璐�");
+ return update ? AjaxResult.success("妫�瀹氭垚鍔�") : AjaxResult.error("妫�瀹氬け璐�");
}
/**
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 73e756b..370d41d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -5,7 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
import io.jsonwebtoken.lang.Collections;
@@ -36,29 +36,29 @@
@GetMapping("/listPage")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
+ public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/update")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
+ public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
boolean update = measuringInstrumentLedgerRecordService.updateMeasuringInstrumentLedgerRecord(measuringInstrumentLedgerRecord);
if (update) {
- return R.ok();
+ return AjaxResult.success();
}
- return R.fail();
+ return AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
- return R.ok(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
}
/**
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 3d8336b..5a328c1 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
@@ -22,19 +21,19 @@
@RequestMapping("/spareParts")
@Tag(name = "澶囦欢鍒嗙被鎺ュ彛")
@AllArgsConstructor
-public class SparePartsController extends BaseController {
+public class SparePartsController {
private SparePartsService sparePartsService;
@GetMapping("/getTree")
@Operation(summary = "澶囦欢鍒嗙被-鏍戠粨鏋�")
- public R<?> getTree(){
+ public AjaxResult getTree(){
List<SparePartsDto> tree = sparePartsService.getTree();
- return R.ok(tree);
+ return AjaxResult.success(tree);
}
@GetMapping("/listPage")
@Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, SpareParts spareParts){
+ public AjaxResult listPage(Page page, SpareParts spareParts){
IPage<SparePartsDto> listPage = sparePartsService.listPage(page, spareParts);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
// @GetMapping("/list")
// @Operation(summary = "澶囦欢鍒嗙被-鏌ヨ鎵�鏈�")
@@ -44,20 +43,20 @@
@PostMapping("/add")
@Operation(summary = "澶囦欢鍒嗙被-娣诲姞")
@Log(title = "澶囦欢鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody SpareParts spareParts){
- return R.ok(sparePartsService.save(spareParts));
+ public AjaxResult add(@RequestBody SpareParts spareParts){
+ return AjaxResult.success(sparePartsService.save(spareParts));
}
@PostMapping("/update")
@Operation(summary = "澶囦欢鍒嗙被-鏇存柊")
@Log(title = "澶囦欢鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody SpareParts spareParts){
- return R.ok(sparePartsService.updateById(spareParts));
+ public AjaxResult update(@RequestBody SpareParts spareParts){
+ return AjaxResult.success(sparePartsService.updateById(spareParts));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "澶囦欢鍒嗙被-鍒犻櫎")
@Log(title = "澶囦欢鍒嗙被-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@PathVariable Long id){
- return R.ok(sparePartsService.removeById(id));
+ public AjaxResult delete(@PathVariable Long id){
+ return AjaxResult.success(sparePartsService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
index 5c93a4d..26195a4 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsRequisitionRecordDto;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,13 +24,13 @@
@RequestMapping("/sparePartsRequisitionRecord")
@Tag(name = "澶囦欢棰嗙敤璁板綍鎺ュ彛")
@AllArgsConstructor
-public class SparePartsRequisitionRecordController extends BaseController {
+public class SparePartsRequisitionRecordController {
private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@GetMapping("/listPage")
@Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto){
+ public AjaxResult listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto){
IPage<SparePartsRequisitionRecordDto> listPage = sparePartsRequisitionRecordService.listPage(page, sparePartsRequisitionRecordDto);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
}
diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 8347921..3588d6c 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,14 +38,14 @@
@GetMapping("/listPage")
@Operation(summary = "鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
+ public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
return officeSuppliesService.listPage(page, officeSupplies);
}
@PostMapping("/add")
@Operation(summary = "鍔炲叕鐗╄祫-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody OfficeSupplies officeSupplies) {
+ public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
// 鎸夌収褰撳墠鏃堕棿yyyyMMdd + 褰撳ぉ鏂板鏁伴噺 + 1鐢熸垚缂栧彿
// 鑾峰彇褰撳ぉ鏂板鏁伴噺
long count = officeSuppliesService.count(new LambdaQueryWrapper<OfficeSupplies>()
@@ -55,22 +55,22 @@
officeSupplies.setCode(code);
officeSupplies.setStatus(1);
officeSupplies.setApplyTime(new Date());
- return officeSuppliesService.save(officeSupplies) ? R.ok() : R.fail();
+ return officeSuppliesService.save(officeSupplies) ? success() : error();
}
@PostMapping("/update")
@Operation(summary = "鍔炲叕鐗╄祫-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody OfficeSupplies officeSupplies) {
- return officeSuppliesService.updateById(officeSupplies) ? R.ok() : R.fail();
+ public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
+ return officeSuppliesService.updateById(officeSupplies) ? success() : error();
}
@DeleteMapping("/delete")
@Operation(summary = "鍔炲叕鐗╄祫-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return officeSuppliesService.removeBatchByIds(ids) ? R.ok() : R.fail();
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return officeSuppliesService.removeBatchByIds(ids) ? success() : error();
}
/**
diff --git a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
index 4f6f9ce..3a521b5 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
/**
@@ -18,5 +18,5 @@
* @param officeSupplies
* @return
*/
- R<?> listPage(Page page, OfficeSupplies officeSupplies);
+ AjaxResult listPage(Page page, OfficeSupplies officeSupplies);
}
diff --git a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
index f366b6c..abdc1c7 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
@@ -23,8 +23,8 @@
private final OfficeSuppliesMapper officeSuppliesMapper;
@Override
- public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
+ public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
IPage<OfficeSupplies> list = officeSuppliesMapper.listPage(page, officeSupplies);
- return R.ok(list);
+ return AjaxResult.success(list);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
index 135198f..ea214c2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
import jakarta.servlet.http.HttpServletResponse;
@@ -16,28 +15,28 @@
@RestController
@RequestMapping("/gasTankWarning")
@AllArgsConstructor
-public class GasTankWarningController extends BaseController {
+public class GasTankWarningController {
private GasTankWarningService gasTankWarningService;
@GetMapping("/listPage")
- public R<?> listPage(Page page, GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.listPage(page, gasTankWarning));
+ public AjaxResult listPage(Page page, GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.listPage(page, gasTankWarning));
}
@PostMapping("/add")
- public R<?> add(@RequestBody GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.save(gasTankWarning));
+ public AjaxResult add(@RequestBody GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.save(gasTankWarning));
}
@PostMapping("update")
- public R<?> update(@RequestBody GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.updateById(gasTankWarning));
+ public AjaxResult update(@RequestBody GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.updateById(gasTankWarning));
}
@DeleteMapping("delete")
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(gasTankWarningService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(gasTankWarningService.removeByIds(ids));
}
//瀵煎嚭
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index d78a5e1..0a2919d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,35 +30,35 @@
@GetMapping("/listPage")
@Operation(summary = "鍒拌揣绠＄悊-鏌ヨ")
- public R<?> listPage(Page page, InboundManagement inboundManagement) {
+ public AjaxResult listPage(Page page, InboundManagement inboundManagement) {
IPage<InboundManagement> result = inboundManagementService.listPage(page, inboundManagement);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@Operation(summary = "鍒拌揣绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody InboundManagement inboundManagement) {
+ public AjaxResult add(@RequestBody InboundManagement inboundManagement) {
inboundManagement.setArrivalTime(new Date());
boolean result = inboundManagementService.save(inboundManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "鍒拌揣绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody InboundManagement inboundManagement) {
+ public AjaxResult update(@RequestBody InboundManagement inboundManagement) {
boolean result = inboundManagementService.updateById(inboundManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/del")
@Operation(summary = "鍒拌揣绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> del(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult del(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean result = inboundManagementService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
index df8b8e2..bb14493 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
@@ -1,7 +1,7 @@
package com.ruoyi.procurementrecord.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.mapper.ProcurementExceptionRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementExceptionRecord;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,13 +23,13 @@
@PostMapping("/add")
@Transactional
- public R<?> add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return R.ok(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
+ public AjaxResult add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return AjaxResult.success(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
}
@PostMapping("/update")
@Transactional
- public R<?> updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return R.ok(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
+ public AjaxResult updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return AjaxResult.success(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index a110a5c..1d442a9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,30 +28,30 @@
@RequestMapping("/listPage")
@Operation(summary = "閲囪喘璁″垝-鏌ヨ")
- public R<?> listPage(Page page, ProcurementPlan procurementPlan){
+ public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@Operation(summary = "閲囪喘璁″垝-娣诲姞")
- public R<?> add(@RequestBody ProcurementPlan procurementPlan){
+ public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "閲囪喘璁″垝-淇敼")
- public R<?> update(@RequestBody ProcurementPlan procurementPlan){
+ public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/del")
@Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
- public R<?> del(@RequestBody List<Long> ids){
+ public AjaxResult del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 35ae216..678446c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,36 +29,36 @@
@GetMapping("/listPage")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鏌ヨ")
- public R<?> listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
IPage<ProcurementPriceManagement> result = procurementPriceManagementService.listPage(page, procurementPriceManagement);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.save(procurementPriceManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.updateById(procurementPriceManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/del")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (ids == null || ids.isEmpty()) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean result = procurementPriceManagementService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 6f16f19..7e49990 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
@@ -44,139 +44,139 @@
*/
@GetMapping("/getProcurementAmount")
@Operation(summary = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
- public R<?> getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
- return R.ok(procurementRecordService.getProcurementAmount(salesProductId));
+ public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
+ return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId));
}
@GetMapping("/productlist")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> list(ProcurementDto procurementDto) {
+ public AjaxResult list(ProcurementDto procurementDto) {
List<ProcurementDto> result = procurementRecordService.listProcurementBySalesLedgerId(procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public R<?> add(@RequestBody ProcurementAddDto procurementDto) {
+ public AjaxResult add(@RequestBody ProcurementAddDto procurementDto) {
procurementDto.setType(1);
procurementDto.setTypeName("閲囪喘鍏ュ簱");
- return R.ok(procurementRecordService.add(procurementDto));
+ return AjaxResult.success(procurementRecordService.add(procurementDto));
}
@PostMapping("/addCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public R<?> addCustom(@RequestBody List<CustomStorage> customStorage) {
+ public AjaxResult addCustom(@RequestBody List<CustomStorage> customStorage) {
return procurementRecordService.addCustom(customStorage);
}
@PostMapping("/updateCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public R<?> updateCustom(@RequestBody CustomStorage customStorage) {
+ public AjaxResult updateCustom(@RequestBody CustomStorage customStorage) {
return procurementRecordService.updateCustom(customStorage);
}
@Delete("/delteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public R<?> deleteCustom(@RequestBody List<Long> ids) {
+ public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
return procurementRecordService.deleteCustom(ids);
}
@PostMapping("/update")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public R<?> updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return R.ok(procurementRecordService.updatePro(procurementDto));
+ public AjaxResult updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.updatePro(procurementDto));
}
@PostMapping("/updateManagement")
@Log(title = "鎴愬搧鍏ュ簱-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public R<?> updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return R.ok(procurementRecordService.updateManagement(procurementDto));
+ public AjaxResult updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
}
@PostMapping("/updateManagementByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public R<?> updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return R.ok(procurementRecordService.updateManagementByCustom(procurementDto));
+ public AjaxResult updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.updateManagementByCustom(procurementDto));
}
@PostMapping("/del")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return R.ok(procurementRecordService.deletePro(procurementDto));
+ public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.deletePro(procurementDto));
}
@GetMapping("/listPage")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public R<?> listPage(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPage(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listReport")
@Operation(summary = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
- public R<?> listReport() {
- return R.ok(procurementRecordService.getReportList());
+ public AjaxResult listReport() {
+ return AjaxResult.success(procurementRecordService.getReportList());
}
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public R<?> listPageByProduction(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageByProductProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鐢熶骇鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public R<?> listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public R<?> listPageByCustom(Page page, CustomStorage customStorage) {
+ public AjaxResult listPageByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageByCustom(page, customStorage);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageCopy")
@Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageCopy(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPageCopy(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageCopyByProduction")
@Log(title = "鐢熶骇鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageCopyByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageCopyByCustom(Page page, CustomStorage customStorage) {
+ public AjaxResult listPageCopyByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageCopyByCustom(page, customStorage);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/getReportList")
@Log(title = "搴撳瓨鎶ヨ〃鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> getReportList(Page page, ProcurementPageDto procurementDto) {
- return R.ok(procurementRecordService.getReportList(page, procurementDto));
+ public AjaxResult getReportList(Page page, ProcurementPageDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.getReportList(page, procurementDto));
}
/**
@@ -244,8 +244,8 @@
@GetMapping("/listPageProductionStock")
@Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
- public R<?> listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
+ public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index 8d8e62f..c86d3e6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.bean.dto.ProcurementUpdateDto;
@@ -34,42 +34,42 @@
@PostMapping("/stockout")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱绠＄悊-鍑哄簱", businessType = BusinessType.INSERT)
- public R<?> stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
- return R.ok(procurementRecordOutService.stockout(procurementRecordOutAdd));
+ public AjaxResult stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
+ return AjaxResult.success(procurementRecordOutService.stockout(procurementRecordOutAdd));
}
@GetMapping("/listPage")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public AjaxResult listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPage(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageByProduct")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public AjaxResult listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByProduct(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageBySemiProduct")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public AjaxResult listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageBySemiProduct(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊嚭搴�-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public AjaxResult listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByCustom(page, procurementDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/del")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
- public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return R.ok(procurementRecordOutService.deletePro(procurementDto));
+ public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordOutService.deletePro(procurementDto));
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
index f8ca338..6387006 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
@@ -3,11 +3,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.service.AccountStatementDetailsService;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.bean.vo.ShippingInfoVo;
+import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.service.ReturnManagementService;
import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
@@ -31,61 +36,70 @@
private ReturnManagementService returnManagementService;
private ReturnSaleProductService returnSaleProductService;
+ private final AccountStatementDetailsService accountStatementDetailsService;
@GetMapping("/listPage")
@Operation(summary = "閿�鍞��璐�-鏌ヨ")
- public R<?> listPage(Page page, ReturnManagementDto returnManagement) {
+ public AjaxResult listPage(Page page, ReturnManagementDto returnManagement) {
IPage<ReturnManagementDto> result = returnManagementService.listPage(page, returnManagement);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/add")
@Operation(summary = "閿�鍞��璐�-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody ReturnManagementDto returnManagementDto) {
- return returnManagementService.addReturnManagementDto(returnManagementDto) ? R.ok() : R.fail();
+ public AjaxResult add(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.addReturnManagementDto(returnManagementDto) ? success() : error();
}
@PostMapping("/update")
@Operation(summary = "閿�鍞��璐�-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody ReturnManagementDto returnManagementDto) {
- return returnManagementService.updateReturnManagementDto(returnManagementDto) ? R.ok() : R.fail();
+ public AjaxResult update(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.updateReturnManagementDto(returnManagementDto) ? success() : error();
}
@Operation(summary = "閿�鍞��璐�-澶勭悊閫�璐у崟")
@GetMapping("/handle")
@Transactional(rollbackFor = Exception.class)
- public R<?> handle(Long returnManagementId) {
- return returnManagementService.handle(returnManagementId) ? R.ok() : R.fail();
+ public AjaxResult handle(Long returnManagementId) {
+ return returnManagementService.handle(returnManagementId) ? success() : error();
}
@DeleteMapping("/del")
@Operation(summary = "閿�鍞��璐�-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> del(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult del(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ //濡傛灉璇ラ攢鍞��璐у凡缁忕敓鎴愬璐﹀崟鍒欐棤娉曞垹闄�
+ List<ReturnManagement> returnManagements = returnManagementService.listByIds(ids);
+ List<String> strings = returnManagements.stream().map(ReturnManagement::getReturnNo).toList();
+ List<AccountStatementDetails> accountStatementDetails = accountStatementDetailsService.list(Wrappers.<AccountStatementDetails>lambdaQuery()
+ .in(AccountStatementDetails::getReceiptNumber, strings));
+ if (CollectionUtils.isNotEmpty(accountStatementDetails)){
+ throw new ServiceException("璇ラ攢鍞��璐у崟宸茬粡鐢熸垚瀵硅处鍗曪紝鏃犳硶鍒犻櫎");
+ }
returnSaleProductService.remove(new QueryWrapper<ReturnSaleProduct>()
.lambda()
.in(ReturnSaleProduct::getReturnManagementId, ids));
boolean result = returnManagementService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? success() : error();
}
@GetMapping("/getById")
@Operation(summary = "閿�鍞��璐�-鏍规嵁id鏌ヨ")
- public R<?> getById(Long returnManagementId) {
+ public AjaxResult getById(Long returnManagementId) {
ReturnManagementDto returnManagementDto = returnManagementService.getReturnManagementDtoById(returnManagementId);
- return R.ok(returnManagementDto);
+ return success(returnManagementDto);
}
@GetMapping("/getByShippingId")
@Operation(summary = "閿�鍞��璐�-鏍规嵁鍙戣揣鍗曟煡璇㈤攢鍞鍗曚互鍙婂嚭搴撶殑浜у搧淇℃伅")
- public R<?> getByShippingId(Long shippingId) {
+ public AjaxResult getByShippingId(Long shippingId) {
ShippingInfoVo shippingInfoVo = returnManagementService.getReturnManagementDtoByShippingIdId(shippingId);
- return R.ok(shippingInfoVo);
+ return success(shippingInfoVo);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
index b7d9cad..a209cf9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
@@ -43,7 +43,7 @@
IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto);
- R<?> addCustom(List<CustomStorage> customStorage);
+ AjaxResult addCustom(List<CustomStorage> customStorage);
IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage);
@@ -51,9 +51,9 @@
IPage<CustomStorage> listPageCopyByCustom(Page page, CustomStorage customStorage);
- R<?> updateCustom(CustomStorage customStorage);
+ AjaxResult updateCustom(CustomStorage customStorage);
- R<?> deleteCustom(List<Long> ids);
+ AjaxResult deleteCustom(List<Long> ids);
int updateManagementByCustom(ProcurementManagementUpdateDto procurementDto);
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 3fc8d0f..1d99dec 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -11,7 +11,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
@@ -525,10 +525,10 @@
private final CustomStorageMapper customStorageMapper;
@Override
- public R<?> addCustom(List<CustomStorage> customStorage) {
+ public AjaxResult addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if(CollectionUtils.isEmpty(customStorage)){
- return R.fail("鏁版嵁涓嶈兘涓虹┖");
+ return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
@@ -538,7 +538,7 @@
item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
customStorageMapper.insert(item);
});
- return R.ok(null, "鑷畾涔夊叆搴撴垚鍔�");
+ return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
}
@Override
@@ -716,13 +716,13 @@
}
@Override
- public R<?> updateCustom(CustomStorage customStorage) {
- return R.ok(customStorageMapper.updateById(customStorage));
+ public AjaxResult updateCustom(CustomStorage customStorage) {
+ return AjaxResult.success(customStorageMapper.updateById(customStorage));
}
@Override
- public R<?> deleteCustom(List<Long> ids) {
- return R.ok(customStorageMapper.deleteBatchIds(ids));
+ public AjaxResult deleteCustom(List<Long> ids) {
+ return AjaxResult.success(customStorageMapper.deleteBatchIds(ids));
}
@Override
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
index 200e95f..31cdc79 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
@@ -291,15 +291,8 @@
ProductionOrderBom orderBom,
List<ProductionBomStructure> structureList,
Long rootProductModelId) {
- // 閲嶆柊鏌ヨBOM缁撴瀯锛屾寜瀛愯妭鐐逛紭鍏堟帓搴�
- List<ProductionBomStructure> routingStructureList = this.list(
- Wrappers.<ProductionBomStructure>lambdaQuery()
- .eq(ProductionBomStructure::getProductionOrderBomId, orderBom.getId())
- .orderByDesc(ProductionBomStructure::getParentId)
- .orderByAsc(ProductionBomStructure::getId));
-
ProductionOrderRouting orderRouting = getOrCreateOrderRoutingSnapshot(productionOrderId, productionOrder, orderBom, rootProductModelId);
- List<ProductionOrderRoutingOperation> desiredOperationList = buildDesiredRoutingOperationList(routingStructureList, rootProductModelId);
+ List<ProductionOrderRoutingOperation> desiredOperationList = buildDesiredRoutingOperationList(structureList, rootProductModelId);
List<ProductionOrderRoutingOperation> existingOperationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
.eq(ProductionOrderRoutingOperation::getOrderRoutingId, orderRouting.getId())
@@ -317,7 +310,7 @@
if (matchedOperation == null) {
matchedOperation = insertRoutingOperationSnapshot(orderRouting.getId(), productionOrderId, desiredOperation);
} else {
- updateRoutingOperationSnapshotIfNecessary(matchedOperation, orderRouting.getId(), productionOrderId, desiredOperation);
+ updateRoutingOperationSnapshotIfNecessary(desiredOperation, orderRouting.getId(), productionOrderId, matchedOperation);
}
finalOperationList.add(matchedOperation);
}
@@ -388,14 +381,14 @@
Map<Long, ProductionBomStructure> structureById = structureList.stream()
.filter(item -> item != null && item.getId() != null)
.collect(Collectors.toMap(ProductionBomStructure::getId, item -> item, (left, right) -> left));
-
- // 鏋勫缓鐖�-瀛愭槧灏勫叧绯�
- Map<Long, List<ProductionBomStructure>> treeMap = buildParentChildMap(structureList);
-
- // 浣跨敤鍚庡簭閬嶅巻鏋勫缓鎿嶄綔鍒楄〃锛堝厛瀛愬悗鐖讹紝纭繚宸ヨ壓璺嚎椤哄簭姝ｇ‘锛�
Map<String, ProductionBomStructure> uniqueOperationMap = new LinkedHashMap<>();
- buildOperationListPostOrder(null, treeMap, uniqueOperationMap, structureById, rootProductModelId);
-
+ for (ProductionBomStructure bomStructure : structureList) {
+ if (bomStructure == null || bomStructure.getTechnologyOperationId() == null) {
+ continue;
+ }
+ Long outputProductModelId = resolveOutputProductModelId(resolveOperationOutputNode(bomStructure, structureById), rootProductModelId);
+ uniqueOperationMap.putIfAbsent(buildBomOperationDedupKey(bomStructure, outputProductModelId), bomStructure);
+ }
List<ProductionOrderRoutingOperation> desiredOperationList = new ArrayList<>();
int dragSort = 1;
for (ProductionBomStructure bomStructure : uniqueOperationMap.values()) {
@@ -412,52 +405,6 @@
desiredOperationList.add(routingOperation);
}
return desiredOperationList;
- }
-
- private Map<Long, List<ProductionBomStructure>> buildParentChildMap(List<ProductionBomStructure> structureList) {
- Map<Long, List<ProductionBomStructure>> treeMap = new LinkedHashMap<>();
- Map<Long, Integer> childCountMap = new HashMap<>();
-
- // 绗竴閬嶏細缁熻姣忎釜鑺傜偣鐨勫瓙鑺傜偣鏁伴噺锛屽悓鏃舵瀯寤哄垵濮嬫槧灏�
- for (ProductionBomStructure structure : structureList) {
- if (structure == null) continue;
- Long parentId = structure.getParentId();
- childCountMap.merge(parentId, 1, Integer::sum); // 缁熻姣忎釜鐖惰妭鐐规湁澶氬皯涓瓙鑺傜偣
- treeMap.computeIfAbsent(parentId, k -> new ArrayList<>()).add(structure);
- }
-
- // 绗簩閬嶏細瀵规瘡涓埗鑺傜偣涓嬬殑瀛愯妭鐐规寜瀛愯妭鐐规暟閲忓�掑簭鎺掑簭锛堟湁瀛愯妭鐐圭殑浼樺厛锛�
- for (Map.Entry<Long, List<ProductionBomStructure>> entry : treeMap.entrySet()) {
- List<ProductionBomStructure> children = entry.getValue();
- children.sort((a, b) -> {
- int countA = childCountMap.getOrDefault(a.getId(), 0);
- int countB = childCountMap.getOrDefault(b.getId(), 0);
- return Integer.compare(countB, countA); // 瀛愯妭鐐瑰鐨勬帓鍓嶉潰
- });
- }
-
- return treeMap;
- }
-
- private void buildOperationListPostOrder(Long parentId,
- Map<Long, List<ProductionBomStructure>> treeMap,
- Map<String, ProductionBomStructure> uniqueOperationMap,
- Map<Long, ProductionBomStructure> structureById,
- Long rootProductModelId) {
- List<ProductionBomStructure> children = treeMap.get(parentId);
- if (children == null || children.isEmpty()) {
- return;
- }
- for (ProductionBomStructure child : children) {
- // 鍏堥�掑綊澶勭悊瀛愯妭鐐�
- buildOperationListPostOrder(child.getId(), treeMap, uniqueOperationMap, structureById, rootProductModelId);
-
- // 鍐嶅鐞嗗綋鍓嶈妭鐐�
- if (child.getTechnologyOperationId() != null) {
- Long outputProductModelId = resolveOutputProductModelId(resolveOperationOutputNode(child, structureById), rootProductModelId);
- uniqueOperationMap.putIfAbsent(buildBomOperationDedupKey(child, outputProductModelId), child);
- }
- }
}
private Map<String, Deque<ProductionOrderRoutingOperation>> buildExistingRoutingOperationBucketMap(List<ProductionOrderRoutingOperation> existingOperationList) {
@@ -535,12 +482,6 @@
if (!Objects.equals(currentOperation.getIsProduction(), desiredOperation.getIsProduction())) {
update.setIsProduction(desiredOperation.getIsProduction());
currentOperation.setIsProduction(desiredOperation.getIsProduction());
- changed = true;
- }
- // 鏇存柊 dragSort 瀛楁锛岀‘淇濆伐鑹鸿矾绾块『搴忔纭�
- if (!Objects.equals(currentOperation.getDragSort(), desiredOperation.getDragSort())) {
- update.setDragSort(desiredOperation.getDragSort());
- currentOperation.setDragSort(desiredOperation.getDragSort());
changed = true;
}
if (!Objects.equals(currentOperation.getType(), desiredOperation.getType())) {
@@ -803,8 +744,8 @@
return;
}
for (ProductionBomStructureDto node : source) {
- flattenTree(node.getChildren(), result); // 鍏堥�掑綊娣诲姞瀛愯妭鐐�
result.add(node);
+ flattenTree(node.getChildren(), result);
}
}
diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java
index efa004f..5966fb5 100644
--- a/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -6,7 +6,7 @@
import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysConfigService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,13 +19,11 @@
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
- *
+ *
* @author ruoyi
*/
@RestController
@@ -39,25 +37,25 @@
private Producer captchaProducerMath;
private final RedisCache redisCache;
-
+
// 楠岃瘉鐮佺被鍨�
@Value("${ruoyi.captchaType}")
private String captchaType;
-
+
private final ISysConfigService configService;
/**
* 鐢熸垚楠岃瘉鐮�
*/
@GetMapping("/captchaImage")
- public R<?> getCode(HttpServletResponse response) throws IOException
+ public AjaxResult getCode(HttpServletResponse response) throws IOException
{
- Map<String, Object> map = new HashMap<>();
+ AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled();
- map.put("captchaEnabled", captchaEnabled);
+ ajax.put("captchaEnabled", captchaEnabled);
if (!captchaEnabled)
{
- return R.ok(map);
+ return ajax;
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
@@ -90,11 +88,11 @@
}
catch (IOException e)
{
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
- map.put("uuid", uuid);
- map.put("img", Base64.encode(os.toByteArray()));
- return R.ok(map);
+ ajax.put("uuid", uuid);
+ ajax.put("img", Base64.encode(os.toByteArray()));
+ return ajax;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
index ab4841d..ac29662 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
@@ -2,8 +2,7 @@
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.monitor.domain.SysCache;
import lombok.AllArgsConstructor;
import org.springframework.data.redis.core.RedisCallback;
@@ -15,13 +14,13 @@
/**
* 缂撳瓨鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/cache")
@AllArgsConstructor
-public class CacheController extends BaseController
+public class CacheController
{
private RedisTemplate<String, String> redisTemplate;
@@ -38,7 +37,7 @@
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping()
- public R<?> getInfo() throws Exception
+ public AjaxResult getInfo() throws Exception
{
Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
@@ -57,56 +56,56 @@
pieList.add(data);
});
result.put("commandStats", pieList);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getNames")
- public R<?> cache()
+ public AjaxResult cache()
{
- return R.ok(caches);
+ return AjaxResult.success(caches);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getKeys/{cacheName}")
- public R<?> getCacheKeys(@PathVariable String cacheName)
+ public AjaxResult getCacheKeys(@PathVariable String cacheName)
{
Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- return R.ok(new TreeSet<>(cacheKeys));
+ return AjaxResult.success(new TreeSet<>(cacheKeys));
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
- public R<?> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
+ public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
{
String cacheValue = redisTemplate.opsForValue().get(cacheKey);
SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
- return R.ok(sysCache);
+ return AjaxResult.success(sysCache);
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheName/{cacheName}")
- public R<?> clearCacheName(@PathVariable String cacheName)
+ public AjaxResult clearCacheName(@PathVariable String cacheName)
{
Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
redisTemplate.delete(cacheKeys);
- return R.ok();
+ return AjaxResult.success();
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheKey/{cacheKey}")
- public R<?> clearCacheKey(@PathVariable String cacheKey)
+ public AjaxResult clearCacheKey(@PathVariable String cacheKey)
{
redisTemplate.delete(cacheKey);
- return R.ok();
+ return AjaxResult.success();
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@DeleteMapping("/clearCacheAll")
- public R<?> clearCacheAll()
+ public AjaxResult clearCacheAll()
{
Collection<String> cacheKeys = redisTemplate.keys("*");
redisTemplate.delete(cacheKeys);
- return R.ok();
+ return AjaxResult.success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java b/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
index a2db092..e1f55f1 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
@@ -1,28 +1,27 @@
package com.ruoyi.project.monitor.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.framework.web.domain.Server;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.Server;
/**
* 鏈嶅姟鍣ㄧ洃鎺�
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/server")
-public class ServerController extends BaseController
+public class ServerController
{
@PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping()
- public R<?> getInfo() throws Exception
+ public AjaxResult getInfo() throws Exception
{
Server server = new Server();
server.copyTo();
- return R.ok(server);
+ return AjaxResult.success(server);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
index 9919311..7abc9bd 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
@@ -4,6 +4,7 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,14 +23,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.project.monitor.service.ISysJobService;
/**
* 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -69,9 +70,9 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}")
- public R<?> getInfo(@PathVariable("jobId") Long jobId)
+ public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
{
- return R.ok(jobService.selectJobById(jobId));
+ return success(jobService.selectJobById(jobId));
}
/**
@@ -80,35 +81,34 @@
@PreAuthorize("@ss.hasPermi('monitor:job:add')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@RequestBody SysJob job) throws SchedulerException, TaskException
+ public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
{
if (!CronUtils.isValid(job.getCronExpression()))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
}
else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
}
else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
{
- return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
+ return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
}
job.setCreateBy(getUsername());
- jobService.insertJob(job);
- return R.ok();
+ return toAjax(jobService.insertJob(job));
}
/**
@@ -117,35 +117,34 @@
@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+ public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
{
if (!CronUtils.isValid(job.getCronExpression()))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
}
else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
}
else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
{
- return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
}
job.setUpdateBy(getUsername());
- jobService.updateJob(job);
- return R.ok();
+ return toAjax(jobService.updateJob(job));
}
/**
@@ -154,12 +153,11 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public R<?> changeStatus(@RequestBody SysJob job) throws SchedulerException
+ public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
{
SysJob newJob = jobService.selectJobById(job.getJobId());
newJob.setStatus(job.getStatus());
- jobService.changeStatus(newJob);
- return R.ok();
+ return toAjax(jobService.changeStatus(newJob));
}
/**
@@ -168,10 +166,10 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/run")
- public R<?> run(@RequestBody SysJob job) throws SchedulerException
+ public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
{
boolean result = jobService.run(job);
- return result ? R.ok() : R.fail("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
+ return result ? success() : error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
}
/**
@@ -180,9 +178,9 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
- public R<?> remove(@PathVariable Long[] jobIds) throws SchedulerException
+ public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException
{
jobService.deleteJobByIds(jobIds);
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index a15344d..9ed3059 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -3,6 +3,8 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -13,15 +15,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.project.monitor.service.ISysJobLogService;
-import org.springframework.security.access.prepost.PreAuthorize;
/**
* 璋冨害鏃ュ織鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -55,15 +56,15 @@
ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
util.exportExcel(response, list, "璋冨害鏃ュ織");
}
-
+
/**
* 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobLogId}")
- public R<?> getInfo(@PathVariable Long jobLogId)
+ public AjaxResult getInfo(@PathVariable Long jobLogId)
{
- return R.ok(jobLogService.selectJobLogById(jobLogId));
+ return success(jobLogService.selectJobLogById(jobLogId));
}
@@ -73,10 +74,9 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}")
- public R<?> remove(@PathVariable Long[] jobLogIds)
+ public AjaxResult remove(@PathVariable Long[] jobLogIds)
{
- jobLogService.deleteJobLogByIds(jobLogIds);
- return R.ok();
+ return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}
/**
@@ -85,9 +85,9 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public R<?> clean()
+ public AjaxResult clean()
{
jobLogService.cleanJobLog();
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
index fb703ef..0c96a9d 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
@@ -1,11 +1,11 @@
package com.ruoyi.project.monitor.controller;
-import com.ruoyi.framework.web.domain.R;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.security.service.SysPasswordService;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysLogininfor;
import com.ruoyi.project.monitor.service.ISysLogininforService;
@@ -48,24 +48,23 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
- public R<?> remove(@PathVariable Long[] infoIds) {
- logininforService.deleteLogininforByIds(infoIds);
- return R.ok();
+ public AjaxResult remove(@PathVariable Long[] infoIds) {
+ return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public R<?> clean() {
+ public AjaxResult clean() {
logininforService.cleanLogininfor();
- return R.ok();
+ return success();
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
@Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
@GetMapping("/unlock/{userName}")
- public R<?> unlock(@PathVariable("userName") String userName) {
+ public AjaxResult unlock(@PathVariable("userName") String userName) {
passwordService.clearLoginRecordCache(userName);
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
index ee36e80..091a5a6 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
@@ -3,6 +3,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,14 +15,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysOperLog;
import com.ruoyi.project.monitor.service.ISysOperLogService;
/**
* 鎿嶄綔鏃ュ織璁板綍
- *
+ *
* @author ruoyi
*/
@RestController
@@ -53,18 +54,17 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}")
- public R<?> remove(@PathVariable Long[] operIds)
+ public AjaxResult remove(@PathVariable Long[] operIds)
{
- operLogService.deleteOperLogByIds(operIds);
- return R.ok();
+ return toAjax(operLogService.deleteOperLogByIds(operIds));
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean")
- public R<?> clean()
+ public AjaxResult clean()
{
operLogService.cleanOperLog();
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
index 666a6c0..944656b 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
@@ -5,8 +5,8 @@
import java.util.Collections;
import java.util.List;
-import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,13 +20,14 @@
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysUserOnline;
import com.ruoyi.project.system.service.ISysUserOnlineService;
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@@ -74,9 +75,9 @@
@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
- public R<?> forceLogout(@PathVariable String tokenId)
+ public AjaxResult forceLogout(@PathVariable String tokenId)
{
redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
index 62f646d..e73d60e 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
@@ -1,12 +1,10 @@
package com.ruoyi.project.system.controller;
-import java.util.List;
-
-import com.ruoyi.framework.web.domain.R;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysConfig;
import com.ruoyi.project.system.service.ISysConfigService;
@@ -16,9 +14,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -55,18 +55,18 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}")
- public R<?> getInfo(@PathVariable Long configId)
+ public AjaxResult getInfo(@PathVariable Long configId)
{
- return R.ok(configService.selectConfigById(configId));
+ return success(configService.selectConfigById(configId));
}
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
*/
@GetMapping(value = "/configKey/{configKey}")
- public R<?> getConfigKey(@PathVariable String configKey)
+ public AjaxResult getConfigKey(@PathVariable String configKey)
{
- return R.ok(configService.selectConfigByKey(configKey));
+ return success(configService.selectConfigByKey(configKey));
}
/**
@@ -75,15 +75,14 @@
@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysConfig config)
+ public AjaxResult add(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
{
- return R.fail("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ return error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setCreateBy(getUsername());
- configService.insertConfig(config);
- return R.ok();
+ return toAjax(configService.insertConfig(config));
}
/**
@@ -92,15 +91,14 @@
@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysConfig config)
+ public AjaxResult edit(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
{
- return R.fail("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ return error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setUpdateBy(getUsername());
- configService.updateConfig(config);
- return R.ok();
+ return toAjax(configService.updateConfig(config));
}
/**
@@ -109,10 +107,10 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public R<?> remove(@PathVariable Long[] configIds)
+ public AjaxResult remove(@PathVariable Long[] configIds)
{
configService.deleteConfigByIds(configIds);
- return R.ok();
+ return success();
}
/**
@@ -121,9 +119,9 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public R<?> refreshCache()
+ public AjaxResult refreshCache()
{
configService.resetConfigCache();
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index bb0da7b..24e6c71 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -2,9 +2,9 @@
import java.util.List;
-import com.ruoyi.common.constant.HttpStatus;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -20,13 +20,13 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.service.ISysDeptService;
/**
* 閮ㄩ棬淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -41,10 +41,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
- public R<?> list(SysDept dept)
+ public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
- return R.ok(depts);
+ return success(depts);
}
/**
@@ -52,11 +52,11 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
- public R<?> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+ public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
- return R.ok(depts);
+ return success(depts);
}
/**
@@ -64,10 +64,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:dept:query')")
@GetMapping(value = "/{deptId}")
- public R<?> getInfo(@PathVariable Long deptId)
+ public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
- return R.ok(deptService.selectDeptById(deptId));
+ return success(deptService.selectDeptById(deptId));
}
/**
@@ -76,15 +76,14 @@
@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysDept dept)
+ public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (!deptService.checkDeptNameUnique(dept))
{
- return R.fail("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ return error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
dept.setCreateBy(getUsername());
- deptService.insertDept(dept);
- return R.ok();
+ return toAjax(deptService.insertDept(dept));
}
/**
@@ -93,25 +92,24 @@
@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysDept dept)
+ public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
if (!deptService.checkDeptNameUnique(dept))
{
- return R.fail("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
else if (dept.getParentId().equals(deptId))
{
- return R.fail("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
+ return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
}
else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
{
- return R.fail("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
+ return error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
}
dept.setUpdateBy(getUsername());
- deptService.updateDept(dept);
- return R.ok();
+ return toAjax(deptService.updateDept(dept));
}
/**
@@ -120,18 +118,17 @@
@PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
- public R<?> remove(@PathVariable Long deptId)
+ public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.hasChildByDeptId(deptId))
{
- return R.fail(HttpStatus.WARN, "瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄�");
+ return warn("瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄�");
}
if (deptService.checkDeptExistUser(deptId))
{
- return R.fail(HttpStatus.WARN, "閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄�");
+ return warn("閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄�");
}
deptService.checkDeptDataScope(deptId);
- deptService.deleteDeptById(deptId);
- return R.ok();
+ return toAjax(deptService.deleteDeptById(deptId));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
index 66220e5..56c44c1 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
@@ -4,6 +4,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -19,7 +20,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.service.ISysDictDataService;
@@ -27,7 +28,7 @@
/**
* 鏁版嵁瀛楀吀淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -62,23 +63,23 @@
*/
@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}")
- public R<?> getInfo(@PathVariable Long dictCode)
+ public AjaxResult getInfo(@PathVariable Long dictCode)
{
- return R.ok(dictDataService.selectDictDataById(dictCode));
+ return success(dictDataService.selectDictDataById(dictCode));
}
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
*/
@GetMapping(value = "/type/{dictType}")
- public R<?> dictType(@PathVariable String dictType)
+ public AjaxResult dictType(@PathVariable String dictType)
{
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data))
{
data = new ArrayList<SysDictData>();
}
- return R.ok(data);
+ return success(data);
}
/**
@@ -87,11 +88,10 @@
@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysDictData dict)
+ public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
dict.setCreateBy(getUsername());
- dictDataService.insertDictData(dict);
- return R.ok();
+ return toAjax(dictDataService.insertDictData(dict));
}
/**
@@ -100,11 +100,10 @@
@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysDictData dict)
+ public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
dict.setUpdateBy(getUsername());
- dictDataService.updateDictData(dict);
- return R.ok();
+ return toAjax(dictDataService.updateDictData(dict));
}
/**
@@ -113,9 +112,9 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public R<?> remove(@PathVariable Long[] dictCodes)
+ public AjaxResult remove(@PathVariable Long[] dictCodes)
{
dictDataService.deleteDictDataByIds(dictCodes);
- return R.ok();
+ return success();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
index 4415c0c..a385016 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
@@ -3,6 +3,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,14 +18,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDictType;
import com.ruoyi.project.system.service.ISysDictTypeService;
/**
* 鏁版嵁瀛楀吀淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -58,9 +59,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictId}")
- public R<?> getInfo(@PathVariable Long dictId)
+ public AjaxResult getInfo(@PathVariable Long dictId)
{
- return R.ok(dictTypeService.selectDictTypeById(dictId));
+ return success(dictTypeService.selectDictTypeById(dictId));
}
/**
@@ -69,15 +70,14 @@
@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysDictType dict)
+ public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
{
- return R.fail("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
+ return error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
dict.setCreateBy(getUsername());
- dictTypeService.insertDictType(dict);
- return R.ok();
+ return toAjax(dictTypeService.insertDictType(dict));
}
/**
@@ -86,15 +86,14 @@
@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysDictType dict)
+ public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
{
- return R.fail("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
+ return error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
}
dict.setUpdateBy(getUsername());
- dictTypeService.updateDictType(dict);
- return R.ok();
+ return toAjax(dictTypeService.updateDictType(dict));
}
/**
@@ -103,10 +102,10 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
- public R<?> remove(@PathVariable Long[] dictIds)
+ public AjaxResult remove(@PathVariable Long[] dictIds)
{
dictTypeService.deleteDictTypeByIds(dictIds);
- return R.ok();
+ return success();
}
/**
@@ -115,19 +114,19 @@
@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public R<?> refreshCache()
+ public AjaxResult refreshCache()
{
dictTypeService.resetDictCache();
- return R.ok();
+ return success();
}
/**
* 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public R<?> optionselect()
+ public AjaxResult optionselect()
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
- return R.ok(dictTypes);
+ return success(dictTypes);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 55f3caf..3334a07 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -7,8 +7,7 @@
import com.ruoyi.framework.security.service.SysLoginService;
import com.ruoyi.framework.security.service.SysPermissionService;
import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.domain.SysUser;
@@ -18,6 +17,7 @@
import com.ruoyi.project.system.service.ISysUserDeptService;
import com.ruoyi.project.system.service.ISysUserService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +25,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -33,12 +32,12 @@
/**
* 鐧诲綍楠岃瘉
- *
+ *
* @author ruoyi
*/
@RestController
@AllArgsConstructor
-public class SysLoginController extends BaseController
+public class SysLoginController
{
private SysLoginService loginService;
private ISysMenuService menuService;
@@ -50,28 +49,28 @@
/**
* 鐧诲綍鏂规硶
- *
+ *
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@PostMapping("/login")
- public R<?> login(@RequestBody LoginBody loginBody)
+ public AjaxResult login(@RequestBody LoginBody loginBody)
{
+ AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- Map<String, Object> map = new HashMap<>();
- map.put(Constants.TOKEN, token);
- return R.ok(map);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
}
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("/getInfo")
- public R<?> getInfo()
+ public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
@@ -93,40 +92,40 @@
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
- Map<String, Object> map = new HashMap<>();
- map.put("user", user);
- map.put("aiEnabled", loginUser.getAiEnabled());
- map.put("roles", roles);
- map.put("permissions", permissions);
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("user", user);
+ ajax.put("aiEnabled", loginUser.getAiEnabled());
+ ajax.put("roles", roles);
+ ajax.put("permissions", permissions);
+ return ajax;
}
/**
* 鑾峰彇璺敱淇℃伅
- *
+ *
* @return 璺敱淇℃伅
*/
@GetMapping("getRouters")
- public R<?> getRouters()
+ public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
- return R.ok(menuService.buildMenus(menus));
+ return AjaxResult.success(menuService.buildMenus(menus));
}
@PostMapping("/loginCheck")
- public R<?> loginCheck(@RequestBody LoginBody loginBody)
+ public AjaxResult loginCheck(@RequestBody LoginBody loginBody)
{
try {
Long userId = loginService.loginCheck(loginBody.getUsername(), loginBody.getPassword());
- return R.ok(userId);
+ return AjaxResult.success(userId);
}catch (Exception e) {
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
@GetMapping("/userLoginFacotryList")
- public R<?> userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
.collect(Collectors.toMap(
@@ -135,7 +134,7 @@
(existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
));
List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
- return R.ok(uniqueList);
+ return AjaxResult.success(uniqueList);
}
/**
@@ -145,12 +144,12 @@
* @return 缁撴灉
*/
@PostMapping("/loginCheckFactory")
- public R<?> loginCheckFactory(@RequestBody LoginBody loginBody)
+ public AjaxResult loginCheckFactory(@RequestBody LoginBody loginBody)
{
+ AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.loginCheckFactory(loginBody.getUsername(), loginBody.getPassword(),loginBody.getFactoryId());
- Map<String, Object> map = new HashMap<>();
- map.put(Constants.TOKEN, token);
- return R.ok(map);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 285dc69..a59bdb3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -1,12 +1,11 @@
package com.ruoyi.project.system.controller;
-import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.service.ISysMenuService;
import lombok.AllArgsConstructor;
@@ -14,13 +13,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 鑿滃崟淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -35,10 +32,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
- public R<?> list(SysMenu menu)
+ public AjaxResult list(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return R.ok(menus);
+ return success(menus);
}
/**
@@ -46,32 +43,32 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
- public R<?> getInfo(@PathVariable Long menuId)
+ public AjaxResult getInfo(@PathVariable Long menuId)
{
- return R.ok(menuService.selectMenuById(menuId));
+ return success(menuService.selectMenuById(menuId));
}
/**
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public R<?> treeselect(SysMenu menu)
+ public AjaxResult treeselect(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return R.ok(menuService.buildMenuTreeSelect(menus));
+ return success(menuService.buildMenuTreeSelect(menus));
}
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public R<?> roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
List<SysMenu> menus = menuService.selectMenuList(getUserId());
- Map<String, Object> map = new HashMap<>();
- map.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
- map.put("menus", menuService.buildMenuTreeSelect(menus));
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ return ajax;
}
/**
@@ -80,19 +77,18 @@
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysMenu menu)
+ public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
- return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
{
- return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
menu.setCreateBy(getUsername());
- menuService.insertMenu(menu);
- return R.ok();
+ return toAjax(menuService.insertMenu(menu));
}
/**
@@ -101,23 +97,22 @@
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysMenu menu)
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
else if (menu.getMenuId().equals(menu.getParentId()))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
menu.setUpdateBy(getUsername());
- menuService.updateMenu(menu);
- return R.ok();
+ return toAjax(menuService.updateMenu(menu));
}
/**
@@ -126,17 +121,16 @@
@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
- public R<?> remove(@PathVariable("menuId") Long menuId)
+ public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
if (menuService.hasChildByMenuId(menuId))
{
- return R.fail(HttpStatus.WARN, "瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
+ return warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
}
if (menuService.checkMenuExistRole(menuId))
{
- return R.fail(HttpStatus.WARN, "鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
+ return warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
}
- menuService.deleteMenuById(menuId);
- return R.ok();
+ return toAjax(menuService.deleteMenuById(menuId));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 40458bf..eaba7d0 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -14,6 +14,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.service.ISysNoticeService;
@@ -50,50 +51,46 @@
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@GetMapping(value = "/{noticeId}")
- public R<?> getInfo(@PathVariable Long noticeId) {
- return R.ok(noticeService.selectNoticeById(noticeId));
+ public AjaxResult getInfo(@PathVariable Long noticeId) {
+ return success(noticeService.selectNoticeById(noticeId));
}
/**
* 鏂板閫氱煡鍏憡
*/
@PostMapping
- public R<?> add(@Validated @RequestBody SysNotice notice) {
- noticeService.insertNotice(notice);
- return R.ok();
+ public AjaxResult add(@Validated @RequestBody SysNotice notice) {
+ return toAjax(noticeService.insertNotice(notice));
}
/**
* 淇敼閫氱煡鍏憡
*/
@PutMapping
- public R<?> edit(@Validated @RequestBody SysNotice notice) {
- noticeService.updateNotice(notice);
- return R.ok();
+ public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
+ return toAjax(noticeService.updateNotice(notice));
}
/**
* 鍒犻櫎閫氱煡鍏憡
*/
@DeleteMapping("/{noticeIds}")
- public R<?> remove(@PathVariable Long[] noticeIds) {
- noticeService.deleteNoticeByIds(noticeIds);
- return R.ok();
+ public AjaxResult remove(@PathVariable Long[] noticeIds) {
+ return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
/**
* 涓�閿凡璇�
*/
@PostMapping("/readAll")
- public R<?> readAll() {
- noticeService.readAll();
- return R.ok();
+ public AjaxResult readAll() {
+ return toAjax(noticeService.readAll());
}
@PostMapping("appReadNotice")
@Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
- public R<?> appReadNotice(@RequestParam("noticeId") Long noticeId) {
- noticeService.appReadNotice(noticeId);
- return R.ok();
+ public AjaxResult appReadNotice(@RequestParam("noticeId") Long noticeId) {
+ boolean result = noticeService.appReadNotice(noticeId);
+ return toAjax(result);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index 652ab30..45c5bcc 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -3,6 +3,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,14 +18,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.service.ISysPostService;
/**
* 宀椾綅淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -48,7 +49,7 @@
/**
* 瀵煎嚭宀椾綅鍒楄〃
*/
-
+
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:post:export')")
@PostMapping("/export")
@@ -64,9 +65,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}")
- public R<?> getInfo(@PathVariable Long postId)
+ public AjaxResult getInfo(@PathVariable Long postId)
{
- return R.ok(postService.selectPostById(postId));
+ return success(postService.selectPostById(postId));
}
/**
@@ -75,19 +76,18 @@
@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysPost post)
+ public AjaxResult add(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
- return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
}
else if (!postService.checkPostCodeUnique(post))
{
- return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setCreateBy(getUsername());
- postService.insertPost(post);
- return R.ok();
+ return toAjax(postService.insertPost(post));
}
/**
@@ -96,19 +96,18 @@
@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysPost post)
+ public AjaxResult edit(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
- return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
}
else if (!postService.checkPostCodeUnique(post))
{
- return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setUpdateBy(getUsername());
- postService.updatePost(post);
- return R.ok();
+ return toAjax(postService.updatePost(post));
}
/**
@@ -117,19 +116,18 @@
@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
- public R<?> remove(@PathVariable Long[] postIds)
+ public AjaxResult remove(@PathVariable Long[] postIds)
{
- postService.deletePostByIds(postIds);
- return R.ok();
+ return toAjax(postService.deletePostByIds(postIds));
}
/**
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public R<?> optionselect()
+ public AjaxResult optionselect()
{
List<SysPost> posts = postService.selectPostAll();
- return R.ok(posts);
+ return success(posts);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
index dcc6fe2..66e89e2 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
@@ -1,8 +1,5 @@
package com.ruoyi.project.system.controller;
-import java.util.HashMap;
-import java.util.Map;
-
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -13,16 +10,18 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import java.util.Map;
+
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -37,15 +36,14 @@
* 涓汉淇℃伅
*/
@GetMapping
- public R<?> profile()
+ public AjaxResult profile()
{
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
- Map<String, Object> map = new HashMap<>();
- map.put("data", user);
- map.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
- map.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success(user);
+ ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+ ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+ return ajax;
}
/**
@@ -53,7 +51,7 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> updateProfile(@RequestBody SysUser user)
+ public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = getLoginUser();
SysUser currentUser = loginUser.getUser();
@@ -63,19 +61,19 @@
currentUser.setSex(user.getSex());
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
{
- return R.fail("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
{
- return R.fail("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
if (userService.updateUserProfile(currentUser) > 0)
{
// 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
tokenService.setLoginUser(loginUser);
- return R.ok();
+ return success();
}
- return R.fail("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
/**
@@ -83,7 +81,7 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
- public R<?> updatePwd(@RequestBody Map<String, String> params)
+ public AjaxResult updatePwd(@RequestBody Map<String, String> params)
{
String oldPassword = params.get("oldPassword");
String newPassword = params.get("newPassword");
@@ -92,11 +90,11 @@
String password = loginUser.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
- return R.fail("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
+ return error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
if (SecurityUtils.matchesPassword(newPassword, password))
{
- return R.fail("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
+ return error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
}
newPassword = SecurityUtils.encryptPassword(newPassword);
if (userService.resetUserPwd(userName, newPassword) > 0)
@@ -104,9 +102,9 @@
// 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
loginUser.getUser().setPassword(newPassword);
tokenService.setLoginUser(loginUser);
- return R.ok();
+ return success();
}
- return R.fail("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
/**
@@ -114,7 +112,7 @@
*/
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
@PostMapping("/avatar")
- public R<?> avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+ public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
{
if (!file.isEmpty())
{
@@ -122,14 +120,14 @@
String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("imgUrl", avatar);
// 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
loginUser.getUser().setAvatar(avatar);
tokenService.setLoginUser(loginUser);
- Map<String, Object> map = new HashMap<>();
- map.put("imgUrl", avatar);
- return R.ok(map);
+ return ajax;
}
}
- return R.fail("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
index ef7cb05..aa672cf 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.security.RegisterBody;
import com.ruoyi.framework.security.service.SysRegisterService;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysConfigService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
@@ -23,11 +23,11 @@
private ISysConfigService configService;
@PostMapping("/register")
- public R<?> register(@RequestBody RegisterBody user) {
+ public AjaxResult register(@RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
- return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
+ return error("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
}
String msg = registerService.register(user);
- return StringUtils.isEmpty(msg) ? R.ok() : R.fail(msg);
+ return StringUtils.isEmpty(msg) ? success() : error(msg);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index 650a3e3..5f65a8d 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -1,16 +1,9 @@
package com.ruoyi.project.system.controller;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import jakarta.servlet.http.HttpServletResponse;
-
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.project.system.service.*;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -29,15 +22,19 @@
import com.ruoyi.framework.security.service.SysPermissionService;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.SysUserRole;
+import com.ruoyi.project.system.service.ISysDeptService;
+import com.ruoyi.project.system.service.ISysRoleService;
+import com.ruoyi.project.system.service.ISysUserService;
/**
* 瑙掕壊淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -75,10 +72,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}")
- public R<?> getInfo(@PathVariable Long roleId)
+ public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
- return R.ok(roleService.selectRoleById(roleId));
+ return success(roleService.selectRoleById(roleId));
}
/**
@@ -87,19 +84,18 @@
@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysRole role)
+ public AjaxResult add(@Validated @RequestBody SysRole role)
{
if (!roleService.checkRoleNameUnique(role))
{
- return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ return error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
}
else if (!roleService.checkRoleKeyUnique(role))
{
- return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ return error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
role.setCreateBy(getUsername());
- roleService.insertRole(role);
- return R.ok();
+ return toAjax(roleService.insertRole(role));
}
@@ -109,20 +105,20 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysRole role)
+ public AjaxResult edit(@Validated @RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
if (!roleService.checkRoleNameUnique(role))
{
- return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
}
else if (!roleService.checkRoleKeyUnique(role))
{
- return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
role.setUpdateBy(getUsername());
-
+
if (roleService.updateRole(role) > 0)
{
// 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
@@ -133,9 +129,9 @@
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
tokenService.setLoginUser(loginUser);
}
- return R.ok();
+ return success();
}
- return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
/**
@@ -144,12 +140,11 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
- public R<?> dataScope(@RequestBody SysRole role)
+ public AjaxResult dataScope(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
- roleService.authDataScope(role);
- return R.ok();
+ return toAjax(roleService.authDataScope(role));
}
/**
@@ -158,13 +153,12 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public R<?> changeStatus(@RequestBody SysRole role)
+ public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
role.setUpdateBy(getUsername());
- roleService.updateRoleStatus(role);
- return R.ok();
+ return toAjax(roleService.updateRoleStatus(role));
}
/**
@@ -173,10 +167,9 @@
@PreAuthorize("@ss.hasPermi('system:role:remove')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
- public R<?> remove(@PathVariable Long[] roleIds)
+ public AjaxResult remove(@PathVariable Long[] roleIds)
{
- roleService.deleteRoleByIds(roleIds);
- return R.ok();
+ return toAjax(roleService.deleteRoleByIds(roleIds));
}
/**
@@ -184,9 +177,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping("/optionselect")
- public R<?> optionselect()
+ public AjaxResult optionselect()
{
- return R.ok(roleService.selectRoleAll());
+ return success(roleService.selectRoleAll());
}
/**
@@ -219,10 +212,9 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
- public R<?> cancelAuthUser(@RequestBody SysUserRole userRole)
+ public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
{
- roleService.deleteAuthUser(userRole);
- return R.ok();
+ return toAjax(roleService.deleteAuthUser(userRole));
}
/**
@@ -231,10 +223,9 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
- public R<?> cancelAuthUserAll(Long roleId, Long[] userIds)
+ public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
{
- roleService.deleteAuthUsers(roleId, userIds);
- return R.ok();
+ return toAjax(roleService.deleteAuthUsers(roleId, userIds));
}
/**
@@ -243,11 +234,10 @@
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
- public R<?> selectAuthUserAll(Long roleId, Long[] userIds)
+ public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
{
roleService.checkRoleDataScope(roleId);
- roleService.insertAuthUsers(roleId, userIds);
- return R.ok();
+ return toAjax(roleService.insertAuthUsers(roleId, userIds));
}
/**
@@ -255,11 +245,11 @@
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
- public R<?> deptTree(@PathVariable("roleId") Long roleId)
+ public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
- Map<String, Object> map = new HashMap<>();
- map.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
- map.put("depts", deptService.selectDeptTreeList(new SysDept()));
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+ ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+ return ajax;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
index f6a2732..cb921a0 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -2,13 +2,15 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.GetuiConfig;
import com.ruoyi.project.system.domain.SysUserClient;
import com.ruoyi.project.system.service.SysUserClientService;
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,10 +36,10 @@
*/
@PostMapping("/addOrUpdateClientId")
@Operation(summary = "娣诲姞/鏇存柊鐢ㄦ埛cid")
- public R<?> addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
+ public AjaxResult addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
Long userId = SecurityUtils.getUserId();
sysUserClient.setUserId(userId);
boolean result = sysUserClientService.addOrUpdateClientId(sysUserClient);
- return result ? R.ok() : R.fail("璁惧缁戝畾澶辫触");
+ return result ? success() : error("璁惧缁戝畾澶辫触");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 84f9214..08be9f2 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -1,34 +1,41 @@
package com.ruoyi.project.system.controller;
+import java.util.List;
+import java.util.stream.Collectors;
+import jakarta.servlet.http.HttpServletResponse;
+
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.service.*;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.service.*;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* 鐢ㄦ埛淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -59,10 +66,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/listAll")
- public R<?> listAll(SysUser user)
+ public AjaxResult listAll(SysUser user)
{
List<SysUser> list = userService.selectUserList(user);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@@ -78,13 +85,13 @@
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
- public R<?> importData(MultipartFile file, boolean updateSupport) throws Exception
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
String operName = getUsername();
String message = userService.importUser(userList, updateSupport, operName);
- return R.ok(null, message);
+ return success(message);
}
@PostMapping("/importTemplate")
@@ -99,25 +106,25 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = { "/", "/{userId}" })
- public R<?> getInfo(@PathVariable(value = "userId", required = false) Long userId)
+ public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{
- Map<String, Object> map = new HashMap<>();
+ AjaxResult ajax = AjaxResult.success();
if (StringUtils.isNotNull(userId))
{
userService.checkUserDataScope(userId);
SysUser sysUser = userService.selectUserById(userId);
- map.put("data", sysUser);
- map.put("postIds", postService.selectPostListByUserId(userId));
- map.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+ ajax.put(AjaxResult.DATA_TAG, sysUser);
+ ajax.put("postIds", postService.selectPostListByUserId(userId));
+ ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
List<SysRole> roles = roleService.selectRoleAll();
- map.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
- map.put("posts", postService.selectPostAll());
+ ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ ajax.put("posts", postService.selectPostAll());
SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
sysUserDeptVo.setUserId(userId);
List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
- map.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
- return R.ok(map);
+ ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
+ return ajax;
}
/**
@@ -126,25 +133,25 @@
@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysUser user)
+ public AjaxResult add(@Validated @RequestBody SysUser user)
{
roleService.checkRoleDataScope(user.getRoleIds());
if (!userService.checkUserNameUnique(user))
{
- return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
- return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
{
- return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setTenantId(user.getDeptId());
- return R.ok(userService.insertUser(user));
+ return toAjax(userService.insertUser(user));
}
/**
@@ -153,26 +160,26 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysUser user)
+ public AjaxResult edit(@Validated @RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
roleService.checkRoleDataScope(user.getRoleIds());
if (!userService.checkUserNameUnique(user))
{
- return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
- return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
{
- return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setUpdateBy(getUsername());
userService.bindUserDept(user);
- return R.ok(userService.updateUser(user));
+ return toAjax(userService.updateUser(user));
}
/**
@@ -181,13 +188,13 @@
@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public R<?> remove(@PathVariable Long[] userIds)
+ public AjaxResult remove(@PathVariable Long[] userIds)
{
if (ArrayUtils.contains(userIds, getUserId()))
{
- return R.fail("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
+ return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
- return R.ok(userService.deleteUserByIds(userIds)) ;
+ return toAjax(userService.deleteUserByIds(userIds));
}
/**
@@ -196,13 +203,13 @@
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
- public R<?> resetPwd(@RequestBody SysUser user)
+ public AjaxResult resetPwd(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
- return R.ok(userService.resetPwd(user));
+ return toAjax(userService.resetPwd(user));
}
/**
@@ -211,12 +218,12 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public R<?> changeStatus(@RequestBody SysUser user)
+ public AjaxResult changeStatus(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
user.setUpdateBy(getUsername());
- return R.ok(userService.updateUserStatus(user)) ;
+ return toAjax(userService.updateUserStatus(user));
}
/**
@@ -224,14 +231,14 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/authRole/{userId}")
- public R<?> authRole(@PathVariable("userId") Long userId)
+ public AjaxResult authRole(@PathVariable("userId") Long userId)
{
+ AjaxResult ajax = AjaxResult.success();
SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
- Map<String, Object> map = new HashMap<>();
- map.put("user", user);
- map.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
- return R.ok(map);
+ ajax.put("user", user);
+ ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ return ajax;
}
/**
@@ -240,12 +247,12 @@
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
- public R<?> insertAuthRole(Long userId, Long[] roleIds)
+ public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
{
userService.checkUserDataScope(userId);
roleService.checkRoleDataScope(roleIds);
userService.insertUserAuth(userId, roleIds);
- return R.ok();
+ return success();
}
/**
@@ -253,9 +260,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
- public R<?> deptTree(SysDept dept)
+ public AjaxResult deptTree(SysDept dept)
{
- return R.ok(deptService.selectDeptTreeList(dept));
+ return success(deptService.selectDeptTreeList(dept));
}
/**
@@ -264,9 +271,9 @@
* @return
*/
@GetMapping("/userListNoPage")
- public R<?> userListNoPage(SysUser user){
+ public AjaxResult userListNoPage(SysUser user){
List<SysUser> sysUserList = userService.userListNoPage(user);
- return R.ok(sysUserList);
+ return AjaxResult.success(sysUserList);
}
/**
@@ -275,11 +282,11 @@
* @return
*/
@GetMapping("/userListNoPageByTenantId")
- public R<?> userListNoPageByTenantId(SysUser user){
+ public AjaxResult userListNoPageByTenantId(SysUser user){
//鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
user.setTenantId(loginUser.getTenantId());
List<SysUser> sysUserList = userService.userListNoPage(user);
- return R.ok(sysUserList);
+ return AjaxResult.success(sysUserList);
}
}
diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 6b5a544..a94fe62 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.config.GenConfig;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.tool.gen.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn;
@@ -32,7 +32,7 @@
/**
* 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -60,7 +60,7 @@
*/
@PreAuthorize("@ss.hasPermi('tool:gen:query')")
@GetMapping(value = "/{talbleId}")
- public R<?> getInfo(@PathVariable Long talbleId)
+ public AjaxResult getInfo(@PathVariable Long talbleId)
{
GenTable table = genTableService.selectGenTableById(talbleId);
List<GenTable> tables = genTableService.selectGenTableAll();
@@ -69,7 +69,7 @@
map.put("info", table);
map.put("rows", list);
map.put("tables", tables);
- return R.ok(map);
+ return success(map);
}
/**
@@ -104,13 +104,13 @@
@PreAuthorize("@ss.hasPermi('tool:gen:import')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
- public R<?> importTableSave(String tables)
+ public AjaxResult importTableSave(String tables)
{
String[] tableNames = Convert.toStrArray(tables);
// 鏌ヨ琛ㄤ俊鎭�
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList, SecurityUtils.getUsername());
- return R.ok();
+ return success();
}
/**
@@ -119,7 +119,7 @@
@PreAuthorize("@ss.hasRole('admin')")
@Log(title = "鍒涘缓琛�", businessType = BusinessType.OTHER)
@PostMapping("/createTable")
- public R<?> createTableSave(String sql)
+ public AjaxResult createTableSave(String sql)
{
try
{
@@ -141,12 +141,12 @@
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
String operName = SecurityUtils.getUsername();
genTableService.importGenTable(tableList, operName);
- return R.ok();
+ return AjaxResult.success();
}
catch (Exception e)
{
logger.error(e.getMessage(), e);
- return R.fail("鍒涘缓琛ㄧ粨鏋勫紓甯�");
+ return AjaxResult.error("鍒涘缓琛ㄧ粨鏋勫紓甯�");
}
}
@@ -156,11 +156,11 @@
@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> editSave(@Validated @RequestBody GenTable genTable)
+ public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
{
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
- return R.ok();
+ return success();
}
/**
@@ -169,10 +169,10 @@
@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
- public R<?> remove(@PathVariable Long[] tableIds)
+ public AjaxResult remove(@PathVariable Long[] tableIds)
{
genTableService.deleteGenTableByIds(tableIds);
- return R.ok();
+ return success();
}
/**
@@ -180,10 +180,10 @@
*/
@PreAuthorize("@ss.hasPermi('tool:gen:preview')")
@GetMapping("/preview/{tableId}")
- public R<?> preview(@PathVariable("tableId") Long tableId) throws IOException
+ public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
Map<String, String> dataMap = genTableService.previewCode(tableId);
- return R.ok(dataMap);
+ return success(dataMap);
}
/**
@@ -204,14 +204,14 @@
@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
- public R<?> genCode(@PathVariable("tableName") String tableName)
+ public AjaxResult genCode(@PathVariable("tableName") String tableName)
{
if (!GenConfig.isAllowOverwrite())
{
- return R.fail("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
+ return AjaxResult.error("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
}
genTableService.generatorCode(tableName);
- return R.ok();
+ return success();
}
/**
@@ -220,10 +220,10 @@
@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
- public R<?> synchDb(@PathVariable("tableName") String tableName)
+ public AjaxResult synchDb(@PathVariable("tableName") String tableName)
{
genTableService.synchDb(tableName);
- return R.ok();
+ return success();
}
/**
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 1acbd65..56baf0f 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -1,7 +1,6 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.dto.InfoStageDto;
import com.ruoyi.projectManagement.dto.UpdateStateInfo;
import com.ruoyi.projectManagement.service.InfoService;
@@ -25,63 +24,63 @@
@RequestMapping("/projectManagement/info")
@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class InfoController extends BaseController {
+public class InfoController {
private final InfoService infoService;
private final InfoStageHandleService infoStageHandleService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public R<?> save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
+ public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
infoService.save(saveInfoVo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/updateStatus")
@Operation(summary = "淇敼鐘舵��")
- public R<?> updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
+ public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
infoService.updateStatus(updateStateInfo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable Long id) {
+ public AjaxResult delete(@PathVariable Long id) {
infoService.deleteInfo(id);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public R<?> listPage(@RequestBody @Valid SearchInfoVo vo) {
- return R.ok(infoService.searchListInfo(vo));
+ public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
+ return AjaxResult.success(infoService.searchListInfo(vo));
}
@PostMapping("/{id}")
@Operation(summary = "璇︽儏")
- public R<?> getInfoById(@PathVariable Long id) {
- return R.ok(infoService.getInfoById(id));
+ public AjaxResult getInfoById(@PathVariable Long id) {
+ return AjaxResult.success(infoService.getInfoById(id));
}
@PostMapping("/saveStage")
@Operation(summary = "淇濆瓨闃舵")
- public R<?> saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
+ public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
infoStageHandleService.save(dto);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listStage/{id}")
@Operation(summary = "鍒楄〃闃舵")
- public R<?> listStage(@PathVariable Long id) {
- return R.ok(infoStageHandleService.getListVoByInfoId(id));
+ public AjaxResult listStage(@PathVariable Long id) {
+ return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
}
@PostMapping("/deleteStage/{id}")
@Operation(summary = "鍒犻櫎闃舵")
- public R<?> deleteStage(@PathVariable Long id) {
+ public AjaxResult deleteStage(@PathVariable Long id) {
infoStageHandleService.deleteById(id);
- return R.ok();
+ return AjaxResult.success();
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index 5ec8191..c8b982c 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -1,7 +1,6 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
@@ -23,28 +22,28 @@
@RequestMapping("/projectManagement/plan")
@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class PlanController extends BaseController {
+public class PlanController {
private final PlanService planService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public R<?> save(@RequestBody @Valid SavePlanVo savePlanVo) {
+ public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable Long id) {
+ public AjaxResult delete(@PathVariable Long id) {
planService.deletePlan(id);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public R<?> listPage(@RequestBody SearchPlanVo searchPlanVo) {
- return R.ok(planService.searchPlan(searchPlanVo));
+ public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
+ return AjaxResult.success(planService.searchPlan(searchPlanVo));
}
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index 93fadf7..8adcf8d 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
@@ -21,41 +20,41 @@
@AllArgsConstructor
@RequestMapping("/projectManagement/roles")
@Tag(name = "")
-public class RolesController extends BaseController {
+public class RolesController {
private RolesService rolesservice;
private RolesMapper rolesMapper;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
- public R<?> listPage(Page<Roles> page, Roles roles) {
- return R.ok(rolesservice.listPage(page, roles));
+ public AjaxResult listPage(Page<Roles> page, Roles roles) {
+ return AjaxResult.success(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody RoleDto roleDto) {
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
}
- return R.ok(rolesservice.save(roleDto));
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody Roles roles) {
- return R.ok(rolesservice.updateById(roles));
+ public AjaxResult update(@RequestBody Roles roles) {
+ return AjaxResult.success(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(rolesservice.removeBatchByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(rolesservice.removeBatchByIds(ids));
}
@PostMapping("/listSimpleRole")
- public R<?> listSimpleRole() {
- return R.ok(rolesservice.listSimpleRole());
+ public AjaxResult listSimpleRole() {
+ return AjaxResult.success(rolesservice.listSimpleRole());
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index 047863c..813fb44 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -5,8 +5,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
import com.ruoyi.purchase.dto.VatDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;
@@ -28,15 +27,15 @@
@Tag(name = "閲囪喘鎶ヨ〃")
@RequestMapping("/purchase/report")
@AllArgsConstructor
-public class AccountingReportController extends BaseController {
+public class AccountingReportController {
private IInvoicePurchaseService invoicePurchaseService;
@GetMapping("/list")
@Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎", businessType = BusinessType.OTHER)
- public R<?> list(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
+ public AjaxResult list(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
IPage<InvoicePurchaseReportDto> result =invoicePurchaseService.listPurchaseReport(page, invoicePurchaseReportDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭", businessType = BusinessType.EXPORT)
@@ -52,9 +51,9 @@
@Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.OTHER)
@GetMapping("/listVat")
- public R<?> listVat(Page page,String month) {
+ public AjaxResult listVat(Page page,String month) {
IPage<VatDto> result = invoicePurchaseService.listVat(page, month);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.EXPORT)
diff --git a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
index 5bf43bf..afd9213 100644
--- a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;
@@ -66,9 +66,8 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateInvoice")
- public R<?> addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
- invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto);
- return R.ok();
+ public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+ return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto));
}
/**
@@ -76,9 +75,8 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delInvoice")
- public R<?> remove(@RequestBody Long[] ids) {
- invoicePurchaseService.delInvoice(ids);
- return R.ok();
+ public AjaxResult remove(@RequestBody Long[] ids) {
+ return toAjax(invoicePurchaseService.delInvoice(ids));
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 9019c61..289110c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
@@ -62,8 +62,8 @@
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public R<?> getInfo(@PathVariable("id") Long id) {
- return R.ok(paymentRegistrationService.selectPaymentRegistrationById(id));
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(paymentRegistrationService.selectPaymentRegistrationById(id));
}
/**
@@ -72,9 +72,8 @@
@Log(title = "浠樻鐧昏", businessType = BusinessType.INSERT)
@PostMapping
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody List<PaymentRegistration> paymentRegistration) {
- paymentRegistrationService.insertPaymentRegistration(paymentRegistration);
- return R.ok();
+ public AjaxResult add(@RequestBody List<PaymentRegistration> paymentRegistration) {
+ return toAjax(paymentRegistrationService.insertPaymentRegistration(paymentRegistration));
}
/**
@@ -83,9 +82,8 @@
@Log(title = "浠樻鐧昏", businessType = BusinessType.UPDATE)
@PutMapping
@Transactional(rollbackFor = Exception.class)
- public R<?> edit(@RequestBody PaymentRegistration paymentRegistration) {
- paymentRegistrationService.updatePaymentRegistration(paymentRegistration);
- return R.ok();
+ public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration) {
+ return toAjax(paymentRegistrationService.updatePaymentRegistration(paymentRegistration));
}
/**
@@ -93,9 +91,8 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- public R<?> remove(@RequestBody Long[] ids) {
- paymentRegistrationService.deletePaymentRegistrationByIds(ids);
- return R.ok();
+ public AjaxResult remove(@RequestBody Long[] ids) {
+ return toAjax(paymentRegistrationService.deletePaymentRegistrationByIds(ids));
}
/**
@@ -103,52 +100,51 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody Long[] ids) {
- paymentRegistrationService.delete(ids);
- return R.ok();
+ public AjaxResult delete(@RequestBody Long[] ids) {
+ return toAjax(paymentRegistrationService.delete(ids));
}
/**
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/byPurchaseId/{id}")
- public R<?> getPurchaseInfo(@PathVariable("id") Long id) {
- return R.ok(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
+ public AjaxResult getPurchaseInfo(@PathVariable("id") Long id) {
+ return success(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
}
/**
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/paymentLedgerList")
- public R<?> paymentLedgerList(PaymentLedgerDto paymentLedgerDto, Page page,
+ public AjaxResult paymentLedgerList(PaymentLedgerDto paymentLedgerDto, Page page,
Integer detailPageNum,
Integer detailPageSize) {
IPage<Map<String, Object>> mapIPage = paymentRegistrationService.selectPaymentLedgerList(paymentLedgerDto, page, detailPageNum, detailPageSize);
- return R.ok(mapIPage);
+ return success(mapIPage);
}
/**
* 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
*/
@GetMapping("/supplierNameListPage")
- public R<?> supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
- return R.ok(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
+ public AjaxResult supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
+ return success(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
}
/**
* 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
*/
@GetMapping("/supplierNameListPageDetails")
- public R<?> supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
- return R.ok(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
+ public AjaxResult supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
+ return success(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
}
/**
* 鑾峰彇鏈湀搴斾粯淇℃伅
*/
@GetMapping(value = "/paymentMonthList")
- public R<?> paymentMonthList() {
- return R.ok(paymentRegistrationService.paymentMonthList());
+ public AjaxResult paymentMonthList() {
+ return success(paymentRegistrationService.paymentMonthList());
}
/**
@@ -170,9 +166,9 @@
* @return
*/
@GetMapping("/getPaymentRecordList/{supplierId}")
- public R<?> getPaymentRecordList(@PathVariable Long supplierId) {
+ public AjaxResult getPaymentRecordList(@PathVariable Long supplierId) {
List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationService.getPaymentRecordList(supplierId);
- return R.ok(paymentRecordList);
+ return success(paymentRecordList);
}
/**
diff --git a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
index 949ca95..cbdee81 100644
--- a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,8 +31,8 @@
private ProcurementBusinessSummaryServiceImpl procurementBusinessSummaryService;
@GetMapping("/listPage")
- public R<?> listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
- return R.ok(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
+ public AjaxResult listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
+ return AjaxResult.success(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
}
/**
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index ebbd718..3290499 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -67,7 +67,7 @@
@Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/import")
@Operation(summary = "瀵煎叆閲囪喘鍙拌处")
- public R<?> importData(@RequestParam("file")
+ public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return purchaseLedgerService.importData(file);
@@ -151,9 +151,8 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public R<?> addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
- purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto);
- return R.ok();
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
+ return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
/**
@@ -161,7 +160,7 @@
*/
@Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public R<?> getPurchaseTemplateList() {
+ public AjaxResult getPurchaseTemplateList() {
List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -172,15 +171,14 @@
purchaseLedgerDto1.setProductList(list);
}
});
- return R.ok(purchaseLedgers);
+ return AjaxResult.success(purchaseLedgers);
}
/**
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
@PostMapping("/updateApprovalStatus")
- public R<?> addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
- purchaseLedgerService.updateById(purchaseLedger);
- return R.ok();
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+ return toAjax(purchaseLedgerService.updateById(purchaseLedger));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
@@ -203,9 +201,8 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE)
@DeleteMapping("/delPurchase")
- public R<?> remove(@RequestBody Long[] ids) {
- purchaseLedgerService.deletePurchaseLedgerByIds(ids);
- return R.ok();
+ public AjaxResult remove(@RequestBody Long[] ids) {
+ return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids));
}
/**
@@ -221,8 +218,8 @@
* 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
*/
@GetMapping("/getProductBySalesNo")
- public R<?> getProductBySalesNo(Long id) {
- return R.ok(purchaseLedgerService.getProductBySalesNo(id));
+ public AjaxResult getProductBySalesNo(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
}
/**
@@ -237,8 +234,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public R<?> getPurchaseNoById(Long id) {
- return R.ok(purchaseLedgerService.getPurchaseNoById(id));
+ public AjaxResult getPurchaseNoById(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -253,22 +250,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public R<?> getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return R.ok(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- return R.ok(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+ public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+ return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
@Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public R<?> createPurchaseNo() {
- return R.ok(purchaseLedgerService.getPurchaseNo(), "鐢熸垚鎴愬姛");
+ public AjaxResult createPurchaseNo() {
+ return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
index 996970d..3b3c97f 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -4,8 +4,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
@@ -32,7 +31,7 @@
@RequestMapping("/purchaseLedgerTemplate")
@Tag(name = "閲囪喘鍙拌处妯℃澘")
@AllArgsConstructor
-public class PurchaseLedgerTemplateController extends BaseController {
+public class PurchaseLedgerTemplateController {
private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@@ -40,7 +39,7 @@
@PostMapping("/add")
@Log(title = "娣诲姞閲囪喘鍙拌处妯℃澘", businessType = BusinessType.INSERT)
@Operation(summary = "娣诲姞閲囪喘鍙拌处妯℃澘")
- public R<?> add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ public AjaxResult add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 閲囪喘妯℃澘
if(StringUtils.isNotEmpty(purchaseLedgerDto.getTemplateName())){
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
@@ -64,24 +63,24 @@
});
}
}
- return R.ok();
+ return AjaxResult.success();
}
@DeleteMapping("/delete")
@Log(title = "閲囪喘鍙拌处妯℃澘", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
- public R<?> delete(@RequestBody List<Long> id) {
- if(CollectionUtils.isEmpty(id)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
+ public AjaxResult delete(@RequestBody List<Long> id) {
+ if(CollectionUtils.isEmpty(id)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
int result = purchaseLedgerTemplateMapper.deleteBatchIds(id);
salesLedgerProductTemplateMapper.delete(new LambdaQueryWrapper<SalesLedgerProductTemplate>()
.in(SalesLedgerProductTemplate::getSalesLedgerId, id));
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("/update")
@Log(title = "淇敼閲囪喘鍙拌处妯℃澘", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼閲囪喘鍙拌处妯℃澘")
- public R<?> update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ public AjaxResult update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
.selectOne(new LambdaQueryWrapper<PurchaseLedgerTemplate>()
@@ -103,7 +102,7 @@
salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
});
}
- return R.ok();
+ return AjaxResult.success();
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index f1fb4e8..e4c7bf7 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -1,13 +1,18 @@
package com.ruoyi.purchase.controller;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.pojo.AccountStatementDetails;
+import com.ruoyi.account.service.AccountStatementDetailsService;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import com.ruoyi.purchase.vo.PurchaseStockInProductVo;
import io.swagger.v3.oas.annotations.Operation;
@@ -29,43 +34,51 @@
@RequestMapping("/purchaseReturnOrders")
@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
-public class PurchaseReturnOrdersController extends BaseController {
+public class PurchaseReturnOrdersController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ private AccountStatementDetailsService accountStatementDetailsService;
@GetMapping("/listPage")
- public R<?> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
- return R.ok(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
+ public AjaxResult listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ return AjaxResult.success(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
}
// 鏂板
@Log(title = "閲囪喘閫�璐у崟", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
+ public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL", "no"));
}
- return R.ok(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
+ return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
@GetMapping("/selectById/{id}")
- public R<?> selectById(@PathVariable Long id) {
- return R.ok(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
+ public AjaxResult selectById(@PathVariable Long id) {
+ return AjaxResult.success(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
}
@PostMapping("/deleteById/{id}")
- public R<?> deleteById(@PathVariable Long id) {
+ public AjaxResult deleteById(@PathVariable Long id) {
+ //濡傛灉璇ラ噰璐��璐у凡缁忕敓鎴愬璐﹀崟鍒欐棤娉曞垹闄�
+ PurchaseReturnOrders purchaseReturnOrders = purchaseReturnOrdersService.getById(id);
+ List<AccountStatementDetails> accountStatementDetails = accountStatementDetailsService.list(Wrappers.<AccountStatementDetails>lambdaQuery()
+ .eq(AccountStatementDetails::getReceiptNumber, purchaseReturnOrders.getNo()));
+ if (CollectionUtils.isNotEmpty(accountStatementDetails)){
+ throw new ServiceException("璇ラ噰璐��璐у崟宸茬粡鐢熸垚瀵硅处鍗曪紝鏃犳硶鍒犻櫎");
+ }
purchaseReturnOrdersService.deleteById(id);
- return R.ok();
+ return AjaxResult.success();
}
@GetMapping("/getByPurchaseLedgerId")
@Operation(summary = "閲囪喘閫�璐�-鏍规嵁閲囪喘璁㈠崟id鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勫叆搴撲骇鍝佷俊鎭�")
- public R<?> getByPurchaseLedgerId(Long purchaseLedgerId) {
+ public AjaxResult getByPurchaseLedgerId(Long purchaseLedgerId) {
List<PurchaseStockInProductVo> purchaseStockInProductVos = purchaseReturnOrdersService.getByPurchaseLedgerId(purchaseLedgerId);
- return R.ok(purchaseStockInProductVos);
+ return AjaxResult.success(purchaseStockInProductVos);
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index ceeba52..db628af 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.dto.ProductRecordDto;
@@ -70,24 +70,23 @@
@Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按")
@GetMapping("/getPaymentRegistrationById")
- public R<?> getPaymentRegistrationById(Long id) {
+ public AjaxResult getPaymentRegistrationById(Long id) {
PaymentRegistration byId = paymentRegistrationService.getById(id);
- return R.ok(byId);
+ return AjaxResult.success(byId);
}
@Operation(summary = "淇敼浠樻娴佹按")
@PutMapping("/updatePaymentRegistration")
@Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
- public R<?> updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
- return R.ok(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
+ public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
+ return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
}
@Operation(summary = "鍒犻櫎浠樻娴佹按")
@DeleteMapping("/delPaymentRegistration")
@Transactional(rollbackFor = Exception.class)
- public R<?> delPaymentRegistration(@RequestBody List<Long> id) {
- paymentRegistrationService.delPaymentRegistration(id);
- return R.ok();
+ public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
+ return toAjax(paymentRegistrationService.delPaymentRegistration(id));
}
/**
@@ -127,26 +126,26 @@
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateRegistration")
@Transactional(rollbackFor = Exception.class)
- public R<?> addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
- if(CollectionUtils.isEmpty(ticketRegistrationDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
+ if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) {
ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1);
}
- return R.ok();
+ return toAjax(1);
}
@PostMapping("/getProductRecordById")
- public R<?> getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
+ public AjaxResult getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
if (productRecordDto.getId() == null) {
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
- return R.ok(productRecordService.getProductRecordById(productRecordDto));
+ return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
}
@Schema(description = "淇敼鏉ョエ鐧昏")
@PostMapping("/updateRegistration")
- public R<?> updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
+ public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
return productRecordService.updateRecord(productRecordDto);
}
@@ -157,9 +156,8 @@
@Log(title = "鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)", businessType = BusinessType.DELETE)
@DeleteMapping("/delRegistration")
@Transactional(rollbackFor = Exception.class)
- public R<?> delRegistration(@RequestBody Long[] ids) {
- ticketRegistrationService.delRegistration(ids);
- return R.ok();
+ public AjaxResult delRegistration(@RequestBody Long[] ids) {
+ return toAjax(ticketRegistrationService.delRegistration(ids));
}
/**
@@ -175,18 +173,18 @@
* 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
*/
@GetMapping("/productRecordPage")
- public R<?> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+ public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
- return R.ok(list);
+ return AjaxResult.success(list);
}
/**
* 鏌ヨ鍙戠エ鍙�
*/
@GetMapping("/getTicketNo")
- public R<?> getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
- return R.ok(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+ public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+ return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
}
/**
@@ -199,8 +197,8 @@
@Schema(description = "鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
@GetMapping("/getPuargeById")
- public R<?> getPuargeById(Long id) {
- return R.ok(ticketRegistrationService.getPuargeById( id));
+ public AjaxResult getPuargeById(Long id) {
+ return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java b/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
index 6048e5c..3ab3d32 100644
--- a/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.pojo.ProductRecord;
@@ -22,7 +22,7 @@
IPage<ProductRecordDto> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto);
- R<?> updateRecord(ProductRecordDto productRecordDto);
+ AjaxResult updateRecord(ProductRecordDto productRecordDto);
ProductRecordDto getProductRecordById(ProductRecordDto productRecordDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index be515e6..d09050e 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
@@ -44,7 +44,7 @@
String getPurchaseNo();
- R<?> importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index 1cee7de..961e759 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
@@ -67,9 +67,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> updateRecord(ProductRecordDto productRecordDto) {
+ public AjaxResult updateRecord(ProductRecordDto productRecordDto) {
ProductRecord productRecord = productRecordMapper.selectById(productRecordDto.getId());
- if (productRecord == null) return R.fail("璁板綍涓嶅瓨鍦�");
+ if (productRecord == null) return AjaxResult.error("璁板綍涓嶅瓨鍦�");
// 鏇存柊浜у搧鍙拌处
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productRecord.getSaleLedgerProjectId());
@@ -110,7 +110,7 @@
productRecord.setFutureTicketsAmount(productRecord.getFutureTickets().multiply(productRecord.getTaxInclusiveUnitPrice()));
productRecordMapper.updateById(productRecord);
- return R.ok(null, "淇敼鎴愬姛");
+ return AjaxResult.success("淇敼鎴愬姛");
}
@Override
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e7cff23..cdf80f9 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -24,7 +24,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
@@ -534,18 +534,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
InputStream inputStream = file.getInputStream();
ExcelUtil<PurchaseLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
Map<String, List<PurchaseLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閲囪喘鍙拌处鏁版嵁", "閲囪喘浜у搧鏁版嵁"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return R.fail("閲囪喘琛ㄦ牸涓虹┖锛�");
+ if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閲囪喘琛ㄦ牸涓虹┖锛�");
// 涓氬姟灞傚悎骞�
List<PurchaseLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閲囪喘鍙拌处鏁版嵁");
- if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return R.fail("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
+ if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閲囪喘浜у搧鏁版嵁");
- if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return R.fail("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
+ if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
// 渚涘簲鍟嗘暟鎹�
List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getSupplierName).collect(Collectors.toList())));
@@ -640,11 +640,11 @@
addApproveByPurchase(loginUser,salesLedger);
}
- return R.ok(null, "瀵煎叆鎴愬姛");
+ return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
}
- return R.ok(null, "瀵煎叆澶辫触");
+ return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 0319071..fcaceb6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -37,8 +37,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody QualityInspectDto qualityInspectDto) {
- return R.ok(qualityInspectService.add(qualityInspectDto));
+ public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
+ return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
}
/**
@@ -48,9 +48,9 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
@@ -66,7 +66,7 @@
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
.in(QualityInspectFile::getInspectId, ids));
//鍒犻櫎妫�楠屽崟
- return R.ok(qualityInspectService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
}
/**
@@ -76,8 +76,8 @@
* @return
*/
@GetMapping("/{id}")
- public R<?> QualityInspectDetail(@PathVariable("id") Integer id) {
- return R.ok(qualityInspectService.getDetailById(id));
+ public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(qualityInspectService.getDetailById(id));
}
/**
@@ -87,8 +87,8 @@
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody QualityInspectDto qualityInspectDto) {
- return R.ok(qualityInspectService.updateQualityInspect(qualityInspectDto));
+ public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
+ return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
}
/**
@@ -99,8 +99,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
- return R.ok(qualityInspectService.qualityInspectListPage(page, qualityInspect));
+ public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+ return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
}
/**
@@ -121,8 +121,8 @@
* @return
*/
@PostMapping("/submit")
- public R<?> submit(@RequestBody QualityInspect qualityInspect) {
- return R.ok(qualityInspectService.submit(qualityInspect));
+ public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
+ return AjaxResult.success(qualityInspectService.submit(qualityInspect));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
index f32d87b..bc5df62 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -34,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody QualityInspectFile qualityInspectFile) {
- return R.ok(qualityInspectFileService.save(qualityInspectFile));
+ public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
+ return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
}
/**
@@ -44,12 +44,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(qualityInspectFileService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityInspectFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +59,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
- return R.ok(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
+ public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
+ return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
index b408be6..263b201 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -32,8 +32,8 @@
* @return
*/
@GetMapping("/{inspectId}")
- public R<?> QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
- return R.ok(qualityInspectParamService.qualityInspectParamDetail(inspectId));
+ public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
+ return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
}
@@ -43,8 +43,8 @@
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
- return R.ok(qualityInspectParamService.updateBatchById(qualityInspectParams));
+ public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
+ return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
}
/**
@@ -53,11 +53,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(qualityInspectParamService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityInspectParamService.removeBatchByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index 9b1aaf4..4d005b0 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -1,6 +1,6 @@
package com.ruoyi.quality.controller;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.service.QualityReportService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,8 +30,8 @@
*/
@Operation(summary = "鑾峰彇妫�楠岀粺璁℃暟鎹�")
@GetMapping("/getInspectStatistics")
- public R<?> getInspectStatistics() {
- return R.ok(qualityReportService.getInspectStatistics());
+ public AjaxResult getInspectStatistics() {
+ return AjaxResult.success(qualityReportService.getInspectStatistics());
}
/**
@@ -39,8 +39,8 @@
*/
@Operation(summary = "鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getPassRateStatistics")
- public R<?> getPassRateStatistics() {
- return R.ok(qualityReportService.getPassRateStatistics());
+ public AjaxResult getPassRateStatistics() {
+ return AjaxResult.success(qualityReportService.getPassRateStatistics());
}
/**
@@ -48,8 +48,8 @@
*/
@Operation(summary = "鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getMonthlyPassRateStatistics")
- public R<?> getMonthlyPassRateStatistics(@RequestParam("year") String year) {
- return R.ok(qualityReportService.getMonthlyPassRateStatistics(year));
+ public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
}
/**
@@ -57,8 +57,8 @@
*/
@Operation(summary = "鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
@GetMapping("/getYearlyPassRateStatistics")
- public R<?> getYearlyPassRateStatistics(@RequestParam("year") String year) {
- return R.ok(qualityReportService.getYearlyPassRateStatistics(year));
+ public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
}
/**
@@ -66,8 +66,8 @@
*/
@Operation(summary = "鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
@GetMapping("/getMonthlyCompletionDetails")
- public R<?> getMonthlyCompletionDetails(@RequestParam("year") String year) {
- return R.ok(qualityReportService.getMonthlyCompletionDetails(year));
+ public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
}
/**
@@ -75,8 +75,8 @@
*/
@Operation(summary = "鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
@GetMapping("/getTopParameters")
- public R<?> getTopParameters(@RequestParam("modelType") Integer modelType) {
- return R.ok(qualityReportService.getTopParameters(modelType));
+ public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
+ return AjaxResult.success(qualityReportService.getTopParameters(modelType));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
index c34f3ee..539f3f7 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -1,6 +1,6 @@
package com.ruoyi.quality.controller;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
import lombok.AllArgsConstructor;
@@ -31,8 +31,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
- return R.ok(qualityTestStandardBindingService.add(qualityTestStandardBindings));
+ public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
+ return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
}
/**
@@ -42,11 +42,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(qualityTestStandardBindingService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids));
}
/**
@@ -55,8 +55,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> listBinding(Long testStandardId) {
- return R.ok(qualityTestStandardBindingService.listBinding(testStandardId));
+ public AjaxResult listBinding(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 42aa2ea..a61ffed 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
@@ -39,8 +39,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody QualityTestStandard qualityTestStandard) {
- return R.ok(qualityTestStandardService.save(qualityTestStandard));
+ public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
}
/**
@@ -49,11 +49,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(qualityTestStandardService.delQualityTestStandard(ids));
+ return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -62,8 +62,8 @@
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody QualityTestStandard qualityTestStandard) {
- return R.ok(qualityTestStandardService.updateById(qualityTestStandard));
+ public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
}
/**
@@ -73,8 +73,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
- return R.ok(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
+ public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
}
/**
@@ -83,8 +83,8 @@
* @return
*/
@PostMapping("/copyParam")
- public R<?> copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
- return R.ok(qualityTestStandardService.copyParam(qualityTestStandard));
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
/**
@@ -93,8 +93,8 @@
* @return
*/
@PostMapping("/qualityTestStandardAudit")
- public R<?> qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
- return R.ok(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
/**
@@ -102,8 +102,8 @@
* @return
*/
@GetMapping("/getQualityTestStandardByProductId")
- public R<?> getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
- return R.ok(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
}
/**
@@ -111,8 +111,8 @@
* @return
*/
@GetMapping("/getQualityTestStandardParamByTestStandardId")
- public R<?> getQualityTestStandardParamByTestStandardId(Long testStandardId) {
- return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
index 44dc0cd..e5c883c 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardParamService;
@@ -34,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return R.ok(qualityTestStandardParamService.save(qualityTestStandardParam));
+ public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam));
}
/**
@@ -44,11 +44,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(qualityTestStandardParamService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityTestStandardParamService.removeBatchByIds(ids));
}
/**
@@ -57,8 +57,8 @@
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return R.ok(qualityTestStandardParamService.updateById(qualityTestStandardParam));
+ public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam));
}
/**
@@ -66,8 +66,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> list(Long testStandardId) {
- return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
+ public AjaxResult list(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 33c6005..3b20f82 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -1,7 +1,7 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import org.springframework.util.CollectionUtils;
@@ -28,9 +28,9 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody QualityUnqualified qualityUnqualified) {
+ public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
qualityUnqualified.setInspectState(0);
- return R.ok(qualityUnqualifiedService.save(qualityUnqualified));
+ return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
}
/**
@@ -39,13 +39,13 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
if (qualityUnqualified.getInspectState()==1){
throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
}
});
- return R.ok(qualityUnqualifiedService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
/**
@@ -54,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public R<?> QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return R.ok(qualityUnqualifiedService.getUnqualified(id));
+ public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -64,8 +64,8 @@
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody QualityUnqualified qualityUnqualified) {
- return R.ok(qualityUnqualifiedService.updateById(qualityUnqualified));
+ public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
}
/**
@@ -75,8 +75,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
- return R.ok(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
+ public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
}
/**
@@ -95,8 +95,8 @@
* @return
*/
@PostMapping("/deal")
- public R<?> deal(@RequestBody QualityUnqualified qualityUnqualified) {
- return R.ok(qualityUnqualifiedService.deal(qualityUnqualified));
+ public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 345d49c..0f410fd 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -126,7 +126,6 @@
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualified.setInspectId(qualityInspect.getId());
- qualityUnqualified.setId(null);
qualityUnqualifiedMapper.insert(qualityUnqualified);
}
diff --git a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
index c97a55a..37266a8 100644
--- a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
+++ b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.service.ICommonFileService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,12 +26,11 @@
*/
@Log(title = "闄勪欢鍒犻櫎", businessType = BusinessType.DELETE)
@DeleteMapping("/delCommonFile")
- public R<?> delCommonFile(@RequestBody Long[] ids) {
+ public AjaxResult delCommonFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- commonFileService.delCommonFileByIds(ids);
- return R.ok();
+ return toAjax(commonFileService.delCommonFileByIds(ids));
}
public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException{
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index 3b4f493..0559ff8 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
@@ -21,7 +20,7 @@
@RestController
@RequestMapping("/invoiceLedger")
@AllArgsConstructor
-public class InvoiceLedgerController extends BaseController {
+public class InvoiceLedgerController {
private InvoiceLedgerService invoiceLedgerService;
private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
@@ -32,9 +31,9 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public R<?> invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
+ public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
invoiceLedgerService.invoiceLedgerSaveOrUpdate(productDto);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -43,9 +42,9 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> invoiceLedgerDel(@RequestBody List<Integer> ids) {
+ public AjaxResult invoiceLedgerDel(@RequestBody List<Integer> ids) {
invoiceLedgerService.invoiceLedgerDel(ids);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -55,8 +54,8 @@
* @return
*/
@GetMapping("/page")
- public R<?> invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return R.ok(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
+ public AjaxResult invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
}
/**
@@ -65,8 +64,8 @@
* @return
*/
@GetMapping("/fileList")
- public R<?> invoiceLedgerFileList(Integer invoiceLedgerId) {
- return R.ok(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
+ public AjaxResult invoiceLedgerFileList(Integer invoiceLedgerId) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
}
/**
@@ -74,10 +73,10 @@
*/
@DeleteMapping("/delFile")
@Log(title = "寮�绁ㄥ彴璐�", businessType = BusinessType.DELETE)
- public R<?> invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
- if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
+ public AjaxResult invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
+ if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
invoiceLedgerFileMapper.deleteBatchIds(ids);
- return R.ok();
+ return AjaxResult.success();
}
@@ -88,11 +87,11 @@
* @return
*/
@PostMapping("/uploadFile")
- public R<?> invoiceLedgerUploadFile(MultipartFile file) {
+ public AjaxResult invoiceLedgerUploadFile(MultipartFile file) {
try {
- return R.ok(invoiceLedgerService.invoiceLedgerUploadFile(file));
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerUploadFile(file));
}catch (Exception e) {
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
@@ -113,8 +112,8 @@
* @return
*/
@GetMapping("/info")
- public R<?> invoiceLedgerInfo(Integer id) {
- return R.ok(invoiceLedgerService.invoiceLedgerDetail(id));
+ public AjaxResult invoiceLedgerInfo(Integer id) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
}
/**
@@ -123,12 +122,12 @@
* @return
*/
@PostMapping("/commitFile")
- public R<?> invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
try {
invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
- return R.ok();
+ return AjaxResult.success();
}catch (Exception e) {
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
@@ -138,8 +137,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
- return R.ok(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
+ public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
}
/**
@@ -149,20 +148,20 @@
* @return
*/
@GetMapping("/salesAccount")
- public R<?> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return R.ok(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
+ public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
}
/**
* 鏈湀寮�绁ㄩ噾棰�
*/
@GetMapping("/getInvoiceAmount")
- public R<?> getInvoiceAmount() {
+ public AjaxResult getInvoiceAmount() {
try {
BigDecimal amount = invoiceLedgerService.getInvoiceAmount();
- return R.ok(amount != null ? amount : BigDecimal.ZERO);
+ return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
} catch (Exception e) {
- return R.fail("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
+ return AjaxResult.error("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
}
}
@@ -173,9 +172,9 @@
* @return
*/
@GetMapping("/registrationProductPage")
- public R<?> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+ public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
- return R.ok(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
+ return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
}
/**
@@ -184,8 +183,8 @@
* @return
*/
@GetMapping("/invoiceLedgerProductInfo")
- public R<?> invoiceLedgerProductDetail(Integer id) {
- return R.ok(invoiceLedgerService.invoiceLedgerProductDetail(id));
+ public AjaxResult invoiceLedgerProductDetail(Integer id) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
}
/**
@@ -194,12 +193,12 @@
* @return
*/
@DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
- public R<?> delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
+ public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
try {
invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);
- return R.ok();
+ return AjaxResult.success();
}catch (Exception e) {
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 09447b1..8ea6c11 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -19,7 +18,7 @@
@RestController
@RequestMapping("/invoiceRegistration")
@AllArgsConstructor
-public class InvoiceRegistrationController extends BaseController {
+public class InvoiceRegistrationController {
private InvoiceRegistrationService invoiceRegistrationService;
@@ -31,13 +30,13 @@
@PostMapping("/save")
@Log(title = "寮�绁ㄧ櫥璁�", businessType = com.ruoyi.framework.aspectj.lang.enums.BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
- if(Collections.isEmpty(salesLedgerDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ public AjaxResult invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
+ if(Collections.isEmpty(salesLedgerDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
salesLedgerDto.forEach(item ->{
invoiceRegistrationService.invoiceRegistrationSave(item);
});
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -46,9 +45,9 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> invoiceRegistrationDel(@RequestBody List<Integer> ids) {
+ public AjaxResult invoiceRegistrationDel(@RequestBody List<Integer> ids) {
invoiceRegistrationService.invoiceRegistrationDel(ids);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -57,9 +56,9 @@
* @return
*/
@PostMapping("/update")
- public R<?> invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
+ public AjaxResult invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
invoiceRegistrationService.invoiceRegistrationUpdate(invoiceRegistrationDto);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -69,8 +68,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
+ public AjaxResult invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
}
/**
@@ -79,8 +78,8 @@
* @return
*/
@GetMapping("/productList")
- public R<?> invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
+ public AjaxResult invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
}
/**
@@ -89,8 +88,8 @@
* @return
*/
@GetMapping("/detail")
- public R<?> invoiceRegistrationDetail(Integer id) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationDetail(id));
+ public AjaxResult invoiceRegistrationDetail(Integer id) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationDetail(id));
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 5f58c0d..8ad4f02 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,13 +25,13 @@
@Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
- public R<?> total() {
+ public AjaxResult total() {
return metricStatisticsService.total();
}
@Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
- public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
}
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index ce70940..f88a0e6 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
@@ -32,37 +32,37 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
- public R<?> listPage(Page page, PaymentShipping paymentShipping) {
+ public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody PaymentShipping paymentShipping) {
+ public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
- return save ? R.ok() : R.fail();
+ return save ? success() : error();
}
@PostMapping("/update")
@Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody PaymentShipping paymentShipping) {
+ public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
- return update ? R.ok() : R.fail();
+ return update ? success() : error();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return R.ok(paymentShippingService.removeByIds(ids));
+ return AjaxResult.success(paymentShippingService.removeByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 7d91849..5512a8d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
@@ -39,9 +39,9 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public R<?> receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
+ public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPayment);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -51,8 +51,8 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- public R<?> receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
- return R.ok(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
+ public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
}
/**
@@ -62,8 +62,8 @@
*/
@DeleteMapping("/del")
@Transactional(rollbackFor = Exception.class)
- public R<?> receiptPaymentDel (@RequestBody List<Integer> ids) {
- return R.ok(receiptPaymentService.receiptPaymentDel(ids));
+ public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
}
/**
@@ -72,8 +72,8 @@
* @return
*/
@GetMapping("/customerInteractions")
- public R<?> customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
- return R.ok(receiptPaymentService.customerInteractions(receiptPaymentDto));
+ public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
+ return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
}
/**
@@ -82,20 +82,20 @@
* @return
*/
@GetMapping("/info")
- public R<?> receiptPaymentInfo (Integer id) {
- return R.ok(receiptPaymentService.receiptPaymentInfo(id));
+ public AjaxResult receiptPaymentInfo (Integer id) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentInfo(id));
}
/**
* 鏈湀鍥炴閲戦
*/
@GetMapping("/getReceiptAmount")
- public R<?> getReceiptAmount() {
+ public AjaxResult getReceiptAmount() {
try {
BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
- return R.ok(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
+ return AjaxResult.success(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
} catch (Exception e) {
- return R.fail("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
+ return AjaxResult.error("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
}
}
@@ -106,8 +106,8 @@
* @return
*/
@GetMapping("/bindInvoiceNoRegPage")
- public R<?> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
- return R.ok(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
+ public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
}
@Schema(description = "瀵煎嚭鍥炴鐧昏")
@@ -131,16 +131,16 @@
* @return
*/
@GetMapping("/invoiceInfo")
- public R<?> invoiceInfo (Integer id) {
- return R.ok(receiptPaymentService.invoiceInfo(id));
+ public AjaxResult invoiceInfo (Integer id) {
+ return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
}
/**
* 鏈湀搴旀敹,鍥炴閲戦
*/
@GetMapping("/getAmountMouth")
- public R<?> getAmountMouth() {
- return R.ok(receiptPaymentService.getAmountMouth());
+ public AjaxResult getAmountMouth() {
+ return AjaxResult.success(receiptPaymentService.getAmountMouth());
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index dfca752..ceb3702 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -10,6 +10,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
@@ -66,7 +67,7 @@
@Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/import")
@Operation(summary = "瀵煎叆閿�鍞彴璐�")
- public R<?> importData(@RequestParam("file")
+ public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return salesLedgerService.importData(file);
@@ -182,9 +183,8 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateSalesLedger")
- public R<?> add(@RequestBody SalesLedgerDto salesLedgerDto) {
- salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto);
- return R.ok();
+ public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
+ return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
}
/**
@@ -192,12 +192,11 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedger")
- public R<?> remove(@RequestBody Long[] ids) {
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- salesLedgerService.deleteSalesLedgerByIds(ids);
- return R.ok();
+ return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
}
/**
@@ -207,9 +206,9 @@
* @return
*/
@GetMapping("/listNoPage")
- public R<?> listNoPage(SalesLedgerDto salesLedgerDto) {
+ public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
- return R.ok(list);
+ return AjaxResult.success(list);
}
/**
@@ -217,24 +216,23 @@
*/
@Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedgerFile")
- public R<?> delLedgerFile(@RequestBody Long[] ids) {
+ public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- commonFileService.deleteSalesLedgerByIds(ids);
- return R.ok();
+ return toAjax(commonFileService.deleteSalesLedgerByIds(ids));
}
/**
* 鏈湀閿�鍞悎鍚岄噾棰�
*/
@GetMapping("/getContractAmount")
- public R<?> getContractAmount() {
+ public AjaxResult getContractAmount() {
try {
BigDecimal contractAmount = salesLedgerService.getContractAmount();
- return R.ok(contractAmount != null ? contractAmount : BigDecimal.ZERO);
+ return AjaxResult.success(contractAmount != null ? contractAmount : BigDecimal.ZERO);
} catch (Exception e) {
- return R.fail("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+ return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
}
}
@@ -242,16 +240,16 @@
* 瀹㈡埛鍚堝悓閲戦TOP5缁熻
*/
@GetMapping("/getTopFiveList")
- public R<?> getTopFiveList() {
- return R.ok(salesLedgerService.getTopFiveList());
+ public AjaxResult getTopFiveList() {
+ return AjaxResult.success(salesLedgerService.getTopFiveList());
}
/**
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
- public R<?> getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
- return R.ok(salesLedgerService.getAmountHalfYear(type));
+ public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+ return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index f487aea..9485919 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -7,6 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -45,9 +46,9 @@
* 鍥炴鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPageSalesLedger")
- public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@@ -55,9 +56,9 @@
* 浠樻鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPagePurchaseLedger")
- public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@@ -65,10 +66,10 @@
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public R<?> list(SalesLedgerProduct salesLedgerProduct) {
+ public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if (CollUtil.isEmpty(list)) {
- return R.ok(list);
+ return AjaxResult.success(list);
}
List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
@@ -93,7 +94,7 @@
item.setReturnQuality(returnQuality);
item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
- return R.ok(list);
+ return AjaxResult.success(list);
}
/**
@@ -112,9 +113,9 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public R<?> getInfo(@PathVariable("id") Long id)
+ public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
+ return success(salesLedgerProductService.selectSalesLedgerProductById(id));
}
/**
@@ -122,10 +123,9 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateSalesLedgerProduct")
- public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+ public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
{
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
- return R.ok();
+ return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
}
/**
@@ -133,13 +133,12 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public R<?> remove(@RequestBody Long[] ids)
+ public AjaxResult remove(@RequestBody Long[] ids)
{
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
- return R.ok();
+ return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
}
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index a9d8f75..f9251f8 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,11 +13,11 @@
@RestController
@RequestMapping("/sales/quotation")
@AllArgsConstructor
-public class SalesQuotationController extends BaseController {
+public class SalesQuotationController {
private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
- public R<?> getList(Page page, SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.listPage(page, salesQuotationDto));
+ public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
}
@@ -33,15 +32,15 @@
@PostMapping("/add")
- public R<?> add(@RequestBody SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.add(salesQuotationDto));
+ public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
}
@PostMapping("/update")
- public R<?> update(@RequestBody SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.edit(salesQuotationDto));
+ public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
}
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody Long id) {
- return R.ok(salesQuotationService.delete(id));
+ public AjaxResult delete(@RequestBody Long id) {
+ return AjaxResult.success(salesQuotationService.delete(id));
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
index 0ced35c..5f64f8c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,36 +28,36 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
- public R<?> listPage(Page page, SalespersonManagement salespersonManagement) {
+ public AjaxResult listPage(Page page, SalespersonManagement salespersonManagement) {
IPage<SalespersonManagement> listPage = salespersonManagementService.listPage(page, salespersonManagement);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody SalespersonManagement salespersonManagement) {
+ public AjaxResult add(@RequestBody SalespersonManagement salespersonManagement) {
boolean save = salespersonManagementService.save(salespersonManagement);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "淇敼涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody SalespersonManagement salespersonManagement) {
+ public AjaxResult update(@RequestBody SalespersonManagement salespersonManagement) {
boolean update = salespersonManagementService.updateById(salespersonManagement);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
if (ids == null || ids.isEmpty()) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean delete = salespersonManagementService.removeByIds(ids);
- return delete ? R.ok() : R.fail();
+ return delete ? AjaxResult.success() : AjaxResult.error();
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 9ca9b3a..f707b5b 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
@@ -44,16 +45,16 @@
@GetMapping("/listPage")
@Operation(summary = "鍙戣揣淇℃伅鍒楄〃")
- public R<?> listPage(Page page, ShippingInfo req) {
+ public AjaxResult listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody ShippingInfoDto req) throws Exception {
+ public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
LoginUser loginUser = SecurityUtils.getLoginUser();
String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no");
// 鍙戣揣瀹℃壒
@@ -69,37 +70,37 @@
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
boolean save = shippingInfoService.add(req);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
@PostMapping("/deductStock")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
- public R<?> deductStock(@RequestBody ShippingInfoDto req) throws IOException {
- return shippingInfoService.deductStock( req) ? R.ok() : R.fail();
+ public AjaxResult deductStock(@RequestBody ShippingInfoDto req) throws IOException {
+ return shippingInfoService.deductStock( req) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Operation(summary = "淇敼鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody ShippingInfo req) {
+ public AjaxResult update(@RequestBody ShippingInfo req) {
ShippingInfo byId = shippingInfoService.getById(req.getId());
if (byId == null) {
- return R.fail("鍙戣揣淇℃伅涓嶅瓨鍦�");
+ return AjaxResult.error("鍙戣揣淇℃伅涓嶅瓨鍦�");
}
boolean update = shippingInfoService.updateById(req);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
- return shippingInfoService.delete(ids) ? R.ok("鍒犻櫎鎴愬姛") : R.fail("鍒犻櫎澶辫触");
+ return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
/**
@@ -116,8 +117,8 @@
@GetMapping("/getByCustomerName")
@Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ鍏宠仈鐨勫彂璐у崟鍙�")
- public R<?> getByCustomerName(String customerName) {
- return R.ok(shippingInfoService.getShippingInfoByCustomerName(customerName));
+ public AjaxResult getByCustomerName(String customerName) {
+ return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
@GetMapping("/getDateil/{id}")
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index ecfed4a..539e67c 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.common.enums.SaleEnum;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.LossProductModelDto;
import com.ruoyi.sales.dto.MonthlyAmountDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -50,7 +50,7 @@
IPage<SalesLedgerVo> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto);
- R<?> importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
index 22b9b66..1ff7fa1 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.SalesTrendDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
@@ -32,9 +32,9 @@
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final ShippingInfoMapper shippingInfoMapper;
- public R<?> total() {
+ public AjaxResult total() {
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
- if(CollectionUtils.isEmpty(salesLedgers)) return R.ok(salesLedgers);
+ if(CollectionUtils.isEmpty(salesLedgers)) return AjaxResult.success(salesLedgers);
Map<String, Object> map = new HashMap<>();
// 閿�鍞
map.put("contractAmountTotal", salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -44,16 +44,16 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getType, 1));
map.put("shipRate", "0%");
- if(CollectionUtils.isEmpty(salesLedgerProducts)) return R.ok(map);
+ if(CollectionUtils.isEmpty(salesLedgerProducts)) return AjaxResult.success(map);
// 鍙戣揣鏁伴噺
long count = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>()
.in(ShippingInfo::getSalesLedgerProductId, salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList()))
.eq(ShippingInfo::getStatus,"宸插彂璐�"));
map.put("shipRate", String.format("%.2f", count * 100.0 / salesLedgerProducts.size()) + "%");
- return R.ok(map);
+ return AjaxResult.success(map);
}
- public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
Map<String, Object> map = new HashMap<>();
Calendar calendar = Calendar.getInstance();
@@ -123,6 +123,6 @@
map.put("orderCountList", orderCountList);
map.put("salesAmountList", salesAmountList);
map.put("shippingRateList", shippingRateList);
- return R.ok(map);
+ return AjaxResult.success(map);
}
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 58a0aed..768483f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.sales.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -26,11 +25,10 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.mapper.TempFileMapper;
-import com.ruoyi.production.mapper.ProductionProductInputMapper;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
-import com.ruoyi.production.mapper.ProductionProductOutputMapper;
+import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.production.mapper.*;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
@@ -46,6 +44,7 @@
import com.ruoyi.sales.vo.SalesLedgerVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,10 +55,15 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
@@ -331,29 +335,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R<?> importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
InputStream inputStream = file.getInputStream();
ExcelUtil<SalesLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(SalesLedgerImportDto.class);
Map<String, List<SalesLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閿�鍞彴璐︽暟鎹�", "閿�鍞骇鍝佹暟鎹�"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return R.fail("閿�鍞〃鏍间负绌猴紒");
+ if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閿�鍞〃鏍间负绌猴紒");
// 涓氬姟灞傚悎骞�
List<SalesLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閿�鍞彴璐︽暟鎹�");
- if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return R.fail("閿�鍞彴璐︽暟鎹负绌猴紒");
+ if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閿�鍞彴璐︽暟鎹负绌猴紒");
List<SalesLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閿�鍞骇鍝佹暟鎹�");
- if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return R.fail("閿�鍞骇鍝佹暟鎹负绌猴紒");
- // 瀹㈡埛鏁版嵁 - 鍙傝�� listPage 鏌ヨ绉佹捣瀹㈡埛锛坱ype = 0锛�
- // type = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴�
- Long loginUserId = loginUser.getUser().getUserId();
- List<Customer> customers = customerMapper.selectList(new QueryWrapper<Customer>()
- .in("customer_name", salesLedgerImportDtoList.stream()
- .map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList()))
- .and(wrapper -> wrapper.eq("type", 0)
- .or(wrapper2 -> wrapper2.eq("type", 1).eq("is_assigned", 1)))
- .and(wrapper -> wrapper.eq("usage_user", loginUserId)
- .or(wrapper2 -> wrapper2.eq("create_user", loginUserId)
- .or(wrapper3 -> wrapper3.exists("select 1 from customer_user cu where cu.customer_id = customer.id and cu.user_id = " + loginUserId)))));
+ if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閿�鍞骇鍝佹暟鎹负绌猴紒");
+ // 瀹㈡埛鏁版嵁
+ List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
+ salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
// // 瑙勬牸鍨嬪彿鏁版嵁
// List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
@@ -376,14 +372,16 @@
salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
salesLedger.setDeliveryDate(DateUtils.toLocalDate(salesLedgerImportDto.getDeliveryDate()));
// 閫氳繃瀹㈡埛鍚嶇О鏌ヨ瀹㈡埛ID锛屽鎴峰悎鍚屽彿
- Optional<Customer> customerOptional = customers.stream()
+ salesLedger.setCustomerId(customers.stream()
.filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
- .findFirst();
- if (customerOptional.isEmpty()) {
- throw new RuntimeException("瀹㈡埛:" + salesLedger.getCustomerName() + "涓嶅瓨鍦紒鎴栬�呴潪绉佹捣鐢ㄦ埛");
- }
- salesLedger.setCustomerId(customerOptional.get().getId());
- salesLedger.setCustomerContractNo(customerOptional.get().getTaxpayerIdentificationNumber());
+ .findFirst()
+ .map(Customer::getId)
+ .orElse(null));
+ salesLedger.setCustomerContractNo(customers.stream()
+ .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
+ .findFirst()
+ .map(Customer::getTaxpayerIdentificationNumber)
+ .orElse(null));
Long aLong = sysUsers.stream()
.filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson()))
.findFirst()
@@ -413,16 +411,13 @@
salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
- // 鏍￠獙浜у搧瑙勬牸鏄惁瀛樺湪
- Optional<Map<String, Object>> productModelOptional = list.stream()
+ list.stream()
.filter(map -> Objects.equals(map.get("productName"), salesLedgerProduct.getProductCategory()) && Objects.equals(map.get("model"), salesLedgerProduct.getSpecificationModel()))
- .findFirst();
- if (productModelOptional.isEmpty()) {
- throw new RuntimeException("浜у搧澶х被:" + salesLedgerProduct.getProductCategory() + ",瑙勬牸鍨嬪彿:" + salesLedgerProduct.getSpecificationModel() + "涓嶅瓨鍦紒");
- }
- Map<String, Object> productModelMap = productModelOptional.get();
- salesLedgerProduct.setProductModelId(Long.parseLong(productModelMap.get("modelId").toString()));
- salesLedgerProduct.setProductId(Long.parseLong(productModelMap.get("id").toString()));
+ .findFirst()
+ .ifPresent(map -> {
+ salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
+ salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
+ });
// salesLedgerProduct.setProductId(productList.stream()
// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
// .findFirst()
@@ -444,10 +439,10 @@
}
}
- return R.ok(null, "瀵煎叆鎴愬姛");
+ return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
- return R.fail("瀵煎叆澶辫触锛�" + e.getMessage());
+ return AjaxResult.error("瀵煎叆澶辫触锛�" + e.getMessage());
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
index 3a23ce7..2522550 100644
--- a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
@@ -1,7 +1,6 @@
package com.ruoyi.staff.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.service.AnalyticsService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,23 +10,23 @@
@RestController
@RequestMapping("/staff/analytics")
-public class AnalyticsController extends BaseController {
+public class AnalyticsController {
@Resource
private AnalyticsService analyticsService;
@GetMapping("/reason")
- public R<?> staffLeaveReasonAnalytics() {
- return R.ok(analyticsService.staffLeaveReasonAnalytics());
+ public AjaxResult staffLeaveReasonAnalytics() {
+ return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
}
@GetMapping("/monthly_turnover_rate")
- public R<?> getMonthlyTurnoverRateFor12Months() {
- return R.ok(analyticsService.getMonthlyTurnoverRateFor12Months());
+ public AjaxResult getMonthlyTurnoverRateFor12Months() {
+ return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
}
@GetMapping("/total_statistic")
- public R<?> getTotalStatistic() {
- return R.ok(analyticsService.getTotalStatistic());
+ public AjaxResult getTotalStatistic() {
+ return AjaxResult.success(analyticsService.getTotalStatistic());
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/BankController.java b/src/main/java/com/ruoyi/staff/controller/BankController.java
index 372998e..1e9aa1f 100644
--- a/src/main/java/com/ruoyi/staff/controller/BankController.java
+++ b/src/main/java/com/ruoyi/staff/controller/BankController.java
@@ -2,8 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.Bank;
import com.ruoyi.staff.service.BankService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,37 +25,37 @@
@RestController
@RequestMapping("/bank")
@AllArgsConstructor
-public class BankController extends BaseController {
+public class BankController {
private BankService bankService;
@GetMapping("/list")
- public R<?> list() {
- return R.ok(bankService.list());
+ public AjaxResult list() {
+ return AjaxResult.success(bankService.list());
}
@PostMapping("/add")
@Operation(summary = "鏂板閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody Bank bank) {
- return R.ok(bankService.save(bank));
+ public AjaxResult add(@RequestBody Bank bank) {
+ return AjaxResult.success(bankService.save(bank));
}
@PostMapping("/update")
@Operation(summary = "鏇存柊閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody Bank bank) {
- return R.ok(bankService.updateById(bank));
+ public AjaxResult update(@RequestBody Bank bank) {
+ return AjaxResult.success(bankService.updateById(bank));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- return R.ok(bankService.removeBatchByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return AjaxResult.success(bankService.removeBatchByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 62d430c..6498ef9 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import lombok.AllArgsConstructor;
@@ -11,35 +10,35 @@
@RestController
@RequestMapping("/staff/holidayApplication")
@AllArgsConstructor
-public class HolidayApplicationController extends BaseController {
+public class HolidayApplicationController {
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.listPage(page, holidayApplication));
+ public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
}
/**
* 鏂板璇峰亣鐢宠
*/
@PostMapping("/add")
- public R<?> add(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.save(holidayApplication));
+ public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.save(holidayApplication));
}
/**
* 淇敼璇峰亣鐢宠
*/
@PostMapping("/update")
- public R<?> update(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.updateById(holidayApplication));
+ public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
@DeleteMapping("/delete/{id}")
- public R<?> delete(@PathVariable("id") Long id){
- return R.ok(holidayApplicationService.removeById(id));
+ public AjaxResult delete(@PathVariable("id") Long id){
+ return AjaxResult.success(holidayApplicationService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 95f3105..37902fa 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
@@ -24,26 +23,26 @@
@RestController
@RequestMapping("/personalAttendanceRecords")
@Tag(name = "浜哄憳鎵撳崱绛惧埌")
-public class PersonalAttendanceRecordsController extends BaseController {
+public class PersonalAttendanceRecordsController {
@Resource
private PersonalAttendanceRecordsService personalAttendanceRecordsService;
@Operation(summary = "鏂板鎵撳崱绛惧埌")
@PostMapping("")
- public R<?> add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
+ public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
}
@Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
@GetMapping("/listPage")
- public R<?> listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
+ public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
}
@Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
@GetMapping("/today")
- public R<?> todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return R.ok(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
+ public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
}
@Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index 4abb319..fd97213 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
}
@@ -42,7 +42,7 @@
@Operation(summary = "娣诲姞")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.add(schemeApplicableStaff);
}
@@ -50,7 +50,7 @@
@Operation(summary = "淇敼")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.UPDATE)
- public R<?> updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
}
@@ -58,7 +58,7 @@
@Operation(summary = "鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
return schemeApplicableStaffService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
index 59908ba..17cdaf6 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,7 +15,7 @@
@RestController
@RequestMapping("/staff/staffContract")
@Tag(name = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
-public class StaffContractController extends BaseController {
+public class StaffContractController {
@Resource
private StaffContractService staffContractService;
@@ -29,7 +28,7 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> staffContractListPage(Page page, StaffContract staffContract) {
- return R.ok(staffContractService.staffContractListPage(page, staffContract));
+ public AjaxResult staffContractListPage(Page page, StaffContract staffContract) {
+ return AjaxResult.success(staffContractService.staffContractListPage(page, staffContract));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index 585a249..64a35d9 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -19,7 +18,7 @@
@RestController
@RequestMapping("/staff/staffLeave")
@Tag(name = "鍛樺伐绂昏亴")
-public class StaffLeaveController extends BaseController {
+public class StaffLeaveController {
@Resource
private StaffLeaveService staffLeaveService;
/**
@@ -29,8 +28,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
+ public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
}
/**
@@ -39,8 +38,8 @@
* @return
*/
@PostMapping("")
- public R<?> add(@RequestBody StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.add(staffLeaveDto));
+ public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
}
/**
@@ -50,8 +49,8 @@
* @return
*/
@PutMapping("/{id}")
- public R<?> update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
- return R.ok(staffLeaveService.update(id, staffLeaveDto));
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
+ return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
}
/**
@@ -60,11 +59,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> del(@RequestBody List<Integer> ids) {
+ public AjaxResult del(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(staffLeaveService.del(ids));
+ return AjaxResult.success(staffLeaveService.del(ids));
}
/**
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 2bb6cd7..ab27019 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,8 +4,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
@@ -27,7 +26,7 @@
@RestController
@RequestMapping("/staff/staffOnJob")
@Tag(name = "鍛樺伐鍙拌处")
-public class StaffOnJobController extends BaseController {
+public class StaffOnJobController {
@Resource
private IStaffOnJobService staffOnJobService;
@@ -40,8 +39,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return R.ok(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+ public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
/**
@@ -49,8 +48,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> staffOnJobList(StaffOnJob staffOnJob) {
- return R.ok(staffOnJobService.staffOnJobList(staffOnJob));
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -59,8 +58,8 @@
* @return
*/
@PostMapping("")
- public R<?> add(@RequestBody StaffOnJobDto staffOnJob) {
- return R.ok(staffOnJobService.add(staffOnJob));
+ public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+ return AjaxResult.success(staffOnJobService.add(staffOnJob));
}
/**
@@ -69,8 +68,8 @@
* @return
*/
@PutMapping("/{id}")
- public R<?> update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
- return R.ok(staffOnJobService.update(id, staffOnJobDto));
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
}
/**
@@ -79,11 +78,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delStaffOnJobs(@RequestBody List<Integer> ids) {
+ public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(staffOnJobService.delStaffOnJobs(ids));
+ return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
}
/**
@@ -92,8 +91,8 @@
* @return
*/
@GetMapping("/{id}")
- public R<?> staffOnJobDetail(@PathVariable("id") Long id) {
- return R.ok(staffOnJobService.staffOnJobDetail(id));
+ public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
+ return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
}
/**
@@ -103,8 +102,8 @@
* @return
*/
@PostMapping("/renewContract/{id}")
- public R<?> renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
- return R.ok(staffOnJobService.renewContract(id, staffContract));
+ public AjaxResult renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
+ return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
}
@Operation(summary = "涓嬭浇妯℃澘")
@@ -119,12 +118,12 @@
*/
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
- public R<?> importData(@RequestPart("file") MultipartFile file) {
+ public AjaxResult importData(@RequestPart("file") MultipartFile file) {
Boolean b = staffOnJobService.importData(file);
if (b) {
- return R.ok(null, "瀵煎叆鎴愬姛");
+ return AjaxResult.success("瀵煎叆鎴愬姛");
}
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
/**
@@ -144,8 +143,8 @@
*/
@PostMapping("/exportCopy")
@Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public R<?> exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return R.ok(staffOnJobService.exportCopy(response, staffOnJob));
+ public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+ return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index dfc0d67..569ca1c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
@@ -28,19 +27,19 @@
@RestController
@RequestMapping("/staffSalaryMain")
@AllArgsConstructor
-public class StaffSalaryMainController extends BaseController {
+public class StaffSalaryMainController {
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
@Operation(summary = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.listPage(page, staffSalaryMain);
}
@Operation(summary = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public R<?> calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@@ -48,7 +47,7 @@
@Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.add(staffSalaryMain);
}
@@ -56,7 +55,7 @@
@Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.updateStaffSalaryMain(staffSalaryMain);
}
@@ -64,7 +63,7 @@
@Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
return staffSalaryMainService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
index a49809a..d195e9c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
@@ -5,8 +5,7 @@
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.SaveStaffSchedulingDto;
import com.ruoyi.staff.dto.StaffSchedulingDto;
import com.ruoyi.staff.service.StaffSchedulingService;
@@ -27,39 +26,39 @@
@RestController
@RequestMapping("/staff/staffScheduling")
@RequiredArgsConstructor
-public class StaffSchedulingController extends BaseController {
+public class StaffSchedulingController {
private final StaffSchedulingService staffSchedulingService;
@PostMapping("/listPage")
- public R<?> listPage(@RequestBody SearchSchedulingVo vo){
- return R.ok(staffSchedulingService.listPage(vo));
+ public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
+ return AjaxResult.success(staffSchedulingService.listPage(vo));
}
@PostMapping("/save")
- public R<?> save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
+ public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
- return R.ok();
+ return AjaxResult.success();
}
@DeleteMapping("/delByIds")
- public R<?> delByIds(@RequestBody List<Integer> ids){
+ public AjaxResult delByIds(@RequestBody List<Integer> ids){
staffSchedulingService.removeByIds(ids);
- return R.ok();
+ return AjaxResult.success();
}
@DeleteMapping("/del/{id}")
- public R<?> del(@PathVariable("id") Integer id){
+ public AjaxResult del(@PathVariable("id") Integer id){
staffSchedulingService.removeById(id);
- return R.ok();
+ return AjaxResult.success();
}
/**
* 鑾峰彇褰撳墠鐢ㄦ埛鏈�鏂版帓鐝褰�
*/
@GetMapping("/getCurrentUserLatestScheduling")
- public R<?> getCurrentUserLatestScheduling(){
- return R.ok(staffSchedulingService.getCurrentUserLatestScheduling());
+ public AjaxResult getCurrentUserLatestScheduling(){
+ return AjaxResult.success(staffSchedulingService.getCurrentUserLatestScheduling());
}
@Log(title = "瀵煎嚭浜哄憳鎺掔彮鍒楄〃", businessType = BusinessType.EXPORT)
diff --git a/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
index 9d7e610..da9a2d7 100644
--- a/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
+++ b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
@@ -1,7 +1,7 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,11 +17,11 @@
*/
public interface SchemeApplicableStaffService extends IService<SchemeApplicableStaff> {
- R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);
+ AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);
- R<?> add(SchemeApplicableStaff schemeApplicableStaff);
+ AjaxResult add(SchemeApplicableStaff schemeApplicableStaff);
- R<?> updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);
+ AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
index 2003e68..1794e43 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -1,7 +1,7 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,13 +18,13 @@
*/
public interface StaffSalaryMainService extends IService<StaffSalaryMain> {
- R listPage(Page page, StaffSalaryMain staffSalaryMain);
+ AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain);
- R<?> add(StaffSalaryMain staffSalaryMain);
+ AjaxResult add(StaffSalaryMain staffSalaryMain);
- R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
+ AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
- R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
+ AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index d57a25e..bd61ca3 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.bean.dto.UserAccountDto;
import com.ruoyi.production.bean.dto.UserProductionAccountingDto;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
@@ -52,7 +52,7 @@
@Override
- public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
LambdaQueryWrapper<SchemeApplicableStaff> schemeApplicableStaffLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(schemeApplicableStaff != null){
if(StringUtils.isNotEmpty(schemeApplicableStaff.getTitle())){
@@ -62,7 +62,7 @@
Page<SchemeApplicableStaff> page1 = schemeApplicableStaffMapper.selectPage(page, schemeApplicableStaffLambdaQueryWrapper);
List<Long> collect = page1.getRecords().stream().map(SchemeApplicableStaff::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(collect)){
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
List<SchemeInsuranceDetail> schemeInsuranceDetails = schemeInsuranceDetailMapper
.selectList(new LambdaQueryWrapper<SchemeInsuranceDetail>()
@@ -82,7 +82,7 @@
item.setDeptNames(sysDepts.stream().map(SysDept::getDeptName).collect(Collectors.joining(",")));
}
});
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
public void setSchemeApplicableStaffUserInfo(SchemeApplicableStaff schemeApplicableStaff) {
@@ -103,12 +103,12 @@
}
@Override
- public R<?> add(SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult add(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
if(CollectionUtils.isEmpty(schemeApplicableStaff.getSchemeInsuranceDetailList())){
- return R.fail("璇烽�夋嫨鏂规鏄庣粏");
+ return AjaxResult.error("璇烽�夋嫨鏂规鏄庣粏");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int insert = schemeApplicableStaffMapper.insert(schemeApplicableStaff);
@@ -116,13 +116,13 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return R.ok(insert);
+ return AjaxResult.success(insert);
}
@Override
- public R<?> updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int update = schemeApplicableStaffMapper.updateById(schemeApplicableStaff);
@@ -133,18 +133,18 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return R.ok(update);
+ return AjaxResult.success(update);
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
int delete = schemeApplicableStaffMapper.deleteBatchIds(ids);
schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
.in(SchemeInsuranceDetail::getSchemeId, ids));
- return R.ok(delete);
+ return AjaxResult.success(delete);
}
/**
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 4f1e033..7c11041 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -1,13 +1,12 @@
package com.ruoyi.staff.service.impl;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
import com.ruoyi.project.system.domain.SysDept;
@@ -47,7 +46,7 @@
@RequiredArgsConstructor
@Service
-public class StaffOnJobServiceImpl extends ServiceImpl<StaffOnJobMapper, StaffOnJob> implements IStaffOnJobService {
+public class StaffOnJobServiceImpl extends ServiceImpl<StaffOnJobMapper, StaffOnJob> implements IStaffOnJobService {
private final StaffOnJobMapper staffOnJobMapper;
private final SysDeptMapper sysDeptMapper;
@@ -65,22 +64,22 @@
private final StaffEmergencyContactMapper staffEmergencyContactMapper;
private final StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;
- // 鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
+
+ //鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
@Override
public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return staffOnJobMapper.staffOnJobListPage(page, staffOnJob);
+ return staffOnJobMapper.staffOnJobListPage(page,staffOnJob);
}
- // 鏂板鍏ヨ亴
+ //鏂板鍏ヨ亴
@Override
@Transactional(rollbackFor = Exception.class)
public int add(StaffOnJobDto staffOnJobPrams) {
- String[] ignoreProperties = { "id" };// 鎺掗櫎id灞炴��
+ String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
// 鍒ゆ柇缂栧彿鏄惁瀛樺湪
- List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(
- Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffOnJobPrams.getStaffNo()));
- if (staffOnJobs != null && !staffOnJobs.isEmpty()) {
- throw new BaseException("缂栧彿涓�" + staffOnJobPrams.getStaffNo() + "鐨勫憳宸ュ凡缁忓瓨鍦�,鏃犳硶鏂板!!!");
+ List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffOnJobPrams.getStaffNo()));
+ if (staffOnJobs != null && !staffOnJobs.isEmpty()){
+ throw new BaseException("缂栧彿涓�"+staffOnJobPrams.getStaffNo()+"鐨勫憳宸ュ凡缁忓瓨鍦�,鏃犳硶鏂板!!!");
}
// 鍒涘缓鍏ヨ亴鏁版嵁
@@ -89,23 +88,23 @@
staffOnJobMapper.insert(staffOnJobPrams);
// 鏌ヨ鐢ㄦ埛鏄惁宸茬粡鏂板
SysUser sysUser = sysUserService.selectUserById(staffOnJobPrams.getId());
- if (sysUser == null) {
+ if(sysUser == null){
SysUser sysUser1 = new SysUser();
sysUser1.setUserName(staffOnJobPrams.getStaffNo());
sysUser1.setNickName(staffOnJobPrams.getStaffName());
String s = SecurityUtils.encryptPassword("123456");
sysUser1.setPassword(s);
- if (staffOnJobPrams.getSysPostId() != null) {
- Long[] posts = new Long[] { staffOnJobPrams.getSysPostId().longValue() };
+ if(staffOnJobPrams.getSysPostId() != null){
+ Long[] posts = new Long[]{staffOnJobPrams.getSysPostId().longValue()};
sysUser1.setPostIds(posts);
}
- sysUser1.setRoleIds(new Long[] { staffOnJobPrams.getRoleId() });
- sysUser1.setDeptIds(new Long[] { staffOnJobPrams.getSysDeptId() });
+ sysUser1.setRoleIds(new Long[]{staffOnJobPrams.getRoleId()});
+ sysUser1.setDeptIds(new Long[]{staffOnJobPrams.getSysDeptId()});
sysUser1.setStatus("0");
sysUserService.insertUser(sysUser1);
}
// 缁戝畾瀛愯〃鏁版嵁
- bingingStaffOnJobExtra(staffOnJobPrams.getId(), staffOnJobPrams);
+ bingingStaffOnJobExtra(staffOnJobPrams.getId(),staffOnJobPrams);
// 鍒涘缓鍚堝悓璁板綍
StaffContract staffContract = new StaffContract();
staffContract.setStaffOnJobId(staffOnJobPrams.getId());
@@ -115,32 +114,32 @@
return staffContractMapper.insert(staffContract);
}
- // 鏇存柊鍏ヨ亴淇℃伅
+ //鏇存柊鍏ヨ亴淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
public int update(Long id, StaffOnJobDto staffOnJobParams) {
// 鍒ゆ柇瀵硅薄鏄惁瀛樺湪
StaffOnJob job = staffOnJobMapper.selectById(id);
- if (job == null) {
- throw new BaseException("缂栧彿涓�" + staffOnJobParams.getStaffNo() + "鐨勫憳宸ヤ笉瀛樺湪,鏃犳硶鏇存柊!!!");
+ if (job == null){
+ throw new BaseException("缂栧彿涓�"+staffOnJobParams.getStaffNo()+"鐨勫憳宸ヤ笉瀛樺湪,鏃犳硶鏇存柊!!!");
}
- String[] ignoreProperties = { "id" };// 鎺掗櫎鏇存柊灞炴��
+ String[] ignoreProperties = {"id"};//鎺掗櫎鏇存柊灞炴��
// 鑾峰彇鏈�鏂板悎鍚屾暟鎹紝骞朵笖鏇存柊
StaffContract contract = staffContractMapper.selectOne(Wrappers.<StaffContract>lambdaQuery()
.eq(StaffContract::getStaffOnJobId, id)
.last("limit 1")
.orderByDesc(StaffContract::getId));
- if (contract != null) {
- BeanUtils.copyProperties(staffOnJobParams, contract, ignoreProperties);
+ if (contract != null){
+ BeanUtils.copyProperties(staffOnJobParams,contract,ignoreProperties);
staffContractMapper.updateById(contract);
}
// 鍒犻櫎鎵�鏈夊瓙琛ㄦ暟鎹�
delStaffOnJobExtra(Arrays.asList(id));
// 缁戝畾瀛愯〃鏁版嵁
- bingingStaffOnJobExtra(id, staffOnJobParams);
+ bingingStaffOnJobExtra(id,staffOnJobParams);
// 鏇存柊鍛樺伐鏁版嵁
staffOnJobParams.setContractExpireTime(staffOnJobParams.getContractEndTime());
return staffOnJobMapper.updateById(staffOnJobParams);
@@ -148,27 +147,26 @@
/**
* 缁戝畾鍛樺伐瀛愯〃鏁版嵁
- *
* @param staffOnJobPrams
* @param id
*/
- public void bingingStaffOnJobExtra(Long id, StaffOnJob staffOnJobPrams) {
+ public void bingingStaffOnJobExtra(Long id,StaffOnJob staffOnJobPrams) {
// 鏂板鏁欒偛缁忓巻
- if (CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEducationList())) {
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEducationList())){
staffOnJobPrams.getStaffEducationList().stream()
.filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
.forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());
}
// 鏂板宸ヤ綔缁忓巻
- if (CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())) {
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){
staffOnJobPrams.getStaffWorkExperienceList().stream()
.filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
.forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
staffWorkExperienceServiceImpl.saveBatch(staffOnJobPrams.getStaffWorkExperienceList());
}
// 鏂板绱ф�ヨ仈绯讳汉
- if (CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEmergencyContactList())) {
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEmergencyContactList())){
staffOnJobPrams.getStaffEmergencyContactList().stream()
.filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
.forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
@@ -176,30 +174,27 @@
}
}
+
/**
* 閫氳繃鍛樺伐id鍒犻櫎鏁欒偛缁忓巻锛屽伐浣滅粡鍘嗭紝绱ф�ヨ仈绯讳汉
- *
* @param ids
* @return
*/
public void delStaffOnJobExtra(List<Long> ids) {
// 鍒犻櫎鏁欒偛缁忓巻
- staffEducationService.remove(Wrappers.<StaffEducation>lambdaQuery().in(StaffEducation::getStaffOnJobId, ids));
+ staffEducationService.remove(Wrappers.<StaffEducation>lambdaQuery().in(StaffEducation::getStaffOnJobId,ids));
// 鍒犻櫎宸ヤ綔缁忓巻
- staffWorkExperienceServiceImpl
- .remove(Wrappers.<StaffWorkExperience>lambdaQuery().in(StaffWorkExperience::getStaffOnJobId, ids));
+ staffWorkExperienceServiceImpl.remove(Wrappers.<StaffWorkExperience>lambdaQuery().in(StaffWorkExperience::getStaffOnJobId,ids));
// 鍒犻櫎绱ф�ヨ仈绯讳汉
- staffEmergencyContactServiceImpl
- .remove(Wrappers.<StaffEmergencyContact>lambdaQuery().in(StaffEmergencyContact::getStaffOnJobId, ids));
+ staffEmergencyContactServiceImpl.remove(Wrappers.<StaffEmergencyContact>lambdaQuery().in(StaffEmergencyContact::getStaffOnJobId,ids));
}
- // 鍒犻櫎鍏ヨ亴
+ //鍒犻櫎鍏ヨ亴
@Override
@Transactional(rollbackFor = Exception.class)
public int delStaffOnJobs(List<Integer> ids) {
- List<StaffOnJob> staffOnJobs = staffOnJobMapper
- .selectList(Wrappers.<StaffOnJob>lambdaQuery().in(StaffOnJob::getId, ids));
- if (CollectionUtils.isEmpty(staffOnJobs)) {
+ List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().in(StaffOnJob::getId, ids));
+ if(CollectionUtils.isEmpty(staffOnJobs)){
throw new BaseException("璇ュ憳宸ヤ笉瀛樺湪,鏃犳硶鍒犻櫎!!!");
}
// 鍒犻櫎鍏ヨ亴鏁版嵁
@@ -207,13 +202,11 @@
// 鍒犻櫎绂昏亴鏁版嵁
staffLeaveMapper.delete(Wrappers.<StaffLeave>lambdaQuery().in(StaffLeave::getStaffOnJobId, ids));
// 鍒犻櫎鎵撳崱璁板綍
- personalAttendanceRecordsMapper.delete(
- Wrappers.<PersonalAttendanceRecords>lambdaQuery().in(PersonalAttendanceRecords::getStaffOnJobId, ids));
+ personalAttendanceRecordsMapper.delete(Wrappers.<PersonalAttendanceRecords>lambdaQuery().in(PersonalAttendanceRecords::getStaffOnJobId, ids));
// 鍒犻櫎鐢ㄦ埛鏁版嵁
List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
- .in(SysUser::getUserName,
- staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));
- if (CollectionUtils.isNotEmpty(sysUsers)) {
+ .in(SysUser::getUserName, staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(sysUsers)){
Long[] longs = sysUsers.stream().map(SysUser::getUserId).toArray(Long[]::new);
sysUserService.deleteUserByIds(longs);
}
@@ -221,8 +214,7 @@
delStaffOnJobExtra(ids.stream().map(Integer::longValue).collect(Collectors.toList()));
// 鍒犻櫎鍚堝悓鏁版嵁
- return staffContractMapper
- .delete(Wrappers.<StaffContract>lambdaQuery().in(StaffContract::getStaffOnJobId, ids));
+ return staffContractMapper.delete(Wrappers.<StaffContract>lambdaQuery().in(StaffContract::getStaffOnJobId, ids));
}
// 缁鍚堝悓
@@ -231,7 +223,7 @@
public int renewContract(Long id, StaffContract staffContract) {
// 鍒ゆ柇瀵硅薄鏄惁瀛樺湪
StaffOnJob job = staffOnJobMapper.selectById(id);
- if (job == null) {
+ if (job == null){
throw new BaseException("璇ュ憳宸ヤ笉瀛樺湪,鏃犳硶鏇存柊!!!");
}
@@ -249,10 +241,10 @@
return 0;
}
- // 鍦ㄨ亴鍛樺伐璇︽儏
+ //鍦ㄨ亴鍛樺伐璇︽儏
@Override
public StaffOnJobDto staffOnJobDetail(Long id) {
- StaffOnJob staffOnJob = staffOnJobMapper.selectById(id);
+ StaffOnJob staffOnJob = staffOnJobMapper.selectById(id);
if (staffOnJob == null) {
throw new IllegalArgumentException("璇ュ憳宸ヤ笉瀛樺湪");
}
@@ -272,7 +264,7 @@
.eq(StaffContract::getStaffOnJobId, staffOnJob.getId())
.last("limit 1")
.orderByDesc(StaffContract::getId));
- if (contract != null) {
+ if (contract != null){
staffOnJobDto.setContractTerm(contract.getContractTerm());
staffOnJobDto.setContractStartTime(contract.getContractStartTime());
staffOnJobDto.setContractEndTime(contract.getContractEndTime());
@@ -280,16 +272,14 @@
// 鑾峰彇瀛愯〃鏁版嵁
staffOnJobDto.setStaffEducationList(staffEducationMapper.selectList(Wrappers.<StaffEducation>lambdaQuery()
.eq(StaffEducation::getStaffOnJobId, staffOnJob.getId())));
- staffOnJobDto.setStaffWorkExperienceList(
- staffWorkExperienceMapper.selectList(Wrappers.<StaffWorkExperience>lambdaQuery()
- .eq(StaffWorkExperience::getStaffOnJobId, staffOnJob.getId())));
- staffOnJobDto.setStaffEmergencyContactList(
- staffEmergencyContactMapper.selectList(Wrappers.<StaffEmergencyContact>lambdaQuery()
- .eq(StaffEmergencyContact::getStaffOnJobId, staffOnJob.getId())));
+ staffOnJobDto.setStaffWorkExperienceList(staffWorkExperienceMapper.selectList(Wrappers.<StaffWorkExperience>lambdaQuery()
+ .eq(StaffWorkExperience::getStaffOnJobId, staffOnJob.getId())));
+ staffOnJobDto.setStaffEmergencyContactList(staffEmergencyContactMapper.selectList(Wrappers.<StaffEmergencyContact>lambdaQuery()
+ .eq(StaffEmergencyContact::getStaffOnJobId, staffOnJob.getId())));
return staffOnJobDto;
}
- // 鍦ㄨ亴鍛樺伐瀵煎嚭
+ //鍦ㄨ亴鍛樺伐瀵煎嚭
@Override
public void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob) {
List<StaffOnJobDto> staffOnJobs = staffOnJobMapper.staffOnJobList(staffOnJob);
@@ -308,62 +298,39 @@
try {
ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
List<StaffOnJobExcelDto> staffOnJobs = util.importExcel(file.getInputStream());
- if (CollectionUtils.isEmpty(staffOnJobs)) {
+ if (CollectionUtils.isEmpty(staffOnJobs)){
return false;
}
// 鑾峰彇鎵�鏈夐儴闂ㄦ暟鎹�
- List<SysDept> sysDepts = sysDeptMapper
- .selectList(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, 0));
+ List<SysDept> sysDepts = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, 0));
// 鑾峰彇鎵�鏈夎鑹叉暟鎹�
List<SysRole> sysRoles = sysRoleMapper.selectRoleAll();
staffOnJobs.forEach(staffOnJob -> {
- // 澶勭悊鍚堝悓鏈熼檺鏁版嵁鏍煎紡
- if (staffOnJob.getContractTerm() != null && !staffOnJob.getContractTerm().trim().isEmpty()) {
- String term = staffOnJob.getContractTerm().trim();
- try {
- Integer.parseInt(term);
- } catch (NumberFormatException e) {
- throw new ServiceException("鍛樺伐[" + staffOnJob.getStaffName() + "]鐨勫悎鍚屾湡闄怺"
- + staffOnJob.getContractTerm() + "]鏍煎紡涓嶆纭紝蹇呴』涓虹函鏁板瓧(濡�: 1, 2, 3)");
- }
- }
StaffOnJobDto staffOnJobDto = new StaffOnJobDto();
BeanUtils.copyProperties(staffOnJob, staffOnJobDto);
// 閫氳繃鍚嶇О鑾峰彇閮ㄩ棬id
- Long deptId = sysDepts.stream()
- .filter(dept -> dept.getDeptName() != null
- && dept.getDeptName().equals(staffOnJob.getSysDeptName()))
- .findFirst()
- .map(SysDept::getDeptId)
- .orElse(null);
- if (deptId == null) {
- throw new ServiceException(
- "鍛樺伐[" + staffOnJob.getStaffName() + "]鐨勯儴闂╗" + staffOnJob.getSysDeptName() + "]涓嶅瓨鍦紝璇锋鏌ユ暟鎹�");
- }
- staffOnJobDto.setSysDeptId(deptId);
-
+ staffOnJobDto.setSysDeptId(// ... existing code ...
+ sysDepts.stream()
+ .filter(dept -> dept.getDeptName() != null && dept.getDeptName().equals(staffOnJob.getSysDeptName()))
+ .findFirst()
+ .map(SysDept::getDeptId)
+ .orElse(null)
+ );
// 閫氳繃鍚嶇О鑾峰彇瑙掕壊id
- Long roleId = sysRoles.stream()
- .filter(role -> role.getRoleName() != null
- && role.getRoleName().equals(staffOnJob.getRoleName()))
+ staffOnJobDto.setRoleId(sysRoles.stream()
+ .filter(role -> role.getRoleName() != null && role.getRoleName().equals(staffOnJob.getRoleName()))
.findFirst()
.map(SysRole::getRoleId)
- .orElse(null);
- if (roleId == null) {
- throw new ServiceException(
- "鍛樺伐[" + staffOnJob.getStaffName() + "]鐨勮鑹瞇" + staffOnJob.getRoleName() + "]涓嶅瓨鍦紝璇锋鏌ユ暟鎹�");
- }
- staffOnJobDto.setRoleId(roleId);
- SpringUtils.getAopProxy(this).add(staffOnJobDto);
+ .orElse( null));
+ add(staffOnJobDto);
});
return true;
- } catch (ServiceException | BaseException e) {
- throw e;
} catch (Exception e) {
- log.error("鍛樺伐鍙拌处瀵煎叆澶辫触 : " + e.getMessage());
- throw new ServiceException("瀵煎叆澶辫触: " + e.getMessage());
+ e.printStackTrace();
+ return false;
}
}
+
@Override
public String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception {
@@ -372,7 +339,7 @@
// 璁剧疆妯℃澘鏂囦欢鎵�鍦ㄧ洰褰曪紙缁濆璺緞锛屼緥濡傦細/templates/锛�
cfg.setClassForTemplateLoading(StaffOnJobServiceImpl.class, "/static");
cfg.setDefaultEncoding("UTF-8");
- // 2.瀹氫箟闇�瑕佸～鍏呯殑鍙橀噷
+ //2.瀹氫箟闇�瑕佸～鍏呯殑鍙橀噷
// 鈶� 鏋勯�犲憳宸ヤ俊鎭紙瀹為檯椤圭洰涓彲浠庢暟鎹簱/Excel璇诲彇锛�
WordDateDto staff = new WordDateDto();
BeanUtils.copyProperties(staffOnJob, staff);
@@ -382,7 +349,7 @@
Instant instant = staff.getContractExpireTime().toInstant();
// 涔熷彲浠ユ寚瀹氬叿浣撴椂鍖猴紝渚嬪Asia/Shanghai锛�
- LocalDate localDate = instant.atZone(ZoneId.of("Asia/Shanghai")).toLocalDate(); // 鍚堝悓缁撴潫鏃堕棿
+ LocalDate localDate = instant.atZone(ZoneId.of("Asia/Shanghai")).toLocalDate(); // 鍚堝悓缁撴潫鏃堕棿
LocalDate localDate1 = localDate.minusYears(Integer.parseInt(staff.getContractTerm()));// 鍚堝悓寮�濮嬫椂闂�
// 绛捐鏃ユ湡杞崲lcoaldate
@@ -395,7 +362,7 @@
staff.setQyear(localDate2.getYear() + "");
staff.setQmoth(localDate2.getMonthValue() + "");
staff.setQday(localDate2.getDayOfMonth() + "");
- if (staff.getDateSelect().equals("A")) {
+ if(staff.getDateSelect().equals("A")){
staff.setSyear(localDate1.getYear() + "");
staff.setSmoth(localDate1.getMonthValue() + "");
staff.setSday(localDate1.getDayOfMonth() + "");
@@ -409,7 +376,7 @@
staff.setSeyear(localDate4.getYear() + "");
staff.setSemoth(localDate4.getMonthValue() + "");
staff.setSeday(localDate4.getDayOfMonth() + "");
- } else if (staff.getDateSelect().equals("B")) {
+ }else if (staff.getDateSelect().equals("B")){
staff.setBsyear(localDate1.getYear() + "");
staff.setBsmoth(localDate1.getMonthValue() + "");
@@ -421,27 +388,29 @@
staff.setBseyear(localDate4.getYear() + "");
staff.setBsemoth(localDate4.getMonthValue() + "");
staff.setBseday(localDate4.getDayOfMonth() + "");
- } else if (staff.getDateSelect().equals("C")) {
+ }else if (staff.getDateSelect().equals("C")){
staff.setCsyear(localDate1.getYear() + "");
staff.setCsmoth(localDate1.getMonthValue() + "");
staff.setCsday(localDate1.getDayOfMonth() + "");
}
- Map<String, Object> data = new HashMap<>();
- data.put("item", staff);
- // 3.鍔犺浇XML 妯℃澘
+ Map<String,Object> data = new HashMap<>();
+ data.put("item",staff);
+ //3.鍔犺浇XML 妯℃澘
Template template = cfg.getTemplate("鍔冲姩鍚堝悓涔�.xml");
- // 4.鐢熸垚濉厖鍚庣殑 XML 鍐呭
+ //4.鐢熸垚濉厖鍚庣殑 XML 鍐呭
StringWriter out = new StringWriter();
template.process(data, out);
String filledXml = out.toString();
- // 5.灏哫ML鍐呭鍐欏叆浜や欢骞舵敼涓�.docx 鏍煎紡
+ //5.灏哫ML鍐呭鍐欏叆浜や欢骞舵敼涓�.docx 鏍煎紡
File outputFile = new File(url);
- try (FileOutputStream fos = new FileOutputStream(outputFile);
- OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8)) {
+ try(FileOutputStream fos = new FileOutputStream(outputFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8)) {
osw.write(filledXml);
}
return url;
}
+
+
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index d6eac65..a6d4500 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -7,7 +7,7 @@
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
@@ -48,7 +48,7 @@
private final AccountExpenseMapper accountExpenseMapper;
@Override
- public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
LambdaQueryWrapper<StaffSalaryMain> staffSalaryMainLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(staffSalaryMain != null){
if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryTitle())){
@@ -66,31 +66,31 @@
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
main.setStaffSalaryDetailList(staffSalaryDetailList);
});
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
@Override
- public R<?> add(StaffSalaryMain staffSalaryMain) {
+ public AjaxResult add(StaffSalaryMain staffSalaryMain) {
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- return R.ok(null, "鏂板鎴愬姛");
+ return AjaxResult.success("鏂板鎴愬姛");
}
@Override
- public R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
+ public AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
if(staffSalaryMain == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
-// return R.fail("寰呭鏍镐笉鍙紪杈�");
+// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
// }
staffSalaryMainMapper.updateById(staffSalaryMain);
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(staffSalaryMain.getStaffSalaryDetailList())){
@@ -115,27 +115,27 @@
accountExpense.setInputTime(new Date());
accountExpenseMapper.insert(accountExpense);
}
- return R.ok(null, "淇敼鎴愬姛");
+ return AjaxResult.success("淇敼鎴愬姛");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
staffSalaryMainMapper.deleteBatchIds(ids);
staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().in(StaffSalaryDetail::getMainId, ids));
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
@Override
- public R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto) {
+ public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
if(CollectionUtils.isEmpty(longs)){
- return R.fail("鏃犲憳宸�");
+ return AjaxResult.error("鏃犲憳宸�");
}
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
@@ -151,7 +151,7 @@
schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
mapList.add(id);
}
- return R.ok(mapList);
+ return AjaxResult.success(mapList);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index f26bc5f..1887b27 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,37 +20,37 @@
@Tag(name = "鍏ュ簱")
@RequestMapping("/stockInRecord")
@RequiredArgsConstructor
-public class StockInRecordController extends BaseController {
+public class StockInRecordController {
private final StockInRecordService stockInRecordService;
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱绠＄悊鍒楄〃")
- public R<?> listPage(Page page, StockInRecordDto stockInRecordDto) {
+ public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
IPage<StockInRecordDto> result = stockInRecordService.listPage(page, stockInRecordDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@DeleteMapping("")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockInRecordService.batchDelete(ids));
+ return AjaxResult.success(stockInRecordService.batchDelete(ids));
}
@DeleteMapping("/pending")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎寰呭鎵瑰叆搴�", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎寰呭鎵圭殑鍏ュ簱璁板綍")
- public R<?> deletePending(@RequestBody List<Long> ids) {
+ public AjaxResult deletePending(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockInRecordService.batchDeletePending(ids));
+ return AjaxResult.success(stockInRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockInRecord")
@@ -63,12 +62,12 @@
@PostMapping("/approve")
@Log(title = "鍏ュ簱绠＄悊-瀹℃壒鍏ュ簱", businessType = BusinessType.UPDATE)
@Operation(summary = "鎵归噺瀹℃壒鍏ュ簱璁板綍")
- public R<?> approve(@RequestBody StockInRecordDto approveDto) {
+ public AjaxResult approve(@RequestBody StockInRecordDto approveDto) {
if(CollectionUtils.isEmpty(approveDto.getIds())){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
stockInRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
- return R.ok();
+ return AjaxResult.success();
}
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index c99458b..7351890 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -4,16 +4,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletResponse;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -34,40 +34,40 @@
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@Operation(summary = "鍑哄簱绠＄悊鍒楄〃")
- public R listPage(Page page, StockOutRecordDto stockOutRecordDto) {
+ public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
IPage<StockOutRecordDto> result = stockOutRecordService.listPage(page, stockOutRecordDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@PostMapping("")
@Log(title = "鍑哄簱绠＄悊-鏂板鍑哄簱", businessType = BusinessType.INSERT)
- public R add(@RequestBody StockOutRecordDto stockOutRecordDto) {
- return R.ok(stockOutRecordService.add(stockOutRecordDto));
+ public AjaxResult add(@RequestBody StockOutRecordDto stockOutRecordDto) {
+ return AjaxResult.success(stockOutRecordService.add(stockOutRecordDto));
}
@PutMapping("/{id}")
@Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
- public R update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
- return R.ok(stockOutRecordService.update(id, stockOutRecordDto));
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
+ return AjaxResult.success(stockOutRecordService.update(id, stockOutRecordDto));
}
@DeleteMapping("")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
- public R delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockOutRecordService.batchDelete(ids));
+ return AjaxResult.success(stockOutRecordService.batchDelete(ids));
}
@DeleteMapping("/pending")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎寰呭鎵瑰嚭搴�", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎寰呭鎵圭殑鍑哄簱璁板綍")
- public R deletePending(@RequestBody List<Long> ids) {
+ public AjaxResult deletePending(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockOutRecordService.batchDeletePending(ids));
+ return AjaxResult.success(stockOutRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockOutRecord")
@@ -79,12 +79,12 @@
@PostMapping("/approve")
@Log(title = "鍑哄簱绠＄悊-瀹℃壒鍑哄簱", businessType = BusinessType.UPDATE)
@Operation(summary = "鎵归噺瀹℃壒鍑哄簱璁板綍")
- public R approve(@RequestBody StockOutRecordDto approveDto) {
+ public AjaxResult approve(@RequestBody StockOutRecordDto approveDto) {
if(CollectionUtils.isEmpty(approveDto.getIds())){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
stockOutRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
- return R.ok();
+ return AjaxResult.success();
}
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 10a17e9..bc08eee 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -79,7 +79,4 @@
@Schema(description = "浜у搧id")
private Long productId;
-
- @Schema(description = "鎵规鍙�")
- private String batchNo;
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index 9a6bd9b..851a0e2 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.mapper.sales.AccountInvoiceApplicationMapper;
+import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;
import com.ruoyi.common.enums.ReviewStatusEnum;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
@@ -46,6 +48,8 @@
private final StockOutRecordMapper stockOutRecordMapper;
private final StockInventoryMapper stockInventoryMapper;
private final StockUninventoryMapper stockUninventoryMapper;
+ private final AccountSalesCollectionMapper accountSalesCollectionMapper;
+ private final AccountInvoiceApplicationMapper accountInvoiceApplicationMapper;
@Override
public IPage<StockOutRecordDto> listPage(Page page, StockOutRecordDto stockOutRecordDto) {
@@ -77,6 +81,11 @@
@Override
public int batchDelete(List<Long> ids) {
+ //todo 濡傛灉鍑哄簱涓庡紑绁ㄦ敹娆炬湁鍏宠仈鍒欐棤娉曞垹闄�
+ if (accountSalesCollectionMapper.existsByStockOutRecordId(ids) ||
+ accountInvoiceApplicationMapper.existsByStockOutRecordId(ids)) {
+ throw new BaseException("鍑哄簱璁板綍瀛樺湪寮�绁ㄦ敹娆惧叧鑱旀暟鎹�,鏃犳硶鍒犻櫎!!!");
+ }
for (Long id : ids) {
StockOutRecord stockOutRecord = stockOutRecordMapper.selectById(id);
if (stockOutRecord.getType().equals("0")) {
@@ -97,7 +106,8 @@
stockInRecordDto.setBatchNo(stockInventory.getBatchNo());
stockInventoryMapper.updateAddStockInventory(stockInRecordDto);
}
- }else if (stockOutRecord.getType().equals("1")) {
+ }
+ else if (stockOutRecord.getType().equals("1")) {
LambdaQueryWrapper<StockUninventory> wrapper = new LambdaQueryWrapper<StockUninventory>()
.eq(StockUninventory::getProductModelId, stockOutRecord.getProductModelId());
if (StringUtils.isEmpty(stockOutRecord.getBatchNo())) {
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index 2932068..061a50c 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyOperationParamDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationParamVo;
@@ -19,7 +19,7 @@
@RequestMapping("/technologyOperationParam")
@Tag(name = "宸ュ簭鍙傛暟")
@RequiredArgsConstructor
-public class TechnologyOperationParamController extends BaseController {
+public class TechnologyOperationParamController {
private final TechnologyOperationParamService technologyOperationParamService;
@@ -38,7 +38,7 @@
@DeleteMapping("/batchDelete/{id}")
@Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
- public R<?> batchDelete(@PathVariable("id") Long id) {
- return R.ok(technologyOperationParamService.batchDelete(id));
+ public AjaxResult batchDelete(@PathVariable("id") Long id) {
+ return AjaxResult.success(technologyOperationParamService.batchDelete(id));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index a02f8bd..7b51803 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,30 +23,30 @@
//鏍戠粨鏋�
@GetMapping("/getList")
- public R<?> getList() {
- return R.ok(documentClassificationService.selectDocumentClassificationList());
+ public AjaxResult getList() {
+ return AjaxResult.success(documentClassificationService.selectDocumentClassificationList());
}
@PostMapping("/add")
@Operation(summary = "鏂囨。鍒嗙被-娣诲姞")
@Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody DocumentClassification documentClassification) {
- return R.ok(documentClassificationService.save(documentClassification));
+ public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
+ return AjaxResult.success(documentClassificationService.save(documentClassification));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。鍒嗙被-鏇存柊")
@Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody DocumentClassification documentClassification) {
- return R.ok(documentClassificationService.updateById(documentClassification));
+ public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
+ return AjaxResult.success(documentClassificationService.updateById(documentClassification));
}
@DeleteMapping("/delete")
@Operation(summary = "鏂囨。鍒嗙被鍒犻櫎")
@Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(documentClassificationService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentClassificationService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index cb51df9..2a1c966 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
@@ -30,64 +30,64 @@
@GetMapping("/listPage")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
- return R.ok(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
+ public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
}
@GetMapping("/list")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> list() {
- return R.ok(documentationBorrowManagementService.listAll());
+ public AjaxResult list() {
+ return AjaxResult.success(documentationBorrowManagementService.listAll());
}
@GetMapping("/listPageReturn")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
- return R.ok(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
+ public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
}
@GetMapping("/getByDocumentationId/{id}")
@Operation(summary = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
@Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
- public R<?> getByDocumentationId(@PathVariable Long id) {
- return R.ok(documentationBorrowManagementService.selectByDocumentationId(id));
+ public AjaxResult getByDocumentationId(@PathVariable Long id) {
+ return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- return R.ok(documentationBorrowManagementService.add(documentationBorrowManagement));
+ public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
}
@PutMapping("/revent")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
- public R<?> revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
- return R.ok(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
+ public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- return R.ok(documentationBorrowManagementService.updateById(documentationBorrowManagement));
+ public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
@PutMapping("/reventUpdate")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
- return R.ok(documentationReturnManagementMapper.updateById(documentationReturnManagement));
+ public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
}
@DeleteMapping ("/delete")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(documentationBorrowManagementService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
}
@DeleteMapping ("/reventDelete")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> reventdelete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(documentationBorrowManagementService.reventDeleteByIds(ids));
+ public AjaxResult reventdelete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(ids));
}
@PostMapping("/export")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index 614c62e..427396b 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.service.DocumentationService;
@@ -30,39 +30,39 @@
@GetMapping("/listPage")
@Operation(summary = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, Documentation documentation) {
+ public AjaxResult listPage(Page page, Documentation documentation) {
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@GetMapping("/list")
@Operation(summary = "鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
- public R<?> list() {
+ public AjaxResult list() {
List<DocumentationDto> list = documentationService.listAll();
- return R.ok(list);
+ return AjaxResult.success(list);
}
@PostMapping("/add")
@Operation(summary = "鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody Documentation documentation) {
- return R.ok(documentationService.save(documentation));
+ public AjaxResult add(@RequestBody Documentation documentation) {
+ return AjaxResult.success(documentationService.save(documentation));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody Documentation documentation) {
- return R.ok(documentationService.updateById(documentation));
+ public AjaxResult update(@RequestBody Documentation documentation) {
+ return AjaxResult.success(documentationService.updateById(documentation));
}
@DeleteMapping("/delete")
@Operation(summary = "鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(documentationService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
@@ -74,24 +74,24 @@
@Operation(summary = "鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
- public R<?> getOverviewStatistics() {
+ public AjaxResult getOverviewStatistics() {
Map<String, Object> result = new HashMap<>();
result.put("totalDocsCount", documentationService.getTotalDocsCount());
result.put("categoryNumCount", documentationService.getCategoryNumCount());
result.put("borrowedDocsCount", documentationService.getBorrowedDocsCount());
result.put("monthlyAddedDocsCount", documentationService.getMonthlyAddedDocsCount());
- return R.ok(result);
+ return AjaxResult.success(result);
}
@Operation(summary = "鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
- public R<?> getCategoryDistribution() {
- return R.ok(documentationService.getCategoryDistribution());
+ public AjaxResult getCategoryDistribution() {
+ return AjaxResult.success(documentationService.getCategoryDistribution());
}
@Operation(summary = "鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
- public R<?> getStatusDistribution() {
- return R.ok(documentationService.getStatusDistribution());
+ public AjaxResult getStatusDistribution() {
+ return AjaxResult.success(documentationService.getStatusDistribution());
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 6ec0e54..9c8517e 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.DocumentationFile;
import com.ruoyi.warehouse.service.DocumentationFileService;
import org.springframework.util.CollectionUtils;
@@ -18,7 +17,7 @@
*/
@RestController
@RequestMapping("/documentation/documentationFile")
-public class DocumentationFileController extends BaseController {
+public class DocumentationFileController {
@Resource
@@ -30,8 +29,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody DocumentationFile documentationFile) {
- return R.ok(documentationFileService.save(documentationFile));
+ public AjaxResult add(@RequestBody DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.save(documentationFile));
}
/**
@@ -40,12 +39,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delDocumentationFile(@RequestBody List<Long> ids) {
+ public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(documentationFileService.removeBatchByIds(ids));
+ return AjaxResult.success(documentationFileService.removeBatchByIds(ids));
}
/**
@@ -55,8 +54,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> documentationFileListPage(DocumentationFile documentationFile) {
- return R.ok(documentationFileService.documentationFileListPage( documentationFile));
+ public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index f8b6f96..7d80dd1 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,36 +25,36 @@
@GetMapping("/tree")
@Operation(summary = "浠撳簱-鏌ヨ鏍�")
@Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
- public R<?> listTree() {
- return R.ok(warehouseService.findListTree());
+ public AjaxResult listTree() {
+ return AjaxResult.success(warehouseService.findListTree());
}
@GetMapping("/list")
@Operation(summary = "浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> list(Warehouse warehouse) {
- return R.ok(warehouseService.findList(warehouse));
+ public AjaxResult list(Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.findList(warehouse));
}
@PostMapping("/add")
@Operation(summary = "浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody Warehouse warehouse) {
- return R.ok(warehouseService.save(warehouse));
+ public AjaxResult add(@RequestBody Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.save(warehouse));
}
@PutMapping("/update")
@Operation(summary = "浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody Warehouse warehouse) {
- return R.ok(warehouseService.updateById(warehouse));
+ public AjaxResult update(@RequestBody Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.updateById(warehouse));
}
@DeleteMapping("/delete")
@Operation(summary = "浠撳簱-鍒犻櫎")
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(warehouseService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(warehouseService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 644cea9..5aebb76 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
@@ -25,27 +25,27 @@
@GetMapping("/listById")
@Operation(summary = "鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+ public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
- return R.ok(list);
+ return AjaxResult.success(list);
}
@PostMapping("/add")
@Operation(summary = "鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
- public R<?> add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return R.ok(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
+ public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
@PutMapping("/update")
@Operation(summary = "鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
- public R<?> update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return R.ok(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
+ public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
}
@DeleteMapping("/delete")
@Operation(summary = "鍟嗗搧璐ф灦-鍒犻櫎")
@Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(warehouseGoodsShelvesService.deleteByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(warehouseGoodsShelvesService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index f9a4666..ed3ed06 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
@@ -26,10 +26,10 @@
@GetMapping("/list")
@Operation(summary = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
+ public AjaxResult list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolService.getList(warehouseGoodsShelvesRowcol);
- return R.ok(list);
+ return AjaxResult.success(list);
}
}
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index b22de49..be3933b 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,34 +35,34 @@
@GetMapping("/listPage")
@Log(title = "鐢ㄦ按绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public R<?> listPage(Page page, WaterRecord waterRecord){
+ public AjaxResult listPage(Page page, WaterRecord waterRecord){
IPage<WaterRecord> listPage = waterRecordService.listPage(page, waterRecord);
- return R.ok(listPage);
+ return AjaxResult.success(listPage);
}
@PostMapping("/add")
@Log(title = "鐢ㄦ按绠＄悊-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody WaterRecord waterRecord){
+ public AjaxResult add(@RequestBody WaterRecord waterRecord){
boolean save = waterRecordService.save(waterRecord);
- return save ? R.ok() : R.fail();
+ return save ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@Log(title = "鐢ㄦ按绠＄悊-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody WaterRecord waterRecord){
+ public AjaxResult update(@RequestBody WaterRecord waterRecord){
boolean update = waterRecordService.updateById(waterRecord);
- return update ? R.ok() : R.fail();
+ return update ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/delete")
@Log(title = "鐢ㄦ按绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean delete = waterRecordService.removeBatchByIds(ids);
- return delete ? R.ok() : R.fail();
+ return delete ? AjaxResult.success() : AjaxResult.error();
}
/**
@@ -71,7 +71,7 @@
@Log(title = "瀵煎叆鐢ㄦ按绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
@Operation(summary = "瀵煎叆鐢ㄦ按绠＄悊")
- public R<?> importData(MultipartFile file) throws Exception {
+ public AjaxResult importData(MultipartFile file) throws Exception {
return waterRecordService.importData(file);
}
diff --git a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
index 879610c..775fb25 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import org.springframework.web.multipart.MultipartFile;
@@ -21,5 +21,5 @@
*/
IPage<WaterRecord> listPage(Page page, WaterRecord waterRecord);
- R<?> importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
index b1c32b4..09604bc 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.mapper.WaterRecordMapper;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
@@ -35,18 +34,18 @@
}
@Override
- public R<?> importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
try {
ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
List<WaterRecord> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return R.ok(true);
+ return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
}
}
diff --git a/src/main/resources/mapper/account/AccountStatementMapper.xml b/src/main/resources/mapper/account/AccountStatementMapper.xml
new file mode 100644
index 0000000..331c61b
--- /dev/null
+++ b/src/main/resources/mapper/account/AccountStatementMapper.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.AccountStatementMapper">
+
+ <select id="listPageAccountStatement" resultType="com.ruoyi.account.bean.vo.StatementAccountVo">
+ SELECT lj.*,
+ <choose>
+ <when test="req.accountType == 1">
+ c.customer_name as customerName
+ </when>
+ <when test="req.accountType == 2">
+ s.supplier_name as customerName
+ </when>
+ <otherwise>
+ '' as customerName
+ </otherwise>
+ </choose>
+ FROM account_statement AS lj
+ <!-- 鍔ㄦ�� LEFT JOIN -->
+ <choose>
+ <when test="req.accountType == 1">
+ LEFT JOIN customer AS c
+ ON lj.customer_id = c.id
+ </when>
+ <when test="req.accountType == 2">
+ LEFT JOIN supplier_manage AS s
+ ON lj.customer_id = s.id
+ </when>
+ </choose>
+ WHERE 1=1
+ <if test="req.accountType != null">
+ AND lj.account_type = #{req.accountType}
+ </if>
+ <if test="req.customerId != null">
+ AND lj.customer_id = #{req.customerId}
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND DATE_FORMAT(CONCAT(lj.statement_month, '-01'), '%Y-%m-%d')
+ BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ ORDER BY lj.statement_month DESC
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
new file mode 100644
index 0000000..f1f5c5b
--- /dev/null
+++ b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.purchase.AccountPaymentApplicationMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.purchase.AccountPaymentApplication">
+ <id column="id" property="id" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="stock_in_record_ids" property="stockInRecordIds" />
+ <result column="invoice_application_no" property="invoiceApplicationNo" />
+ <result column="payment_method" property="paymentMethod" />
+ <result column="payment_content" property="paymentContent" />
+ <result column="apply_date" property="applyDate" />
+ <result column="remark" property="remark" />
+ <result column="status" property="status" />
+ <result column="payment_amount" property="paymentAmount" />
+ </resultMap>
+ <select
+ id="listPageAccountPaymentApplication"
+ resultType="com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo">
+ select * from (select apa.*,
+ sm.supplier_name,
+ GROUP_CONCAT(sir.inbound_batches SEPARATOR ',') AS inboundBatches
+ from account_payment_application apa
+ left join supplier_manage sm on apa.supplier_id = sm.id
+ left join stock_in_record sir on FIND_IN_SET(sir.id, apa.stock_in_record_ids) > 0
+ GROUP BY apa.id)A
+ <where>
+ <if test="req.supplierId != null">
+ AND A.supplier_id = #{req.supplierId}
+ </if>
+ <if test="req.invoiceApplicationNo != null and req.invoiceApplicationNo != ''">
+ AND A.invoice_application_no LIKE CONCAT('%',#{req.invoiceApplicationNo},'%')
+ </if>
+ <if test="req.status != null">
+ AND A.status = #{req.status}
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND A.apply_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ </select>
+
+ <select id="getInboundBatchesBySupplier"
+ resultType="com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo">
+ SELECT
+ sir.id,
+ sir.inbound_batches,
+ pl.supplier_name,
+ DATE(sir.create_time) AS inboundDate,
+ p.product_name,
+ pm.model as specification_model,
+ sir.stock_in_num * slp.tax_inclusive_unit_price AS InboundAmount,
+ pl.purchase_contract_number
+ FROM stock_in_record sir
+ -- 10 绫诲瀷鎵嶅叧鑱旇川妫�琛�
+ LEFT JOIN quality_inspect qi ON sir.record_type = 10 AND sir.record_id = qi.id
+ -- 鍔ㄦ�佸叧鑱旈噰璐紙鑷姩閫傞厤 7 鍜� 10锛�
+ LEFT JOIN purchase_ledger pl
+ ON pl.id = IF(sir.record_type = 7, sir.record_id, qi.purchase_ledger_id)
+ -- 浜у搧鍏宠仈涓嶅姩
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
+ LEFT JOIN product_model pm ON sir.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ -- 鏉′欢
+ WHERE sir.approval_status = 1 AND slp.type = 2
+ AND sir.record_type IN ('7','10')
+ and pl.supplier_id=#{supplierId}
+
+ and sir.id NOT IN (
+ SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(a.stock_in_record_ids, ',', n.n), ',', -1)
+ FROM account_payment_application a
+ CROSS JOIN (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL
+ SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+ ) n
+ WHERE n.n <= CHAR_LENGTH(a.stock_in_record_ids) - CHAR_LENGTH(REPLACE(a.stock_in_record_ids, ',', '')) + 1
+ and a.status!=2
+ )
+
+ order by sir.id DESC
+ </select>
+
+ <select id="existsByStockInRecordId" resultType="java.lang.Boolean">
+ SELECT COUNT(*) > 0
+ FROM account_payment_application
+ WHERE
+ <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
+ FIND_IN_SET(#{id}, stock_in_record_ids)
+ </foreach>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/purchase/AccountPurchaseInvoiceMapper.xml b/src/main/resources/mapper/account/purchase/AccountPurchaseInvoiceMapper.xml
new file mode 100644
index 0000000..041f2f7
--- /dev/null
+++ b/src/main/resources/mapper/account/purchase/AccountPurchaseInvoiceMapper.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.purchase.AccountPurchaseInvoiceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.purchase.AccountPurchaseInvoice">
+ <id column="id" property="id" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="invoice_number" property="invoiceNumber" />
+ <result column="tax_rate" property="taxRate" />
+ <result column="invoice_type" property="invoiceType" />
+ <result column="issue_date" property="issueDate" />
+ <result column="tax_exclusivel_price" property="taxExclusivelPrice" />
+ <result column="tax_price" property="taxPrice" />
+ <result column="tax_inclusive_price" property="taxInclusivePrice" />
+ <result column="remark" property="remark" />
+ <result column="invoice_content" property="invoiceContent" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="storage_attachment_id" property="storageAttachmentId" />
+ <result column="stock_in_record_ids" property="stockInRecordIds" />
+ </resultMap>
+ <select id="listPageAccountPurchaseInvoice"
+ resultType="com.ruoyi.account.bean.vo.purchase.AccountPurchaseInvoiceVo">
+ select api.* , sm.supplier_name
+ from account_purchase_invoice api
+ left join supplier_manage sm on api.supplier_id = sm.id
+ <where>
+ <if test="req.supplierId != null">
+ AND api.supplier_id = #{req.supplierId}
+ </if>
+ <if test="req.status != null">
+ AND api.status = #{req.status}
+ </if>
+ <if test="req.invoiceNumber != null and req.invoiceNumber != ''">
+ AND api.invoice_number LIKE CONCAT('%',#{req.invoiceNumber},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND api.issue_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ </select>
+ <select id="getInboundBatchesBySupplier"
+ resultType="com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo">
+ SELECT
+ sir.id,
+ sir.inbound_batches,
+ pl.supplier_name,
+ DATE(sir.create_time) AS inboundDate,
+ p.product_name,
+ pm.model as specification_model,
+ sir.stock_in_num * slp.tax_inclusive_unit_price AS InboundAmount,
+ pl.purchase_contract_number
+ FROM stock_in_record sir
+ -- 10 绫诲瀷鎵嶅叧鑱旇川妫�琛�
+ LEFT JOIN quality_inspect qi ON sir.record_type = 10 AND sir.record_id = qi.id
+ -- 鍔ㄦ�佸叧鑱旈噰璐紙鑷姩閫傞厤 7 鍜� 10锛�
+ LEFT JOIN purchase_ledger pl
+ ON pl.id = IF(sir.record_type = 7, sir.record_id, qi.purchase_ledger_id)
+ -- 浜у搧鍏宠仈涓嶅姩
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
+ LEFT JOIN product_model pm ON sir.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ -- 鏉′欢
+ WHERE sir.approval_status = 1 AND slp.type = 2
+ AND sir.record_type IN ('7','10')
+ and pl.supplier_id=#{supplierId}
+
+ and sir.id NOT IN (
+ SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(a.stock_in_record_ids, ',', n.n), ',', -1)
+ FROM account_purchase_invoice a
+ CROSS JOIN (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL
+ SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+ ) n
+ WHERE n.n <= CHAR_LENGTH(a.stock_in_record_ids) - CHAR_LENGTH(REPLACE(a.stock_in_record_ids, ',', '')) + 1
+ and a.status=0
+ )
+
+ order by sir.id DESC
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
new file mode 100644
index 0000000..3256586
--- /dev/null
+++ b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.purchase.AccountPurchasePayment">
+ <id column="id" property="id" />
+ <result column="account_payment_application_id" property="accountPaymentApplicationId" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="payment_date" property="paymentDate" />
+ <result column="payment_method" property="paymentMethod" />
+ <result column="payment_amount" property="paymentAmount" />
+ <result column="payment_number" property="paymentNumber" />
+ <result column="remark" property="remark" />
+ </resultMap>
+ <select id="listPageAccountPurchasePayment"
+ resultType="com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo">
+ select app.*,
+ sm.supplier_name,
+ sm.bank_account_num,
+ sm.bank_account_name,
+ apa.invoice_application_no AS invoiceApplicationNo
+ from account_purchase_payment app
+ left join supplier_manage sm on app.supplier_id = sm.id
+ left join account_payment_application apa on app.account_payment_application_id=apa.id
+ <where>
+ <if test="req.supplierId != null">
+ AND app.supplier_id = #{req.supplierId}
+ </if>
+ <if test="req.paymentMethod != null and req.paymentMethod != ''">
+ AND app.payment_method LIKE CONCAT('%',#{req.paymentMethod},'%')
+ </if>
+ <if test="req.paymentNumber != null and req.paymentNumber != ''">
+ AND app.payment_number LIKE CONCAT('%',#{req.paymentNumber},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND app.payment_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
new file mode 100644
index 0000000..99b16d2
--- /dev/null
+++ b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.sales.AccountInvoiceApplicationMapper">
+
+ <select id="listPageAccountInvoiceApplication"
+ resultType="com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo">
+ select * from (select aia.*,
+ c.customer_name,
+ GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
+ from account_invoice_application aia
+ left join customer c on aia.customer_id = c.id
+ left join stock_out_record sour on FIND_IN_SET(sour.id, aia.stock_out_record_ids) > 0
+ GROUP BY aia.id)A
+ <where>
+ <if test="req.customerId != null">
+ AND A.customer_id = #{req.customerId}
+ </if>
+ <if test="req.invoiceApplicationNo != null and req.invoiceApplicationNo != ''">
+ AND A.invoice_application_no LIKE CONCAT('%',#{req.invoiceApplicationNo},'%')
+ </if>
+ <if test="req.status != null">
+ AND A.status = #{req.status}
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND A.apply_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ </select>
+ <select id="getOutboundBatchesByCustomer"
+ resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
+ SELECT
+ sor.id,
+ sor.outbound_batches,
+ sl.customer_name,
+ sor.create_time as shippingDate,
+ p.product_name,
+ pm.model as specification_model,
+ slp.tax_rate,
+ sor.stock_out_num * slp.tax_inclusive_unit_price as outboundAmount,
+ s.shipping_no,
+ sl.sales_contract_no
+ FROM stock_out_record sor
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ WHERE sor.record_type='13' and sor.approval_status=1
+ and sl.customer_id=#{customerId}
+
+ and sor.id NOT IN (
+ SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(a.stock_out_record_ids, ',', n.n), ',', -1)
+ FROM account_invoice_application a
+ CROSS JOIN (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL
+ SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+ ) n
+ WHERE n.n <= CHAR_LENGTH(a.stock_out_record_ids) - CHAR_LENGTH(REPLACE(a.stock_out_record_ids, ',', '')) + 1
+ and a.status!=2
+ )
+
+ order by sor.id DESC
+ </select>
+ <select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
+ SELECT COUNT(*) > 0
+ FROM account_invoice_application
+ WHERE
+ <foreach collection="stockOutRecordIds" item="id" open="(" separator=" OR " close=")">
+ FIND_IN_SET(#{id}, stock_out_record_ids)
+ </foreach>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
new file mode 100644
index 0000000..6e0e8d0
--- /dev/null
+++ b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.sales.AccountSalesCollection">
+ <id column="id" property="id" />
+ <result column="stock_out_record_ids" property="stockOutRecordIds" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="customer_id" property="customerId" />
+ <result column="collection_date" property="collectionDate" />
+ <result column="collection_amount" property="collectionAmount" />
+ <result column="collection_method" property="collectionMethod" />
+ <result column="collection_number" property="collectionNumber" />
+ <result column="remark" property="remark" />
+ </resultMap>
+ <select id="listPageAccountSalesCollection"
+ resultType="com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo">
+ select * from (select ascc.*,
+ c.customer_name,
+ GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
+ from account_sales_collection ascc
+ left join customer c on ascc.customer_id = c.id
+ left join stock_out_record sour on FIND_IN_SET(sour.id, ascc.stock_out_record_ids) > 0
+ GROUP BY ascc.id)A
+ <where>
+ <if test="req.customerId != null">
+ AND A.customer_id = #{req.customerId}
+ </if>
+ <if test="req.collectionNumber != null and req.collectionNumber != ''">
+ AND A.collection_number LIKE CONCAT('%',#{req.collectionNumber},'%')
+ </if>
+ <if test="req.collectionMethod != null and req.collectionMethod != ''">
+ AND A.collection_method LIKE CONCAT('%',#{req.collectionMethod},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND A.collection_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+
+ </select>
+ <select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
+ SELECT COUNT(*) > 0
+ FROM account_sales_collection
+ WHERE
+ <foreach collection="stockOutRecordIds" item="id" open="(" separator=" OR " close=")">
+ FIND_IN_SET(#{id}, stock_out_record_ids)
+ </foreach>
+ </select>
+ <select id="getOutboundBatchesByCustomer"
+ resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
+ SELECT
+ sor.id,
+ sor.outbound_batches,
+ sl.customer_name,
+ sor.create_time as shippingDate,
+ p.product_name,
+ pm.model as specification_model,
+ slp.tax_rate,
+ sor.stock_out_num * slp.tax_inclusive_unit_price as outboundAmount,
+ s.shipping_no,
+ sl.sales_contract_no
+ FROM stock_out_record sor
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ WHERE sor.record_type='13' and sor.approval_status=1
+ and sl.customer_id=#{customerId}
+
+ and sor.id NOT IN (
+ SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(a.stock_out_record_ids, ',', n.n), ',', -1)
+ FROM account_sales_collection a
+ CROSS JOIN (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL
+ SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+ ) n
+ WHERE n.n <= CHAR_LENGTH(a.stock_out_record_ids) - CHAR_LENGTH(REPLACE(a.stock_out_record_ids, ',', '')) + 1
+ )
+
+ order by sor.id DESC
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml b/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml
new file mode 100644
index 0000000..b289b8f
--- /dev/null
+++ b/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.sales.AccountSalesInvoiceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.sales.AccountSalesInvoice">
+ <id column="id" property="id" />
+ <result column="account_invoice_application_id" property="accountInvoiceApplicationId" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="invoice_number" property="invoiceNumber" />
+ <result column="tax_rate" property="taxRate" />
+ <result column="invoice_type" property="invoiceType" />
+ <result column="issue_date" property="issueDate" />
+ <result column="tax_exclusivel_price" property="taxExclusivelPrice" />
+ <result column="tax_price" property="taxPrice" />
+ <result column="tax_inclusive_price" property="taxInclusivePrice" />
+ <result column="remark" property="remark" />
+ <result column="invoice_content" property="invoiceContent" />
+ <result column="customer_id" property="customerId" />
+ <result column="storage_attachment_id" property="storageAttachmentId" />
+ </resultMap>
+ <select id="listPageAccountSalesInvoice"
+ resultType="com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo">
+ select asi.* , c.customer_name
+ from account_sales_invoice asi
+ left join customer c on asi.customer_id = c.id
+ <where>
+ <if test="req.customerId != null">
+ AND asi.customer_id = #{req.customerId}
+ </if>
+ <if test="req.status != null">
+ AND asi.status = #{req.status}
+ </if>
+ <if test="req.invoiceNumber != null and req.invoiceNumber != ''">
+ AND asi.invoice_number LIKE CONCAT('%',#{req.invoiceNumber},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND asi.issue_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
index 500846b..e069196 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -74,6 +74,9 @@
<if test="req.customerName != null and req.customerName != ''">
and c.customer_name like concat('%',#{req.customerName},'%')
</if>
+ <if test="req.customerId != null ">
+ and rm.customer_id = #{req.customerId}
+ </if>
<if test="req.startDate != null and req.endDate != null">
AND DATE_FORMAT(rm.make_time, '%Y-%m-%d') BETWEEN #{req.startDate} AND #{req.endDate}
</if>
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 961d783..2f782ff 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -76,6 +76,9 @@
<if test="req.returnNo != null and req.returnNo != ''">
and pro.no like concat('%',#{req.returnNo},'%')
</if>
+ <if test="req.supplierId != null">
+ and pro.supplier_id = #{req.supplierId}
+ </if>
<if test="req.supplierName != null and req.supplierName != ''">
and sm.supplier_name like concat('%',#{req.supplierName},'%')
</if>
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 55e57a3..5545c1e 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -93,7 +93,7 @@
LEFT JOIN purchase_ledger pl
ON pl.id = IF(sir.record_type = 7, sir.record_id, qi.purchase_ledger_id)
-- 浜у搧鍏宠仈涓嶅姩
- LEFT JOIN sales_ledger_product slp ON pl.id = slp.product_id
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
LEFT JOIN product_model pm ON sir.product_model_id = pm.id
LEFT JOIN product p ON pm.product_id = p.id
-- 鏉′欢
@@ -102,6 +102,9 @@
<if test="req.inboundBatches != null and req.inboundBatches != ''">
AND sir.inbound_batches LIKE CONCAT('%',#{req.inboundBatches},'%')
</if>
+ <if test="req.supplierId != null">
+ AND pl.supplier_id = #{req.supplierId}
+ </if>
<if test="req.supplierName != null and req.supplierName != ''">
AND pl.supplier_name LIKE CONCAT('%',#{req.supplierName},'%')
</if>
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 428e8da..c71ce31 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -209,12 +209,6 @@
<if test="ew.topParentProductId != null and ew.topParentProductId > 0">
and combined.product_id in (select id from product_tree)
</if>
- <if test="ew.model != null and ew.model !=''">
- and combined.model like concat('%',#{ew.model},'%')
- </if>
- <if test="ew.batchNo != null and ew.batchNo !=''">
- and combined.batch_no like concat('%',#{ew.batchNo},'%')
- </if>
</where>
group by
product_model_id,
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 202de6b..ad5976f 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -100,6 +100,7 @@
sor.create_time as shippingDate,
p.product_name,
pm.model as specification_model,
+ slp.tax_rate,
sor.stock_out_num * slp.tax_inclusive_unit_price as outboundAmount,
s.shipping_no,
sl.sales_contract_no
@@ -116,6 +117,9 @@
<if test="req.customerName != null and req.customerName != ''">
AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
</if>
+ <if test="req.customerId != null ">
+ AND sl.customer_id = #{req.customerId}
+ </if>
<if test="req.startDate != null and req.endDate != null">
AND s.shipping_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
--
Gitblit v1.9.3