java/zhihuishenqu.git

			@@ -275,4 +275,7 @@
			*/
			@ApiModelProperty("描述")
			private String description;

			@ApiModelProperty("社区名字")
			private String communityName;
			}

			@@ -94,8 +94,8 @@
			@PostMapping("/update")
			public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
			ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
			if(comActRaffleRecord1.getStatus().equals(comActRaffleRecordVO.getStatus())){
			return R.fail("不可重复核销");
			if(comActRaffleRecord1.getStatus()!=1){
			return R.fail("核销失败");
			}
			ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
			BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);

			@@ -43,10 +43,11 @@
			</resultMap>

			<select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
			select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName from com_act_social_org t
			select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName,t6.name as communityName from com_act_social_org t
			left join sys_user t1 on t.user_id = t1.user_id
			left join sys_user_role t2 on t.user_id = t2.user_id
			left join com_street t4 on t.street_id = t4.street_id
			left join com_act_t6 on t.community_id = t6.community_id
			left join com_act_column t5 on t.service_type = t5.id
			<where>
			1=1

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史