From 054ffd3dfc97710f96d1e932bdcfade46c2503fa Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 11:38:25 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
index 00aa8b5..f45b187 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -43,8 +44,18 @@
@Override
public IPage<MgtOneClinkSyncPageVO> pageOneClinkSyncing(MgtOneClinkSyncingPageDTO mgtPageDto) {
+ if (null != mgtPageDto.getSyncingStartTime()){
+ LocalDateTime startTime = mgtPageDto.getSyncingStartTime().atStartOfDay();
+ mgtPageDto.setStartTime(startTime);
+ }
+ if(null != mgtPageDto.getSyncingEndTime()){
+ LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX);
+ mgtPageDto.setEndTime(endTime);
+ }
+
//分页查询
IPage<MgtOneClinkSyncPageVO> page = new Page<>(mgtPageDto.getPageNum(),mgtPageDto.getPageSize());
+
return this.baseMapper.pageOneClinkSyncing(page,mgtPageDto);
}
@@ -104,7 +115,7 @@
public R deleteOneClinkSyncing(Integer syncingId) {
//删除
OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
- if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+ if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
return R.ok();
}
oneClinkSyncing.setDelFlag(1);
@@ -118,7 +129,7 @@
public R executeOneClinkSyncing(Integer syncingId) {
//根据oneClinkSyncing,修改门店信息
OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
- if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+ if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
return R.fail("该一键同步不存在");
}
if (oneClinkSyncing.getShopIds() == null || oneClinkSyncing.getShopIds().trim().isEmpty()) {
--
Gitblit v1.7.1