Merge remote-tracking branch 'origin/master'

huanghongfa

2021-09-15 341bc6775d8ec25b9626da862cfaccfe3f24cc31

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -126,7 +127,7 @@
    private Long evaluateAmount;

    @ApiModelProperty("活动评分星级平均数")
    private Double evaluateLevel;
    private BigDecimal evaluateLevel;

    @ApiModelProperty("当前用户对活动的评分")
    private Integer myRating;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java

@@ -37,7 +37,7 @@
    private Date time;
    @ApiModelProperty("用户昵称")
    private String nickName;
    @ApiModelProperty("选项类型（0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框）")
    @ApiModelProperty("选项类型（0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传）")
    private Integer optionType;

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java

@@ -37,6 +37,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -496,7 +497,11 @@
                        if (sub.getType() != 5) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            headn.add(sub.getContent());
                            if(sub.getType() == 11){
                                headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                            }else{
                                headn.add(sub.getContent());
                            }
                            headList.add(headn);
                        }
                    });
@@ -592,18 +597,14 @@
                if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
                    reserveSubId = 0L;

                    String answer = sb.toString();
                    userData.add(answer.substring(0, answer.length() - 1));
                    sb = new StringBuffer();
                    resultList.add(userData);

                    userData = new ArrayList<>();
                    reserveRecordId = userAnswers.getReserveRecordId();
                    userData.add(userAnswers.getNickName());
                    userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                    answer = sb.toString();
                    if(StringUtils.isEmpty(answer)){
                    if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                        userData.add(userAnswers.getAnswerContent());
                    }else{
                        userData.add(" ");
                    }
                }else{
                    if(reserveSubId.equals(0L)){
@@ -612,23 +613,45 @@

                    if(!reserveSubId.equals(userAnswers.getReserveSubId())){
                        reserveSubId = userAnswers.getReserveSubId();
                        String answer = sb.toString();
                        if(StringUtils.isEmpty(answer)){
                            sb.append(userAnswers.getAnswerContent() + ",");
                            answer = sb.toString();

                        //判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                        sb.append(userAnswers.getAnswerContent() + ",");
                    }else{
                        sb.append(userAnswers.getAnswerContent() + ",");
                        //判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }
                }
            }
            String answer = sb.toString();
            if(StringUtils.isNotEmpty(answer)){
                userData.add(answer.substring(0, answer.length() - 1));
            }
//            String answer = sb.toString();
//            if(StringUtils.isNotEmpty(answer)){
//                userData.add(answer.substring(0, answer.length() - 1));
//            }
            resultList.add(userData);
        }
        return resultList;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -4,6 +4,8 @@
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -177,7 +179,7 @@
        // 结束时间大于当前时间则设置为“进行中”
        Date now = new Date();
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
            comActActivityDO.setStatus(4);
            comActActivityDO.setStatus(3);
        }
        boolean b = this.updateById(comActActivityDO);
        if (b) {
@@ -637,7 +639,7 @@
                //总星级
                int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
                //评分星级=总星级/总评价人数
                vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
                vo.setEvaluateLevel(BigDecimal.valueOf(starNum).divide(BigDecimal.valueOf(comActActEvaluateDOList.size()),2, RoundingMode.HALF_UP));
            }
        });
        return R.ok(iPage);