Merge branch 'hemenkou_dev' into dev

101captain

2022-02-21 5a278a0965b417e7f39e8c209e2ff401f415066a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java

@@ -44,10 +44,10 @@
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                a++;
                if(answerContentVOList.size()==26&&a==9){
                   userData.add("");
                   userData.add(" ");
                }
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
                if (userAnswers.getOptionType().equals(5)
                        || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
                    continue;
                }
@@ -94,7 +94,13 @@
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    userData.add(new URL(userAnswers.getAnswerContent()));
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
                                else {
                                    userData.add(" ");
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");