101captain
2022-06-14 1bbed03bbad8d580f96b49507f54ae02e9c5cd8a
bug修改
2个文件已修改
43 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
@@ -111,14 +111,14 @@
    @ExcelProperty(value = "48小时内核酸检测")
    private String acidTest;
    @ExcelProperty("健康码截图")
    private URL colorImage;
    @ExcelProperty("行程码截图")
    private URL travelImage;
    @ExcelProperty("48小时核酸截图")
    private URL acidImage;
//    @ExcelProperty("健康码截图")
//    private URL colorImage;
//
//    @ExcelProperty("行程码截图")
//    private URL travelImage;
//
//    @ExcelProperty("48小时核酸截图")
//    private URL acidImage;
//    @ExcelProperty("疫苗接种截图")
//    private URL vaccinationImage;
@@ -134,7 +134,4 @@
    @ExcelProperty("是否冷链、运输、海口等特殊行业从业者")
    private String isSpecialJob;
    @ExcelProperty("户籍地")
    private String registerResidence;
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -164,7 +164,7 @@
                            File image=new File(sourceFile+"/"+li.getName()+"行程码.jpg");
                            FileUtils.copyURLToFile(new URL(li.getTravelImage()),image);
                            //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
                            comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage()));
                            //comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage()));
                            //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
                        } catch (Exception e) {
                            e.printStackTrace();
@@ -175,23 +175,23 @@
                            File image=new File(sourceFile+"/"+li.getName()+"健康码.jpg");
                            FileUtils.copyURLToFile(new URL(li.getColorImage()),image);
                            //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
                            comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
                            //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }
                    if(StringUtils.isNotEmpty(li.getAcidImage())){
                        try {
                            File image=new File(sourceFile+"/"+li.getName()+"核酸截图.jpg");
                            FileUtils.copyURLToFile(new URL(li.getAcidImage()),image);
                            comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
                            //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
                            //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }
//                    if(StringUtils.isNotEmpty(li.getAcidImage())){
//                        try {
//                            File image=new File(sourceFile+"/"+li.getName()+"核酸截图.jpg");
//                            FileUtils.copyURLToFile(new URL(li.getAcidImage()),image);
//                            comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
//                            //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
//                            //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
//                        } catch (Exception e) {
//                            e.printStackTrace();
//                        }
//                    }
                    if(li.getCheckStatus()==0){
                        comActAcidRecordExcelVO.setCheckStatus("否");
                    }