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
@@ -35,7 +35,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/model/dos/ComActActSignDO.java
@@ -58,4 +58,6 @@ */ @TableField(updateStrategy = FieldStrategy.IGNORED) private String reason; private Integer times; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -473,6 +473,9 @@ if (isNull(actActivityDO)) { return R.fail("活动不存在"); } if(actActivityDO.getSignUpBegin().after(new Date())){ return R.fail("未到报名时间"); } int num = 0; ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>() .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId)); @@ -546,12 +549,14 @@ comActActSignDO.setCreateAt(new Date()); comActActSignDO.setReason(null); comActActSignDO.setIsVolunteer(isVolunteer); comActActSignDO.setTimes(comActActSignDO.getTimes()+1); num = comActActSignDAO.updateById(comActActSignDO); } else { comActActSignDO = new ComActActSignDO(); comActActSignDO.setActivityId(activityId); comActActSignDO.setUserId(userId); comActActSignDO.setIsVolunteer(isVolunteer); comActActSignDO.setTimes(1); num = comActActSignDAO.insert(comActActSignDO); } } else { @@ -628,7 +633,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 +650,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); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
@@ -80,7 +80,7 @@ <select id="listActivitySign" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO"> SELECT u.user_id id, u.image_url, u.name, u.nick_name, CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, u.phone, u.tags, a.create_at, a.is_volunteer, a.status , IF(r.times IS NULL, 0, r.times) AS times, u.phone, u.tags, a.create_at, a.is_volunteer, a.status , a.times, a.reason, IF(r.times IS NULL, 0, r.award * r.times) AS award, t.limit FROM com_act_act_sign a JOIN sys_user u ON a.user_id = u.user_id springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -249,6 +249,9 @@ cpo.`name` like concat (#{dto.keyWord},'%') ) </if> <if test="dto.month !=null and dto.month !=''"> and (cpm.create_at >= DATE_FORMAT( CONCAT(#{dto.month},'-00-00'), '%Y-00-00 00:00:00') and DATE_FORMAT( CONCAT(#{dto.month},'-12-31'), '%Y-12-31 23:59:59') >= cpm.create_at) </if> </where> order by cpm.create_at desc </select>
