java/zhihuishenqu.git

			@@ -153,8 +153,12 @@
			if(easyPhotoDO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){
			return R.fail("该随手拍已处理");
			}
			if(easyPhotoDO.getIsReport().equals(ComActEasyPhotoDO.isReport.no)){
			return R.fail("该随手拍未上报社区");
			}
			BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
			easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
			easyPhotoDO.setFeedbackAt(new Date());
			//关联随手拍类型
			if(!photoHandleDTO.getEasyTypeIds().isEmpty()){
			List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
			@@ -223,7 +227,17 @@
			*/
			@Override
			public R easyListByAdmin(PageEasyAdminDTO easyAppDTO){
			return R.ok(this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO));
			IPage<ComActEasyPhotoAdminVO> photoAdminVOIPage = this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO);
			if(!photoAdminVOIPage.getRecords().isEmpty()){
			photoAdminVOIPage.getRecords().forEach(photoAdmin -> {
			//随手拍已处理，查询随手拍类型
			List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId());
			if(!photoTypeList.isEmpty()){
			photoAdmin.setPhotoTypeList(photoTypeList);
			}
			});
			}
			return R.ok(photoAdminVOIPage);
			}

			/**
			@@ -293,6 +307,15 @@
			*/
			@Override
			public R easyPublicityByAdmin(ComActEasyPhotoEditAdminDTO photoEditDTO){

			if(photoEditDTO.getType().equals(1)){
			Integer count = this.baseMapper.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
			.eq(ComActEasyPhotoDO::getHandleStatus,ComActEasyPhotoDO.handleStatus.no).in(ComActEasyPhotoDO::getId,photoEditDTO.getIds()));
			if(count > 0){
			return R.fail("您选择的有未处理的随手拍，不可进行操作");
			}
			}

			if(this.baseMapper.easyPublicityByAdmin(photoEditDTO) > 0){
			return R.ok();
			}else{