From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
index 1f66333..1519cb7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
@@ -236,6 +236,9 @@
}
BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
Date nowDate = new Date();
+ if (nonNull(comActWarehouseDonatesDTO.getQuantity())) {
+ comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonatesDTO.getQuantity());
+ }
comActWarehouseDonates.setSigningAt(nowDate);
comActWarehouseDonates.setStatus(2);
int result = this.baseMapper.updateById(comActWarehouseDonates);
@@ -245,8 +248,8 @@
comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy().intValue());
comActWarehouseOperation.setContent("工作人员完成了物品签收");
comActWarehouseOperation.setCreateTime(nowDate);
- comActWarehouseOperationDao.insert(comActWarehouseOperation);
comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
+ comActWarehouseOperationDao.insert(comActWarehouseOperation);
return R.ok();
}
return R.fail("签收失败");
--
Gitblit v1.7.1