From 1ac7bbfe4dd915fd85932b854e37816e3e06eb82 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 22 Apr 2025 15:48:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=9C=B0=E6=9D=90?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/model/db/LocalMaterial.java | 11 +++++++++-- .../xinke/main/service/data/LocalMaterialService.java | 6 ++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java index da19326..80da2d7 100644 --- a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java +++ b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java @@ -102,6 +102,10 @@ public class LocalMaterial extends Model { public LocalMaterial (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; row.getCell(0).setCellType(CellType.STRING); + row.getCell(6).setCellType(CellType.NUMERIC); + row.getCell(7).setCellType(CellType.NUMERIC); + row.getCell(8).setCellType(CellType.STRING); + row.getCell(9).setCellType(CellType.STRING); this.setMaterialId(row.getCell(0, policy).getStringCellValue()); this.setCity(row.getCell(1, policy).getStringCellValue()); this.setCounty(row.getCell(2, policy).getStringCellValue()); @@ -109,13 +113,16 @@ public class LocalMaterial extends Model { this.setSpec(row.getCell(4, policy).getStringCellValue().replace(" ", "")); this.setUnit(row.getCell(5, policy).getStringCellValue()); this.setPrice(BigDecimal.valueOf(row.getCell(6, policy).getNumericCellValue())); - this.setPriceWithoutTax(BigDecimal.valueOf(row.getCell(7, policy).getNumericCellValue())); + this.setPriceWithoutTax(BigDecimal.valueOf(row.getCell(7, policy).getNumericCellValue())); this.setPosition(row.getCell(8, policy).getStringCellValue()); - this.setRemark(row.getCell(9, policy).getStringCellValue()); + this.setRemark(row.getCell(9, policy).getStringCellValue()); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 if (this.getMaterialId().isEmpty()) { throw new IllegalArgumentException("材料编码为空"); } + if (ObjectUtil.isEmpty(this.getCounty())) { + throw new IllegalArgumentException("缺少区县"); + } if (ObjectUtil.isEmpty(this.getPrice())) { throw new IllegalArgumentException("缺少价格"); } diff --git a/src/main/java/mjkf/xinke/main/service/data/LocalMaterialService.java b/src/main/java/mjkf/xinke/main/service/data/LocalMaterialService.java index fd735b3..89ee5b4 100644 --- a/src/main/java/mjkf/xinke/main/service/data/LocalMaterialService.java +++ b/src/main/java/mjkf/xinke/main/service/data/LocalMaterialService.java @@ -35,8 +35,7 @@ public class LocalMaterialService extends DataService, public LambdaQueryWrapper indexQuery(LocalMaterial data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(LocalMaterial::getName, data.getName()); - query.eq(LocalMaterial::getSpec, data.getSpec()); + query.eq(LocalMaterial::getMaterialId, data.getMaterialId()); query.eq(LocalMaterial::getCity, data.getCity()); query.eq(LocalMaterial::getCounty, data.getCounty()); query.eq(LocalMaterial::getDate, data.getDate()); @@ -46,8 +45,7 @@ public class LocalMaterialService extends DataService, public LambdaQueryWrapper trendQuery(Object obj, Integer year, Integer month) { var data = (LocalMaterial) obj; LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(LocalMaterial::getName, data.getName()); - query.eq(LocalMaterial::getSpec, data.getSpec()); + query.eq(LocalMaterial::getMaterialId, data.getMaterialId()); query.eq(LocalMaterial::getCounty, data.getCounty()); var date = LocalDate.of(year, month, 1); query.between(LocalMaterial::getDate, date.minusYears(1), date.plusMonths(1));