From b000767268e0c2bf17b05cafc70ecea575583598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Mon, 14 Apr 2025 13:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoordinatePhotoServiceImpl.java | 2 ++ .../service/impl/ImportantMatterServiceImpl.java | 14 ++++++++++++++ .../service/impl/SafetyMeasuresServiceImpl.java | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index 2e5728b..3f79591 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -107,6 +107,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); comprehensiveQueryVo.setUploadType("4"); + comprehensiveQueryVo.setVioPlace(data.getBuildPlace()); synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); @@ -142,6 +143,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { } ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + comprehensiveQueryVo.setVioPlace(data.getBuildPlace()); synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index ecae6c9..9049d31 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -16,8 +16,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; @@ -72,6 +75,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { return ServerResponse.createSuccess(); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("删除失败"); } } @@ -104,9 +108,14 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); comprehensiveQueryVo.setUploadType("5"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (data.getTime() != null && !data.getTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(data.getTime())); + } synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("新增失败"); } return ServerResponse.createSuccess("新增成功"); @@ -139,9 +148,14 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { //修改综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (data.getTime() != null && !data.getTime().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(data.getTime())); + } synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return ServerResponse.createErroe("修改失败"); } return ServerResponse.createSuccess("修改成功"); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index 16ca5c4..e8c8a23 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -108,6 +109,12 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); comprehensiveQueryVo.setUploadType("3"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (data.getCheckDate() != null && !data.getCheckDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(data.getCheckDate())); + } + comprehensiveQueryVo.setVioPlace(data.getCheckPlace()); + comprehensiveQueryVo.setVioDesc(data.getCheckDesc()); synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e);