小程序新增参数

huanghongfa

2021-08-19 5034599c61ec0705c68e348513738ac95745d09d

小程序新增参数

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java

@@ -28,4 +28,10 @@
    private Integer adverPositionApplication;
    @ApiModelProperty("是否显示提醒（1.是 2.否）")
    private Integer isDisplay = 2;
    @ApiModelProperty("提供居民（1.是 2.否 ）")
    private Integer forMasses;
    @ApiModelProperty("提供党员（1.是 2.否 ）")
    private Integer forParty;
    @ApiModelProperty("提供志愿者（1.是 2.否 ）")
    private Integer forVolunteer;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListVo.java

@@ -38,4 +38,13 @@
    @ApiModelProperty("是否封面（1.是 2.否）")
    private Integer isCover;

    @ApiModelProperty("提供居民（1.是 2.否）")
    private Integer forMasses;

    @ApiModelProperty("提供党员（1.是 2.否）")
    private Integer forParty;

    @ApiModelProperty("提供志愿者（1.是 2.否）")
    private Integer forVolunteer;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java

@@ -26,6 +26,9 @@
            " caq.project_key, " +
            " caq.title, " +
            " caq.state, " +
            " caq.for_masses, " +
            " caq.for_party, " +
            " caq.for_volunteer, " +
            " caq.join_count, " +
            " caq.remark, " +
            " caq.is_cover, " +
@@ -96,6 +99,9 @@
            " title, " +
            " remark, " +
            " is_cover, " +
            " for_masses, " +
            " for_party, " +
            " for_volunteer, " +
            " is_force, " +
            " adver_position_popup, " +
            " adver_position_top, " +
@@ -115,6 +121,9 @@
            " id, " +
            " title, " +
            " remark, " +
            " for_masses, " +
            " for_party, " +
            " for_volunteer, " +
            " is_cover, " +
            " is_force, " +
            " adver_position_popup, " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java

@@ -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数据