From d7a90398b55ed9ebdc7cd73441dea802e8f9fbf0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 07 六月 2022 09:53:56 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java | 10 ++++++++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java | 8 ++++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java | 7 +++++--
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index b6c0204..e7c3e5a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -171,7 +171,7 @@
String uuid=UUID.randomUUID().toString().replaceAll("-", "");
String name = uuid + "."+ extension;
minioUtil.upload(file, name);
- Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress");
+ Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.71).outputFormat("jpg").toFile(uuid+"_compress");
File file1=new File(uuid+"_compress.jpg");
String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
return R.ok(imageUrl);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
index 142ac22..fe80df2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
@@ -118,8 +118,8 @@
@ExcelProperty("行程码截图")
private String travelImage;
- @ExcelProperty("48小时核酸截图")
- private String acidImage;
+// @ExcelProperty("48小时核酸截图")
+// private String acidImage;
@ExcelProperty("疫苗接种截图")
private String vaccinationImage;
@@ -132,4 +132,8 @@
@ApiModelProperty("行程信息")
private String transportInfo;
+
+
+ @ExcelProperty("是否核对")
+ private Integer checkStatus;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
index 078d608..f9d6d2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
@@ -117,8 +117,8 @@
@ExcelProperty("行程码截图")
private URL travelImage;
- @ExcelProperty("48小时核酸截图")
- private URL acidImage;
+// @ExcelProperty("48小时核酸截图")
+// private URL acidImage;
// @ExcelProperty("疫苗接种截图")
// private URL vaccinationImage;
@@ -128,4 +128,7 @@
@ExcelProperty("车次信息")
private String transportInfo;
+
+ @ExcelProperty("是否核对")
+ private String checkStatus;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
index 5dc040d..c00625e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -150,9 +150,9 @@
list.forEach(li->{
ComActAcidRecordExcelVO comActAcidRecordExcelVO=new ComActAcidRecordExcelVO();
BeanUtils.copyProperties(li,comActAcidRecordExcelVO);
- if(StringUtils.isNotEmpty(li.getAcidImage())){
+ if(StringUtils.isNotEmpty(li.getTravelImage())){
try {
- comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+ //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage()));
//comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
@@ -160,6 +160,12 @@
e.printStackTrace();
}
}
+ if(li.getCheckStatus()==0){
+ comActAcidRecordExcelVO.setCheckStatus("否");
+ }
+ else{
+ comActAcidRecordExcelVO.setCheckStatus("是");
+ }
excelVOS.add(comActAcidRecordExcelVO);
});
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
index 8b29704..2b689f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
@@ -70,6 +70,9 @@
<if test="commonPage.userId !=null">
and t.user_id = #{commonPage.userId}
</if>
+ <if test="commonPage.checkStatus !=null and commonPage.checkStatus !=''">
+ and check_status = #{commonPage.checkStatus}
+ </if>
<if test="commonPage.keyword !=null and commonPage.keyword!=''">
and (t.name like concat('%',#{commonPage.keyword},'%') or t.phone like
concat('%',#{commonPage.keyword},'%') or t.id_card like concat('%',#{commonPage.keyword},'%'))
--
Gitblit v1.7.1