java/zhihuishenqu.git

			@@ -1,6 +1,7 @@
			package com.panzhihua.common.service.community;

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			@@ -23,8 +24,12 @@
			import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
			import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
			import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
			import com.panzhihua.common.model.vos.community.social.*;
			import io.swagger.annotations.ApiOperation;
			import com.panzhihua.common.model.vos.community.*;
			import org.springframework.beans.BeanUtils;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.web.bind.annotation.DeleteMapping;
			@@ -1090,7 +1095,7 @@
			* @return 活动列表
			*/
			@PostMapping("listactivity")
			R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
			R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

			/**
			* 用户确认心愿
			@@ -7697,6 +7702,15 @@
			@PostMapping("/screen/index/questionnaireList")
			R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

			@PostMapping("/screen/hmk/baseInfo")
			R hmkBaseInfo(@RequestBody CommonPage commonPage);

			@GetMapping("/screen/hmk/partyProjectActivityLine")
			R partyProjectActivityLine();

			@PostMapping("/screen/hmk/projectActivityTop")
			R projectActivityProject(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			@@ -7705,6 +7719,16 @@
			*/
			@GetMapping("/comActSocialOrg/{id}")
			R comActSocialOrgSelectOne(@PathVariable("id") Long id);


			/**
			* 通过userId查询
			*
			* @param userId 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialOrg/selectByUserId")
			R selectOneByUserId(@RequestParam("userId") Long userId);

			/**
			* 分页查询所有数据
			@@ -7734,6 +7758,15 @@
			public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);

			/**
			* 批量新增数据
			*
			* @param comActSocialMember 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectMember/batch")
			public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);

			/**
			* 修改数据
			*
			* @param comActSocialMember 实体对象
			@@ -7756,7 +7789,7 @@
			* @param comActSocialWorkerAddDTO
			* @return 新增结果
			*/
			@PostMapping("/comactsocialworker/add")
			@PostMapping("/comActSocialWorker/add")
			R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

			/**
			@@ -7764,7 +7797,7 @@
			* @param comActSocialWorkerEditDTO
			* @return 维护结果
			*/
			@PostMapping("/comactsocialworker/edit")
			@PostMapping("/comActSocialWorker/edit")
			R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

			/**
			@@ -7772,7 +7805,7 @@
			* @param pageComActSocialWorkerDTO
			* @return 维护结果
			*/
			@PostMapping("/comactsocialworker/page")
			@PostMapping("/comActSocialWorker/page")
			R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>

			/**
			@@ -7780,7 +7813,7 @@
			* @param comActSocialWorkerDeleteDTO
			* @return 平台用户信息
			*/
			@PostMapping("/comactsocialworker/delete")
			@PostMapping("/comActSocialWorker/delete")
			R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);

			/**
			@@ -7788,7 +7821,7 @@
			* @param id 社工 id
			* @return 查找结果
			*/
			@PostMapping("/comactsocialworker/{id}")
			@PostMapping("/comActSocialWorker/{id}")
			R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

			/**
			@@ -7796,6 +7829,324 @@
			*
			* @param list 社工集合
			*/
			@PostMapping("/comactsocialworker/input")
			@PostMapping("/comActSocialWorker/input")
			R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);

			/**
			*活动查询社工列表
			* @param commonPage
			* @return
			*/
			@PostMapping("/comActSocialWorker/activity")
			R activity(@RequestBody CommonPage commonPage);

			/**
			* 社工查询活动
			* @param commonPage
			* @return
			*/
			@PostMapping("/comActSocialWorker/activityList")
			R activityList(@RequestBody CommonPage commonPage);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialWorkerService/queryAll")
			R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialWorkerService/{id}")
			R selectOneComActSocialWorkerService(@PathVariable("id") Long id);

			/**
			* 修改数据
			*
			* @param comActSocialWorkerServiceVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialWorkerService/update")
			R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProject/queryAll")
			R selectAllComActSocialProject(@RequestBody CommonPage commonPage);

			/**
			* 平台详情接口
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProject/{id}")
			R selectOneComActSocialProject(@PathVariable("id") Long id);

			/**
			* 根据项目id分页获取关联项目
			*/
			@PostMapping("/comActSocialProject/getRelation")
			R getRelationComActSocialProject(@RequestBody CommonPage commonPage);

			/**
			* 新增数据
			*
			* @param socialProjectVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProject")
			R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
			/**
			* 修改数据
			*
			* @param socialProjectVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProject/update")
			R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProject/del")
			R deleteComActSocialProject(@RequestParam("id") Long id);
			/**
			* 小程序详情接口
			* @param id
			* @return
			*/
			@GetMapping("/comActSocialProject/getApplet")
			R getAppletComActSocialProject(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectMember/queryAll")
			public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectMember/{id}")
			public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActSocialProjectMemberVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectMember")
			public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectMemberVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectMember/update")
			public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectMember/del")
			public R deleteComActSocialProjectMember(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectPublicity/queryAll")
			public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
			public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);


			/**
			* 新增数据
			*
			* @param comActSocialProjectPublicityVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectPublicity")
			public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectPublicityVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectPublicity/update")
			public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectPublicity/del")
			public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
			/**
			* 多条删除数据
			*
			* @param ids 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectPublicity/delBatch")
			public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);

			/**
			* 根据projectId查询所有进度
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectSchedule/queryAll")
			public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectSchedule/{id}")
			public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActSocialProjectScheduleVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectSchedule")
			public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectScheduleVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectSchedule/update")
			public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectSchedule/del")
			public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);

			/**
			* 项目分类级联
			* @param comActColumnVO
			* @return
			*/
			@PostMapping("/comActColumn/queryLevel")
			public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);

			@PostMapping("/comActRaffle/queryAll")
			R selectAllComActRaffle(@RequestBody CommonPage commonPage);

			@GetMapping("/comActRaffle/detail")
			R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);

			@PostMapping("/comActRaffle")
			R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

			@PostMapping("/comActRaffle/update")
			R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

			@GetMapping("/comActRaffle/del")
			R deleteComActRaffle(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActRaffleRecord/queryAll")
			R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage);

			@GetMapping("/comActRaffleRecord/queryPrize")
			R queryPrize(@RequestParam("id")Long id);

			/**
			* 生成二维码
			* @param qrCodeVO
			* @return
			*/
			@PostMapping("/comActRaffleRecord/getQRCode")
			R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);

			/**
			* 修改数据
			*
			* @param comActRaffleRecordVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActRaffleRecord/update")
			R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

			@PostMapping("/comActRaffleRecord")
			R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActRaffleRecord/{id}")
			R selectOneRaffleRecord(@PathVariable("id") Long id);
			/**
			* 导出
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActRaffleRecord/export")
			R exportComActRaffleRecord(@RequestBody CommonPage commonPage);

			@GetMapping("/activity/partyMemberCount")
			R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
			}