预约登记修改

101captain

2022-02-19 18ba7a506d4beb7a276275f75032c6c930780b75

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

@@ -47,7 +47,7 @@
                   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;
                }
@@ -99,8 +99,13 @@
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                    }
                                    else {
                                        userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
                                        log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }
                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
@@ -109,6 +114,7 @@
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                e.printStackTrace();
                                log.error("导出转换图片失败！");
                            }
                            continue;
@@ -153,10 +159,16 @@
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    if(userAnswers.getAnswerContent().contains("_compress")){
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                        log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                    }
                                    else {
                                        userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }

                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }