From f7c16d24f7cb0d2b9e03ec24bfdbb72a11def5f9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 13 十月 2021 13:08:46 +0800
Subject: [PATCH] 爱心义仓修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java | 19 +++------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml | 8 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java | 7 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java | 4 +-
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java | 33 +++++++++-------
6 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java
index 7a62f41..08350ff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java
@@ -53,7 +53,6 @@
@ApiModelProperty("匿名捐赠（1.是 2.否）")
@NotNull(groups = {AddGroup.class}, message = "是否匿名捐赠不能为空")
- @Length(groups = {AddGroup.class}, min = 1, max = 2, message = "匿名捐赠值只能为1or2")
private Integer isAnonymous;
@ApiModelProperty("留言信息")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
index 64c287e..0b0b900 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
@@ -49,11 +49,11 @@
private String message;
@ApiModelProperty("物品登记时间/捐赠时间")
- @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date registerAt;
@ApiModelProperty("物品签收时间")
- @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signingAt;
@ApiModelProperty("捐赠状态（1.待签收 2.已签收 3.已取消）")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java
index 18803ef..3416970 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java
@@ -8,18 +8,6 @@
import javax.annotation.Resource;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.fastjson.JSONArray;
-import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
-import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
-import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
-import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseDonatesVO;
-import com.panzhihua.common.model.vos.community.warehouse.DonatesStatisticsVO;
-import com.panzhihua.common.model.vos.community.warehouse.ExportDonatesVO;
-import com.panzhihua.common.utlis.SFTPUtil;
-import com.panzhihua.common.validated.AddGroup;
-import com.panzhihua.common.validated.PutGroup;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,11 +19,24 @@
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.WarehouseDonatesExcelListen;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseDonatesVO;
+import com.panzhihua.common.model.vos.community.warehouse.DonatesStatisticsVO;
+import com.panzhihua.common.model.vos.community.warehouse.ExportDonatesVO;
import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -159,15 +160,17 @@
@ApiOperation(value = "新增物品捐赠")
@PostMapping("/add")
public R addDonates(@RequestBody @Validated(AddGroup.class) ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
- comActWarehouseDonatesDTO.setCommunityId(getCommunityId());
- comActWarehouseDonatesDTO.setRegisterBy(getUserId());
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ comActWarehouseDonatesDTO.setCommunityId(loginUserInfo.getCommunityId());
+ comActWarehouseDonatesDTO.setRegisterBy(loginUserInfo.getUserId());
+ comActWarehouseDonatesDTO.setSigningBy(loginUserInfo.getUserId());
return communityService.addDonates(comActWarehouseDonatesDTO);
}
@ApiOperation(value = "查看物品捐赠详情", response = ComActWarehouseDonatesVO.class)
@GetMapping("/get")
public R getDonates(@RequestParam("donatesId") Long donatesId) {
- return communityService.getDonates(donatesId, null, null);
+ return communityService.getDonates(donatesId, 0, 0L);
}
@ApiOperation(value = "捐赠物品签收")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java
index c5237d9..f4ce77e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java
@@ -34,4 +34,11 @@
* @return
*/
IPage<ComActWarehouseOperationVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 获取捐赠物品相关操作记录
+ * @param donatesId
+ * @return
+ */
+ List<ComActWarehouseOperationVO> selectList(@Param("donatesId") Long donatesId);
}
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 9afbc4b..2bbd841 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
@@ -35,6 +35,7 @@
import com.panzhihua.service_community.service.ComActWarehouseDonatesService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
/**
* 爱心义仓/物品捐赠表(ComActWarehouseDonates)表服务实现类
@@ -60,6 +61,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R batchImportWarehouseDonates(List<WarehouseDonatesExcelVO> list) {
try {
if (!list.isEmpty()) {
@@ -143,6 +145,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R addDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
ComActWarehouseDonates comActWarehouseDonates = new ComActWarehouseDonates();
BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
@@ -184,7 +187,7 @@
if (isNull(comActWarehouseDonatesVO)) {
return R.fail("捐赠物品记录不存在");
}
- if (nonNull(isWhich)) {
+ if (nonNull(isWhich) && isWhich.intValue() != 0) {
if (isWhich.intValue() == 3) {
String name = comActWarehouseDonatesVO.getName();
if (comActWarehouseDonatesVO.getIsAnonymous().equals(ComActWarehouseDonatesVO.isAnonymous.yes) || isBlank(name)) {
@@ -197,17 +200,8 @@
if (isWhich.intValue() == 1 && !userId.equals(comActWarehouseDonatesVO.getUserId())) {
return R.fail("无法获取他人捐赠记录");
}
- List<ComActWarehouseOperation> operationDOList = comActWarehouseOperationDao.selectList(new QueryWrapper<ComActWarehouseOperation>()
- .lambda().eq(ComActWarehouseOperation::getGoodsId, donatesId));
- List<ComActWarehouseOperationVO> operationVOList = new ArrayList<>();
- if (!operationDOList.isEmpty()) {
- operationDOList.forEach(operation -> {
- ComActWarehouseOperationVO operationVO = new ComActWarehouseOperationVO();
- BeanUtils.copyProperties(operation, operationVO);
- operationVOList.add(operationVO);
- });
- }
- comActWarehouseDonatesVO.setOperationList(operationVOList);
+ List<ComActWarehouseOperationVO> operationList = comActWarehouseOperationDao.selectList(donatesId);
+ comActWarehouseDonatesVO.setOperationList(operationList);
}
return R.ok(comActWarehouseDonatesVO);
}
@@ -218,6 +212,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R signingDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
ComActWarehouseDonates comActWarehouseDonates = this.baseMapper.selectById(comActWarehouseDonatesDTO.getId());
if (isNull(comActWarehouseDonates)) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
index f1285db..6cedb4a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml
@@ -25,5 +25,13 @@
</where>
order by t.create_time desc
</select>
+ <select id="selectList"
+ resultType="com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseOperationVO">
+ SELECT t.*,t1.image,t1.item,t1.`name` AS donateName,t2.actual_time,t2.apply_name,t2.reason,t1.is_anonymous
+ FROM com_act_warehouse_operation t
+ LEFT JOIN com_act_warehouse_donates t1 ON t.goods_id =t1.id
+ LEFT JOIN com_act_warehouse_apply t2 ON t.apply_id = t2.id
+ WHERE t.goods_id = #{donatesId}
+ </select>
</mapper>
--
Gitblit v1.7.1