From 91275344f85d2777be0f276e9d9da3f6f3fa6728 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 20 八月 2021 18:48:44 +0800
Subject: [PATCH] 实有人口和社区关系以及对应标签修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 78e8f17..3e92a2d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -523,7 +523,7 @@
return R.fail("调查问卷不存在！");
}
- if(questnaireDO.getState().equals(ComActQuestnaireDO.state.dyz)){
+ if(!questnaireDO.getState().equals(ComActQuestnaireDO.state.dyz)){
return R.fail("该调查问卷已结束，不可提交！");
}
@@ -533,6 +533,24 @@
return R.fail("您已填写该问卷，不可重复提交");
}
+ //查询填报人员信息
+ R<LoginUserInfoVO> userResult = userService.getUserInfoByUserId(userId + "");
+ if(!R.isOk(userResult)){
+ log.error("填写问卷调查失败，未查询到用户信息");
+ return R.fail("填写失败");
+ }
+ LoginUserInfoVO userInfo = userResult.getData();
+ if(questnaireDO.getForParty().equals(ComActQuestnaireDO.isOk.yes)){
+ if(!userInfo.getIsPartymember().equals(1)){
+ return R.fail("您还未进行党员认证，无法填报");
+ }
+ }
+ if(questnaireDO.getForVolunteer().equals(ComActQuestnaireDO.isOk.yes)){
+ if(!userInfo.getIsVolunteer().equals(1)){
+ return R.fail("您还未进行志愿者认证，无法填报");
+ }
+ }
+
List<ComActQuestnaireAnswerContentDO> answerContentList = new ArrayList<>();
//解析用户上传json数据
--
Gitblit v1.7.1