活动bug修改

101captain

2022-03-11 4bff2b76002f9868abd0db04044136a8255b0b32

活动bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -305,6 +305,7 @@
                    comActActRegistVOS.forEach(activitySignInVO -> {
                        if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                            currentList.add(activitySignInVO);
                            comActActivityVO.setIsComment(1);
                        }
                    });
                    if (currentList.size() > 10) {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java

@@ -34,7 +34,7 @@
    @ExcelProperty(value = "特长", index = 6)
    private String specialtyName;

    @ExcelProperty(value = "双报道单位", index = 7)
    @ExcelProperty(value = "双报到单位", index = 7)
    private String checkUnitName;

    @ExcelProperty(value = "总参与活动次数", index = 8)

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

@@ -628,7 +628,7 @@
                        .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
                        .collect(Collectors.toList());
                comActActivityVO.setSignCount(collect.size());
                comActActivityVO.setIsComment(1);
                comActActivityVO.setIsComment(0);
                ActivitySignVO activitySignVO = collect.get(0);
                Integer activityStatus = comActActivityVO.getStatus();
                if (activityStatus.intValue() == 3) {
@@ -645,6 +645,7 @@
                comActActivityVO.setTimes(activitySignVO.getTimes());
                Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
                comActActivityVO.setAward(totalAward);
                comActActivityVO.setActivitySignVOList(collect);
                comActActivityVOS.add(comActActivityVO);
            });
        }

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

@@ -319,11 +319,10 @@
                break;
            case 8:
                changeType = ComActIntegralUserTradeDO.changeType.reduce;
                if (integralUserDTO.getActivityType() == 1) {
                    ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
                    if (actActivityDO2 != null) {
                        amount = -actActivityDO2.getCancelDeduct();
                        if (isVolunteer.equals(1)) {
                        if (actActivityDO2.getType()==1) {
                            identityType=3;
                            remark.append("取消志愿者活动扣除积分");
                        } else if(actActivityDO2.getType()==3){
@@ -334,7 +333,7 @@
                            identityType=1;
                            remark.append("取消党员活动扣除积分");
                        }
                    }

                }
//                else {
//                    ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);