From 568b782afa3be4b55f617e7330aa1f2c0e54e693 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 27 Jun 2022 09:03:01 +0800
Subject: [PATCH] 地块管理
---
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
index eed9c82..4d20f68 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -32,8 +32,9 @@
/**
* 农事记录控制器
- * @since 2022-05-18
+ *
* @author zhongrj
+ * @since 2022-05-18
*/
@RestController
@AllArgsConstructor
@@ -92,7 +93,7 @@
recovery.setCreateTime(new Date());
//新增
boolean save = recoveryService.save(recovery);
- if (save){
+ if (save) {
//同时生成农事记录和库存记录
FarmingRecord record = new FarmingRecord();
record.setCreateTime(new Date());
@@ -103,7 +104,7 @@
record.setLandId(recovery.getLandId());
record.setOperator(recovery.getOperator());
Strain strain = strainService.getById(recovery.getStrainId());
- record.setRemarks("品种: "+strain.getStrainName() +", 重量："+recovery.getWeight());
+ record.setContent("品种: " + strain.getStrainName() + ", 重量：" + recovery.getWeight());
//新增
farmingRecordService.save(record);
@@ -113,7 +114,7 @@
stock.setFarmPlantId(recovery.getFarmPlantId());
stock.setStrainId(recovery.getStrainId());
FarmProductStock stock1 = farmProductStockService.getOne(new QueryWrapper<>(stock));
- if (null!=stock1) {
+ if (null != stock1) {
//更新库存
//计算库存
double old = Double.parseDouble(stock1.getWeight());
@@ -122,7 +123,7 @@
stock1.setWeight(String.valueOf(addNum));
//更新
farmProductStockService.updateById(stock1);
- }else {
+ } else {
//新增库存
FarmProductStock productStock = new FarmProductStock();
productStock.setCreateTime(new Date());
@@ -142,11 +143,12 @@
/**
* double 相加
+ *
* @param d1
* @param d2
* @return
*/
- private double add(double d1, double d2){
+ private double add(double d1, double d2) {
// 进行加法运算
BigDecimal b1 = new BigDecimal(d1);
BigDecimal b2 = new BigDecimal(d2);
@@ -185,4 +187,24 @@
return R.status(recoveryService.removeByIds(Func.toLongList(ids)));
}
+
+ /**
+ * 小程序采收详情列表自定义分页
+ */
+ @GetMapping("/pagec")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入recovery")
+ public R<IPage<RecoveryVO>> pagec(RecoveryVO recovery, Query query) {
+ IPage<RecoveryVO> pages = recoveryService.selectRecoveryPage(Condition.getPage(query), recovery);
+ for (int i = 0; i < pages.getRecords().size(); i++) {
+ String jobWay = pages.getRecords().get(i).getJobWay();
+ if (jobWay.equals("0")) {
+ pages.getRecords().get(i).setLx("人工");
+ } else {
+ pages.getRecords().get(i).setLx("机械");
+ }
+
+ }
+ return R.data(pages);
+ }
}
--
Gitblit v1.9.3