From 112095c875972c98a9aa22fa1bcfa3d71ee82788 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 23 八月 2024 11:26:18 +0800
Subject: [PATCH] 花城 修改获取我的活动因为staus状态为空报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java
index 0d087b0..175a92b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java
@@ -3,15 +3,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.service_community.entity.ComActAcidCheckRecord;
+import com.panzhihua.service_community.entity.ComActAcidDangerMember;
import com.panzhihua.service_community.service.ComActAcidCheckRecordService;
+import com.panzhihua.service_community.service.ComActAcidDangerMemberService;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -30,16 +37,18 @@
*/
@Resource
private ComActAcidCheckRecordService comActAcidCheckRecordService;
+ @Resource
+ private ComActAcidDangerMemberService comActAcidDangerMemberService;
/**
- * 分页查询所有数据
+ * 列表查询
*
- * @param commonPage 查询实体
+ * @param comActAcidCheckRecordDTO 查询实体
* @return 所有数据
*/
@PostMapping("queryAll")
- public R selectAll(@RequestBody CommonPage commonPage) {
- return this.comActAcidCheckRecordService.pageList(commonPage);
+ public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
+ return this.comActAcidCheckRecordService.pageList(comActAcidCheckRecordDTO);
}
/**
@@ -49,29 +58,40 @@
* @return 单条数据
*/
@GetMapping("{id}")
- public R selectOne(@PathVariable("id") Serializable id) {
+ public R selectOne(@PathVariable("id") Long id) {
return R.ok(this.comActAcidCheckRecordService.getById(id));
}
/**
* 新增数据
*
- * @param comActAcidCheckRecord 实体对象
+ * @param comActAcidCheckRecordVO 实体对象
* @return 新增结果
*/
@PostMapping
- public R insert(@RequestBody ComActAcidCheckRecord comActAcidCheckRecord) {
+ public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ ComActAcidCheckRecord comActAcidCheckRecord=new ComActAcidCheckRecord();
+ BeanUtils.copyProperties(comActAcidCheckRecordVO,comActAcidCheckRecord);
+ comActAcidCheckRecord.setCreateTime(new Date());
+ ComActAcidDangerMember dangerMember = new ComActAcidDangerMember();
+ dangerMember.setId(comActAcidCheckRecordVO.getMemberId());
+ dangerMember.setStatus(comActAcidCheckRecordVO.getStatus());
+ dangerMember.setUpdateTime(new Date());
+ comActAcidDangerMemberService.updateById(dangerMember);
return R.ok(this.comActAcidCheckRecordService.save(comActAcidCheckRecord));
}
/**
* 修改数据
*
- * @param comActAcidCheckRecord 实体对象
+ * @param comActAcidCheckRecordVO 实体对象
* @return 修改结果
*/
@PostMapping("/update")
- public R update(@RequestBody ComActAcidCheckRecord comActAcidCheckRecord) {
+ public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ ComActAcidCheckRecord comActAcidCheckRecord=new ComActAcidCheckRecord();
+ BeanUtils.copyProperties(comActAcidCheckRecordVO,comActAcidCheckRecord);
+ this.comActAcidCheckRecordService.saveRecordBeforeUpdate(comActAcidCheckRecord);
return R.ok(this.comActAcidCheckRecordService.updateById(comActAcidCheckRecord));
}
--
Gitblit v1.7.1