From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed:新增便民服务商家 报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index d0ad472..80cd0a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -49,6 +49,7 @@
     @Resource
     private ComPbMemberDAO comPbMemberDAO;
 
+
     /**
      * 查询某个党员加入的所有党员活动
      *
@@ -158,6 +159,12 @@
         partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
         partyBuildingActivityVO.setIsPerson(isPerson);
         partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());
+
+        //查询社区名称
+        if(partyBuildingActivityVO.getCommunityId() != null){
+            partyBuildingActivityVO.setCommunityName(comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
+        }
+
         return R.ok(partyBuildingActivityVO);
     }
 
@@ -171,7 +178,13 @@
     public R addactivity(PartyBuildingActivityVO partyBuildingActivityVO) {
         ComPbActivityDO comPbActivityDO = new ComPbActivityDO();
         BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO);
-        comPbActivityDO.setCreateAt(new Date());
+        Date now = new Date();
+        comPbActivityDO.setEnrollTimeBegin(now);
+        comPbActivityDO.setCreateAt(now);
+
+        //默认设置为“进行中”
+        comPbActivityDO.setStatus(4);
+
         int insert = comBpActivityDAO.insert(comPbActivityDO);
         if (insert > 0) {
             return R.ok();

--
Gitblit v1.7.1