java/zhihuishenqu.git

			@@ -324,6 +324,7 @@
			if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
			comActActivityVO.setIsComment(0);
			}
			comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
			});
			}
			return R.ok(collect);

			@@ -95,7 +95,7 @@
			public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
			ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
			if(comActRaffleRecord1.getStatus()!=1){
			return R.ok("核销失败");
			return R.fail("核销失败");
			}
			ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
			BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);

			@@ -80,7 +80,7 @@
			<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>
			left join (select count(t.id) as socialCount,activity_id from com_act_act_regist t LEFT JOIN sys_user t1 on t.user_id = t1.user_id LEFT JOIN com_act_social_worker t2 on t1.phone = t2.telephone where t2.id is not null GROUP BY t.activity_id) so on a.id = so.activity_id
			</if>
			WHERE a.`status` != 1 AND a.community_id=#{comActActivityVO.communityId}
			WHERE a.community_id=#{comActActivityVO.communityId}
			<if test='comActActivityVO.type != null'>
			AND a.type = #{comActActivityVO.type}
			</if>
			@@ -242,7 +242,7 @@

			<select id="selectActivityStatics" resultType="com.panzhihua.common.model.vos.community.PartyActivityStatics">
			select (select count(*) from com_act_activity where type = 3 and community_id = #{communityId}) activityCount,
			(select count(*) from com_pb_member where community_id = #{communityId} ) memberCount
			(select count(*) from com_pb_member where community_id = #{communityId} and audit_result=1 ) memberCount
			</select>

			<select id="selectActivityChart" resultType="com.panzhihua.common.model.vos.community.PartyActivityTypeChart">

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史