Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-11-03 c3811d01d1929a98a0f34f70ca187d82ee312dbb

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java

@@ -51,6 +51,7 @@
     * @param comActEasyPhotoAddDTO
     * @return 新增结果
     */
    @Override
    public R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO) {
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoAddDTO, comActEasyPhotoDO);
@@ -67,6 +68,7 @@
     * @param comActEasyPhotoEditDTO
     * @return 维护结果
     */
    @Override
    public R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO) {
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoEditDTO, comActEasyPhotoDO);
@@ -83,6 +85,7 @@
     * @param easyAppDTO
     * @return 维护结果
     */
    @Override
    public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO) {
        Page page = new Page(easyAppDTO.getPageNum(), easyAppDTO.getPageSize());
        if (easyAppDTO.getStatus() != null) {
@@ -97,7 +100,7 @@
                    easyAppDTO.setIsPublicity(1);
                    break;
                case 4:
                    easyAppDTO.setIsPublicity(0);
                    easyAppDTO.setIsPublicity(2);
                    break;
                default:
                    break;
@@ -112,6 +115,7 @@
     * @param ComActEasyPhotoDeleteDTO
     * @return 平台用户信息
     */
    @Override
    public R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO) {
        return R.fail();
    }
@@ -123,6 +127,7 @@
     *            社区活动 》随手拍 id
     * @return 查找结果
     */
    @Override
    public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id) {
        ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoMapper.selectById(id);
        if (comActEasyPhotoDO != null) {
@@ -174,17 +179,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,11 +256,12 @@
            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);
                if(photoAdmin.getClassifyId() != null){
                    List<String> photoTypeList =
                            comActEasyPhotoTypeRelationMapper.getEasyPhotoClassifyName(photoAdmin.getClassifyId());
                    if (!photoTypeList.isEmpty()) {
                        photoAdmin.setPhotoTypeList(photoTypeList);
                    }
                }
            });
        }
@@ -308,6 +314,7 @@
        }
        BeanUtils.copyProperties(photoHandleDTO, easyPhotoDO);
        easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
        easyPhotoDO.setFeedbackAt(new Date());
        // 关联随手拍类型
        if (!photoHandleDTO.getEasyTypeIds().isEmpty()) {
            List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();