diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrderFillData.java b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrderFillData.java index 6f1cc33..1ffe4ad 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrderFillData.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrderFillData.java @@ -18,4 +18,6 @@ public class WorkOrderFillData { private Double materialPrice; private Double price; + + private Integer no; } diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java index 24ac9e6..6977ee5 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java @@ -572,19 +572,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workOrderRepairMaterialList = workOrderRepairMaterialService.list(Wrappers.lambdaQuery(WorkOrderRepairMaterial.class).eq(WorkOrderRepairMaterial::getOrderId, workOrder.getId())); List workOrderFillDataList = new ArrayList<>(); - WorkOrderFillData workOrderFillData = new WorkOrderFillData(); + int no = 0; for (WorkOrderRepairMaterial workOrderRepairMaterial : workOrderRepairMaterialList) { + WorkOrderFillData workOrderFillData = new WorkOrderFillData(); + workOrderFillData.setNo(++no); workOrderFillData.setMaterialName(workOrderRepairMaterial.getMaterialName()); workOrderFillData.setMaterialCount(workOrderRepairMaterial.getMaterialCount()); workOrderFillData.setMaterialPrice(workOrderRepairMaterial.getMaterialPrice()); double price = workOrderRepairMaterial.getMaterialPrice() / workOrderRepairMaterial.getMaterialCount(); workOrderFillData.setPrice(price); workOrderFillDataList.add(workOrderFillData); - total += price; } ImageExcelData imageExcelData = new ImageExcelData(); imageExcelData.setUrl(new URL(workOrder.getSignatureUrl())); @@ -668,24 +669,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workOrderList, HttpServletResponse response) throws IOException { - for (WorkOrder workOrder : workOrderList) { //数据获取 String templateFileName = "WorkOrderServiceSheet.xlsx"; InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("excel" + "/" + templateFileName); - double total = 0.0; + double total = workOrder.getTotalPrice(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); List workOrderRepairMaterialList = workOrderRepairMaterialService.list(Wrappers.lambdaQuery(WorkOrderRepairMaterial.class).eq(WorkOrderRepairMaterial::getOrderId, workOrder.getId())); List workOrderFillDataList = new ArrayList<>(); - WorkOrderFillData workOrderFillData = new WorkOrderFillData(); + int no = 0; for (WorkOrderRepairMaterial workOrderRepairMaterial : workOrderRepairMaterialList) { + WorkOrderFillData workOrderFillData = new WorkOrderFillData(); + workOrderFillData.setNo(++no); workOrderFillData.setMaterialName(workOrderRepairMaterial.getMaterialName()); workOrderFillData.setMaterialCount(workOrderRepairMaterial.getMaterialCount()); workOrderFillData.setMaterialPrice(workOrderRepairMaterial.getMaterialPrice()); double price = workOrderRepairMaterial.getMaterialPrice() / workOrderRepairMaterial.getMaterialCount(); workOrderFillData.setPrice(price); workOrderFillDataList.add(workOrderFillData); - total += price; } ImageExcelData imageExcelData = new ImageExcelData(); imageExcelData.setUrl(new URL(workOrder.getSignatureUrl())); diff --git a/src/main/resources/excel/WorkOrderServiceSheet.xlsx b/src/main/resources/excel/WorkOrderServiceSheet.xlsx index 0f15501..100d6a7 100644 Binary files a/src/main/resources/excel/WorkOrderServiceSheet.xlsx and b/src/main/resources/excel/WorkOrderServiceSheet.xlsx differ