From feffe7f9ff507fae1586c297285b4d50083c1edd Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Thu, 31 Jul 2025 23:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E5=A5=B6=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dairyProducts/controller/NpMilkInOutStoreController.java | 1 - .../dairyProducts/controller/NpSheepMilkAnalysisController.java | 1 - .../com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java | 2 +- .../zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java | 1 - .../module/dairyProducts/mapper/NpMilkInOutStoreMapper.java | 1 - .../module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java | 2 +- .../module/dairyProducts/service/INpMilkInOutStoreService.java | 2 +- .../dairyProducts/service/INpSheepMilkAnalysisService.java | 2 +- .../dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java | 1 - .../service/impl/NpSheepMilkAnalysisServiceImpl.java | 2 +- .../resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml | 2 +- .../mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml | 2 +- 12 files changed, 7 insertions(+), 12 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java index 5016b90..09935a1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java @@ -46,7 +46,6 @@ public class NpMilkInOutStoreController extends BaseController { service.batchInsertFromRows(list); return AjaxResult.success("导入成功"); } - /** 导出 Excel */ @PreAuthorize("@ss.hasPermi('milkInOutStore:export')") @Log(title="导出羊奶出入库", businessType=BusinessType.EXPORT) diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java index cf86004..f000b87 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java @@ -38,7 +38,6 @@ public class NpSheepMilkAnalysisController extends BaseController { public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(npSheepMilkAnalysisService.selectNpSheepMilkAnalysisById(id)); } - /** * 新增奶产量分析记录 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java index 770ace1..b7cf882 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkInOutStore.java @@ -125,4 +125,4 @@ public class NpMilkInOutStore extends BaseEntity { public BigDecimal getReturnYogurt() { return returnYogurt; } public void setReturnYogurt(BigDecimal returnYogurt) { this.returnYogurt = returnYogurt; } -} +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java index f89398c..c1b6bff 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java @@ -1,7 +1,6 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; - public class NpSheepMilkAnalysis { private String sheepId; private String manageEarTag; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java index 783050c..b303256 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkInOutStoreMapper.java @@ -13,7 +13,6 @@ public interface NpMilkInOutStoreMapper { @Param("feedSources") List feedSources, @Param("saleDestinations") List saleDestinations ); - int insertStore(NpMilkInOutStore store); void insertFeedRecord(@Param("storeId") Integer storeId, @Param("source") String source, @Param("amount") java.math.BigDecimal amount); void insertSaleRecord(@Param("storeId") Integer storeId, @Param("destination") String dest, @Param("amount") java.math.BigDecimal amount); diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java index f330707..9d0aca7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java @@ -16,4 +16,4 @@ public interface NpSheepMilkAnalysisMapper { int deleteNpSheepMilkAnalysisById(Long id); int deleteNpSheepMilkAnalysisByIds(Long[] ids); -} +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java index 2c33a6a..6ec70b4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java @@ -12,4 +12,4 @@ public interface INpMilkInOutStoreService { List> getAllColumnOptions(); List> parseImportExcel(MultipartFile file) throws Exception; void batchInsertFromRows(List> rows) throws Exception; -} +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java index 3abb927..419f679 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java @@ -16,4 +16,4 @@ public interface INpSheepMilkAnalysisService { int deleteNpSheepMilkAnalysisById(Long id); int deleteNpSheepMilkAnalysisByIds(Long[] ids); -} +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java index d17a1d6..189c5f4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkInOutStoreServiceImpl.java @@ -32,7 +32,6 @@ public class NpMilkInOutStoreServiceImpl implements INpMilkInOutStoreService { m.put("sale", mapper.selectSaleDestinations()); return Collections.singletonList(m); } - @Override public List> parseImportExcel(MultipartFile file) throws Exception { // 用 Apache POI 解析 Excel 第一行标题，动态映射列名跟 unit cells diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java index 6ced9ad..9bded13 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java @@ -43,4 +43,4 @@ public class NpSheepMilkAnalysisServiceImpl implements INpSheepMilkAnalysisServi public int deleteNpSheepMilkAnalysisByIds(Long[] ids) { return npSheepMilkAnalysisMapper.deleteNpSheepMilkAnalysisByIds(ids); } -} +} \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml index ea5eb4c..8fc6555 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpMilkInOutStoreMapper.xml @@ -55,4 +55,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{amount}) - + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml index 34e4ba2..478eb8e 100644 --- a/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/NpSheepMilkAnalysisMapper.xml @@ -149,4 +149,4 @@ - + \ No newline at end of file