springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java
@@ -72,4 +72,7 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date feedbackAt; @ApiModelProperty("随手拍类型id") private Long classifyId; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java
@@ -151,4 +151,10 @@ R r = partyBuildingService.timedTaskPartyBuildingActivityAll(); return r; } @ApiOperation(value = "修复数据") @GetMapping("repair/noToken") public R repairDate(){ return communityService.timedTaskHouseJobHandler(); } } springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java
@@ -52,7 +52,7 @@ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId()); // pagePublicityEventDTO.setCommunityId(loginUserInfoVO.getCommunityId()); pagePublicityEventDTO.setRevokeType(2); // pagePublicityEventDTO.setRevokeType(2); return gridService.queryPublicityCommunity(pagePublicityEventDTO); }
@@ -308,7 +308,7 @@ String[] personPhones = comSwRotaExcelVO.getPersonPhone().split("、"); String[] personNames = comSwRotaExcelVO.getPersonName().split("、"); List<String> personIds = new ArrayList<>(); for (int i = 0; i < leaderPhones.length; i++) { for (int i = 0; i < personPhones.length; i++) { String id = comSwRotaDAO.getTeamIdsByTeamPhone(personPhones[i]); if (StringUtils.isEmpty(id)) { return R.fail(personNames[i] + "为非社区团队人员或该人员电话未维护！"); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java
@@ -10,6 +10,8 @@ import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO; import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO; import java.util.List; /** * DAO * @@ -30,4 +32,10 @@ IPage<ComActEasyPhotoTypeVO> findByPage(Page page, @Param("pageComActEasyPhotoTypeDTO") PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO); /** * 查询所有随手拍类型 * @return 随手拍类型 */ List<ComActEasyPhotoTypeDO> getPhotoClassifyList(); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeRelationMapper.java
@@ -28,4 +28,11 @@ */ List<String> getEasyPhotoTypeRelationByEasyId(@Param("easyId") Long easyId); /** * 根据随手拍分类id查询随手拍类型名字 * @param classifyId 随手拍类型id * @return 随手拍类型名字 */ List<String> getEasyPhotoClassifyName(@Param("classifyId") Long classifyId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -174,17 +174,17 @@ easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes); easyPhotoDO.setFeedbackAt(new Date()); // 关联随手拍类型 if (!photoHandleDTO.getEasyTypeIds().isEmpty()) { List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>(); photoHandleDTO.getEasyTypeIds().forEach(typeId -> { ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO(); typeRelationDO.setEasyId(easyPhotoDO.getId()); typeRelationDO.setEasyTypeId(typeId); typeRelationDO.setCreateAt(new Date()); typeRelationDOList.add(typeRelationDO); }); comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList); } // if (!photoHandleDTO.getEasyTypeIds().isEmpty()) { // List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>(); // photoHandleDTO.getEasyTypeIds().forEach(typeId -> { // ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO(); // typeRelationDO.setEasyId(easyPhotoDO.getId()); // typeRelationDO.setEasyTypeId(typeId); // typeRelationDO.setCreateAt(new Date()); // typeRelationDOList.add(typeRelationDO); // }); // comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList); // } if (this.baseMapper.updateById(easyPhotoDO) > 0) { return R.ok(); } else { @@ -251,12 +251,13 @@ this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(), easyAppDTO.getPageSize()), easyAppDTO); if (!photoAdminVOIPage.getRecords().isEmpty()) { photoAdminVOIPage.getRecords().forEach(photoAdmin -> { // 随手拍已处理，查询随手拍类型 if(photoAdmin.getClassifyId() != null){ List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId()); comActEasyPhotoTypeRelationMapper.getEasyPhotoClassifyName(photoAdmin.getId()); if (!photoTypeList.isEmpty()) { photoAdmin.setPhotoTypeList(photoTypeList); } } }); } return R.ok(photoAdminVOIPage); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java
@@ -42,6 +42,7 @@ * @param comActEasyPhotoTypeAddDTO * @return 新增结果 */ @Override public R add(ComActEasyPhotoTypeAddDTO comActEasyPhotoTypeAddDTO) { ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO(); BeanUtils.copyProperties(comActEasyPhotoTypeAddDTO, comActEasyPhotoTypeDO); @@ -58,6 +59,7 @@ * @param comActEasyPhotoTypeEditDTO * @return 维护结果 */ @Override public R edit(ComActEasyPhotoTypeEditDTO comActEasyPhotoTypeEditDTO) { ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO(); BeanUtils.copyProperties(comActEasyPhotoTypeEditDTO, comActEasyPhotoTypeDO); @@ -74,6 +76,7 @@ * @param pageComActEasyPhotoTypeDTO * @return 维护结果 */ @Override public R<IPage<ComActEasyPhotoTypeVO>> query(PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO) { Page page = new Page(1, 10); if (pageComActEasyPhotoTypeDTO.getPageNum() != null) { @@ -91,6 +94,7 @@ * @param ComActEasyPhotoTypeDeleteDTO * @return 平台用户信息 */ @Override public R delete(ComActEasyPhotoTypeDeleteDTO ComActEasyPhotoTypeDeleteDTO) { return R.fail(); } @@ -102,6 +106,7 @@ * 随手拍类型 id * @return 查找结果 */ @Override public R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id) { ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = comActEasyPhotoTypeMapper.selectById(id); if (comActEasyPhotoTypeDO != null) { @@ -119,7 +124,7 @@ */ @Override public R typeList() { return R.ok(this.baseMapper.selectList(null)); return R.ok(this.baseMapper.getPhotoClassifyList()); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml
@@ -107,19 +107,19 @@ <select id="easyListByAdmin" parameterType="com.panzhihua.common.model.dtos.grid.PageEasyAdminDTO" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoAdminVO"> SELECT DISTINCT SELECT caep.id, caep.detail, su.nick_name as userNickName, caep.create_at, caep.is_report, caep.is_publicity, caep.classify_id, caep.handle_status FROM com_act_easy_photo AS caep LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id LEFT JOIN com_act_easy_photo_type_relation AS caeptr ON caeptr.easy_id = caep.id LEFT JOIN com_act_easy_photo_type AS caept ON caept.id = caeptr.easy_type_id LEFT JOIN com_act_easy_photo_classify AS caepc ON caepc.id = caep.classify_id LEFT JOIN sys_user AS su1 ON su1.user_id = caep.handler_id LEFT JOIN com_act AS ca ON ca.community_id = caep.community_id <where> @@ -140,10 +140,10 @@ AND caep.handle_status = #{easyAppDTO.handleStatus} </if> <if test="easyAppDTO.easyPhotoTypeId!=null"> AND caept.id = #{easyAppDTO.easyPhotoTypeId} AND caep.classify_id = #{easyAppDTO.easyPhotoTypeId} </if> <if test="easyAppDTO.keyWord != null and easyAppDTO.keyWord != """> AND (caept.`name` LIKE concat (#{easyAppDTO.keyWord},'%') or AND (caepc.`name` LIKE concat (#{easyAppDTO.keyWord},'%') or caep.detail LIKE concat (#{easyAppDTO.keyWord},'%') or su.nick_name LIKE concat (#{easyAppDTO.keyWord},'%') or caep.happen_addr LIKE concat (#{easyAppDTO.keyWord},'%') or springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml
@@ -40,4 +40,8 @@ </if> </select> <select id="getPhotoClassifyList" resultType="com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO"> select id,`name` from com_act_easy_photo_classify where `status` = 1 </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeRelationMapper.xml
@@ -31,5 +31,9 @@ ORDER BY caeptr.create_at desc </select> <select id="getEasyPhotoClassifyName" resultType="string"> select `name` from com_act_easy_photo_classify where id = #{classifyId} </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
@@ -165,7 +165,7 @@ SELECT IFNULL( count( e.id ), 0 ) AS todoNums FROM EVENT e `event` e WHERE e.event_category = 1 AND event_status = 2 @@ -184,7 +184,7 @@ SELECT IFNULL( count( e.id ), 0 ) AS todoNums FROM EVENT e `event` e WHERE e.event_category = 1 AND event_status = 2 @@ -203,7 +203,7 @@ SELECT IFNULL( count( e.id ), 0 ) AS todoNums FROM EVENT e `event` e WHERE e.event_category = 1 AND event_status = 2 @@ -222,7 +222,7 @@ SELECT IFNULL( count( e.id ), 0 ) AS todoNums FROM EVENT e `event` e WHERE e.event_category = 1 AND event_status = 2 @@ -241,7 +241,7 @@ SELECT IFNULL( count( e.id ), 0 ) AS todoNums FROM EVENT e `event` e WHERE e.event_category = 1 AND event_status = 2
