liujie
2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -10,6 +10,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.DesensitizedUtil;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.acid.ComActAcidColorChartsVO;
@@ -150,6 +151,51 @@
        return R.ok(iPage);
    }
    @Override
    public R pageEasyPhotoAdminLC(Long pageNum,Long pageSize) {
        Page page = new Page<>();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoAdminLC(page);
        List<ComActEasyPhotoVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActEasyPhotoVO1 -> {
                Long id = comActEasyPhotoVO1.getId();
                if (comActEasyPhotoVO1.getActivityId() != null
                        && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) {
                    // 查询随手拍活动
                    ComActEasyPhotoActivityDO photoActivityDO =
                            comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
                    if (photoActivityDO != null) {
                        if (comActEasyPhotoVO1.getActivityType() != null) {
                            if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.wu)) {
                                comActEasyPhotoVO1.setActivityMoney(BigDecimal.ZERO);
                            }
                        }
                    }
                }
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }
    /**
     * 随手拍详情
     *
@@ -184,7 +230,8 @@
        // }
        // 查询反馈信息
        List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
        List<ComActEasyPhotoFeedbackVO> photoFeedbackList =
                comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
        if (!photoFeedbackList.isEmpty()) {
            comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList);
        }
@@ -297,7 +344,9 @@
        }
        int insert = comActEasyPhotoDAO.insert(comActEasyPhotoDO);
        if (insert > 0) {
            return R.ok();
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("id",comActEasyPhotoDO.getId());
            return R.ok(jsonObject);
        }
        return R.fail();
    }
@@ -362,6 +411,7 @@
            case 1:
                if (!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)) {
                    return R.fail("该随手拍已处理,不可重复操作");
//                    return R.ok();
                }
                cmActEasyPhotoDO.setStatus(2);// 进行中
                cmActEasyPhotoDO.setIsNeedFeedBack(1);
@@ -1161,7 +1211,10 @@
            }
            chartMap.put(month,map1);
        }
        Map<String, List<StatisticsPhotoVO>> stringListMap = statisticsPhotoVOS1.stream().collect(Collectors.groupingBy(StatisticsPhotoVO::getCountName));
        Map<String, List<StatisticsPhotoVO>> stringListMap = statisticsPhotoVOS1
                .stream()
                .sorted(Comparator.comparing(StatisticsPhotoVO::getStatisticsDate))
                .collect(Collectors.groupingBy(StatisticsPhotoVO::getCountName));
        Map<String,Object> retMap = new HashMap<>();