From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块
---
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index b6484b2..6c0b34f 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -33,6 +33,7 @@
import org.springblade.modules.process.service.IProcessService;
import org.springblade.modules.processInv.entity.ProcessInv;
import org.springblade.modules.processInv.service.IProcessInvService;
+import org.springblade.modules.processInv.vo.ProcessInvVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -157,6 +158,8 @@
processInv.setUpdateUser(sale.getCreateUser());
processInv.setUpdateTime(new Date());
processInv.setId(Long.parseLong(sale.getProid()));
+ ProcessInvVO processInvVO = processInvService.getLand(processInv);
+ sale.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
return R.status(saleService.saveOrUpdate(sale));
@@ -202,8 +205,8 @@
* 按行政区统计市场流通
*/
@GetMapping("/selectMarketDistrict")
- public R selectMarketDistrict(String farmId) {
- return R.data(saleService.selectMarketDistrict(farmId));
+ public R selectMarketDistrict(String farmId,String startTime,String endTime) {
+ return R.data(saleService.selectMarketDistrict(farmId,startTime,endTime));
}
}
--
Gitblit v1.9.3