From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 902e421..f0fc51b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -428,14 +428,14 @@
      */
     @Override
     public R listActivitySign(ActivitySignVO activitySignVO) {
-        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
-        if(comActActivityDO!=null){
-            if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
-                IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
-                        .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
-                return R.ok(activitySignVOS);
-            }
-        }
+//        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
+//        if(comActActivityDO!=null){
+//            if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
+//                IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
+//                        .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
+//                return R.ok(activitySignVOS);
+//            }
+//        }
         IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
             .listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
         return R.ok(activitySignVOS);
@@ -645,6 +645,7 @@
                 comActActSignDO.setSignIdentity(signIdentity);
                 comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
                 comActActSignDO.setIsInvite(isInvite);
+                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                 num = comActActSignDAO.updateById(comActActSignDO);
             } else {
                 comActActSignDO = new ComActActSignDO();
@@ -653,6 +654,7 @@
                 comActActSignDO.setSignIdentity(signIdentity);
                 comActActSignDO.setTimes(1);
                 comActActSignDO.setIsInvite(isInvite);
+                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                 num = comActActSignDAO.insert(comActActSignDO);
             }
         } else {
@@ -1111,6 +1113,7 @@
             comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
             comActActRegistDO.setAward(0);
             comActActRegistDO.setPosition(comActActRegistVO.getPosition());
+            comActActRegistDO.setCheckUnitId(comActActSignDO.getCheckUnitId());
             comActActRegistDO.setTimes(signAllCount + 1);
             int result = comActActRegistDAO.insert(comActActRegistDO);
             if (result > 0) {

--
Gitblit v1.7.1