From b4c2d7cb685d8e1062f043ae3cf35ed8635eeb3b Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 14 Apr 2025 13:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ComprehensiveQueryVo.java | 5 +++ .../impl/QualityInspectionServiceImpl.java | 34 ++++++++++++++++++- .../impl/SafetyViolationServiceImpl.java | 34 +++++++++++++++++++ .../bonus/imgTool/task/dao/ProPullDao.java | 2 +- .../backstage/SynthesisQueryMapper.xml | 12 +++---- .../resources/mappers/basic/ProPullMapper.xml | 2 +- 6 files changed, 80 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/backstage/entity/ComprehensiveQueryVo.java b/src/main/java/com/bonus/imgTool/backstage/entity/ComprehensiveQueryVo.java index 9e98fe9..afacbcb 100644 --- a/src/main/java/com/bonus/imgTool/backstage/entity/ComprehensiveQueryVo.java +++ b/src/main/java/com/bonus/imgTool/backstage/entity/ComprehensiveQueryVo.java @@ -1,7 +1,9 @@ package com.bonus.imgTool.backstage.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -55,6 +57,7 @@ public class ComprehensiveQueryVo { /** * 违章时间/检查时间/时间 */ + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date vioDate; /** @@ -70,6 +73,7 @@ public class ComprehensiveQueryVo { /** * 整改期限 */ + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date rectDate; /** @@ -80,6 +84,7 @@ public class ComprehensiveQueryVo { /** * 整改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date rectTime; /** diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java index 0f4ef3f..2ba9e61 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java @@ -27,6 +27,8 @@ import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -37,6 +39,8 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { private static final Logger log = LoggerFactory.getLogger("SafetyViolationServiceImpl"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + @Resource private QualityInspectionDao dao; @@ -70,9 +74,23 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { }); int j = safetyViolationDao.insertImgPhoto(bean.getFileList()); } - //存入总库 TODO + //存入总库 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(bean,comprehensiveQueryVo); + try { + // 检查vioDate是否既不是null也不是空字符串 + if (bean.getVioDate() != null && !bean.getVioDate().trim().isEmpty()) { + comprehensiveQueryVo.setVioDate(dateFormat.parse(bean.getVioDate())); + } + if (bean.getRectDate() != null && !bean.getRectDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(bean.getRectDate())); + } + if (bean.getRectTime() != null && !bean.getRectTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectTime(dateFormat.parse(bean.getRectTime())); + } + } catch (ParseException e) { + throw new RuntimeException(e); + } synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("新增成功"); } @@ -119,6 +137,20 @@ public class QualityInspectionServiceImpl implements QualityInspectionService { } ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(bean,comprehensiveQueryVo); + try { + // 检查vioDate是否既不是null也不是空字符串 + if (bean.getVioDate() != null && !bean.getVioDate().trim().isEmpty()) { + comprehensiveQueryVo.setVioDate(dateFormat.parse(bean.getVioDate())); + } + if (bean.getRectDate() != null && !bean.getRectDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(bean.getRectDate())); + } + if (bean.getRectTime() != null && !bean.getRectTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectTime(dateFormat.parse(bean.getRectTime())); + } + } catch (ParseException e) { + throw new RuntimeException(e); + } synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("修改成功"); } else { diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index 94b4259..dda0581 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -26,6 +26,9 @@ import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -36,6 +39,9 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { private static final Logger log = LoggerFactory.getLogger("SafetyViolationServiceImpl"); + // 定义日期格式 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + @Resource private SafetyViolationDao dao; @@ -68,6 +74,20 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { } ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(bean,comprehensiveQueryVo); + try { + // 检查vioDate是否既不是null也不是空字符串 + if (bean.getVioDate() != null && !bean.getVioDate().trim().isEmpty()) { + comprehensiveQueryVo.setVioDate(dateFormat.parse(bean.getVioDate())); + } + if (bean.getRectDate() != null && !bean.getRectDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(bean.getRectDate())); + } + if (bean.getRectTime() != null && !bean.getRectTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectTime(dateFormat.parse(bean.getRectTime())); + } + } catch (ParseException e) { + throw new RuntimeException(e); + } synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("新增成功"); } @@ -114,6 +134,20 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { } ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(bean,comprehensiveQueryVo); + try { + // 检查vioDate是否既不是null也不是空字符串 + if (bean.getVioDate() != null && !bean.getVioDate().trim().isEmpty()) { + comprehensiveQueryVo.setVioDate(dateFormat.parse(bean.getVioDate())); + } + if (bean.getRectDate() != null && !bean.getRectDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(bean.getRectDate())); + } + if (bean.getRectTime() != null && !bean.getRectTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectTime(dateFormat.parse(bean.getRectTime())); + } + } catch (ParseException e) { + throw new RuntimeException(e); + } synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("修改成功"); } else { diff --git a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java index 4efe913..7cf3ac6 100644 --- a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java +++ b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java @@ -19,5 +19,5 @@ public interface ProPullDao { List getNotHaveWatermarkPhoto(); - void updateHaveWatermarkPhoto(List fileList); + void updateHaveWatermarkPhoto(List list); } diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index f4916a6..34469e1 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -13,12 +13,12 @@ gx_id, gx_name, check_user_name, - vio_date, + vio_date, vio_place, vio_desc, - rect_date, + rect_date, rect_user_name, - rect_time, + rect_time, rect_desc, rect_status, build_before_desc, @@ -45,12 +45,12 @@ #{gxId}, #{gxName}, #{checkUserName}, - #{vioDate}, + #{vioDate}, #{vioPlace}, #{vioDesc}, - #{rectDate}, + #{rectDate}, #{rectUserName}, - #{rectTime}, + #{rectTime}, #{rectDesc}, #{rectStatus}, #{buildBeforeDesc}, diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml index 62c359b..a806380 100644 --- a/src/main/resources/mappers/basic/ProPullMapper.xml +++ b/src/main/resources/mappers/basic/ProPullMapper.xml @@ -78,7 +78,7 @@ id = #{proId} - + UPDATE sys_file_resource