diff --git a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java index a229be8..106ee6f 100644 --- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java +++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java @@ -1,5 +1,6 @@ package mjkf.xinke.main.model.db; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -70,13 +71,17 @@ public class SanmingSteel extends Model { row.getCell(0).setCellType(CellType.STRING); row.getCell(1).setCellType(CellType.STRING); row.getCell(2).setCellType(CellType.STRING); + row.getCell(3).setCellType(CellType.NUMERIC); this.setName(row.getCell(1, policy).getStringCellValue()); this.setSpec(row.getCell(2, policy).getStringCellValue()); this.setMaterial(row.getCell(0, policy).getStringCellValue()); this.setPrice(BigDecimal.valueOf(row.getCell(3, policy).getNumericCellValue())); - this.setFluctuating(BigDecimal.valueOf(row.getCell(4, policy).getNumericCellValue())); + //this.setFluctuating(BigDecimal.valueOf(row.getCell(4, policy).getNumericCellValue())); // this.setDate(row.getCell(5, policy).getLocalDateTimeCellValue().toLocalDate()); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 + if (ObjectUtil.isEmpty(this.getMaterial())) { + throw new IllegalArgumentException("材料编码为空"); + } } public SanmingSteel update(SanmingSteel item) { diff --git a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java index 5e10700..a78108b 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -12,8 +12,6 @@ import java.util.Map; public class SanmingSteelService extends DataService, SanmingSteel> { public LambdaQueryWrapper indexQuery(SanmingSteel data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(SanmingSteel::getName, data.getName()); - query.eq(SanmingSteel::getSpec, data.getSpec()); query.eq(SanmingSteel::getMaterial, data.getMaterial()); query.eq(SanmingSteel::getDate, data.getDate()); return query; diff --git a/src/main/resources/_sql/init/mysql/v0.7.sql b/src/main/resources/_sql/init/mysql/v0.7.sql index 03c0e71..6980319 100644 --- a/src/main/resources/_sql/init/mysql/v0.7.sql +++ b/src/main/resources/_sql/init/mysql/v0.7.sql @@ -1,2 +1,4 @@ ALTER TABLE PRICE_RESULT ADD DISPLAY_DIGIT int default 1 comment '显示小数位数'; ALTER TABLE PRICE_PUBLISH ADD DISPLAY_DIGIT int default 1 comment '显示小数位数'; + +DROP INDEX Idx_key ON sanming_steel; \ No newline at end of file diff --git a/src/test/java/mjkf/xinke/UploadFileTest.java b/src/test/java/mjkf/xinke/UploadFileTest.java index 16a24ad..c60ee33 100644 --- a/src/test/java/mjkf/xinke/UploadFileTest.java +++ b/src/test/java/mjkf/xinke/UploadFileTest.java @@ -27,8 +27,8 @@ public class UploadFileTest { @Test public void test() throws Exception { // var filePath = "C:\\Users\\Administrator\\Desktop\\材料管理系统模版\\历史数据\\地材-202405.xlsx"; - var filePath = "C:\\Users\\Administrator\\Documents\\对比材料精简9月.xlsx"; -// var filePath = "C:\\Users\\Administrator\\Documents\\三明钢铁.xlsx"; +// var filePath = "C:\\Users\\Administrator\\Documents\\对比材料精简9月.xlsx"; + var filePath = "D:\\defaultUploadFolder\\defaultBucketName\\2025\\2\\12\\1889631594115809281.xls"; var file = new File(filePath); // var multipartFile = this.mockMultipartFile(file, "相邻城市价格.xlsx", "application/x-zip-compressed"); var multipartFile = this.mockMultipartFile(file); @@ -45,6 +45,7 @@ public class UploadFileTest { * 1810506191866003457 地材-202405.xlsx 1101 * 1871732061747179521 相邻城市.xlsx 600 * 1866412571689631746 三明钢铁.xlsx 301 + * 1889850932131737602 三明钢铁.xlsx 301 */ private MultipartFile mockMultipartFile(File file) throws IOException {