From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 08 七月 2023 18:37:12 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
index d5f8990..d110c71 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl.config;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.MgtPopEditDto;
@@ -13,6 +14,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
import java.util.Date;
import java.util.List;
@@ -65,6 +67,12 @@
// 设置创建时间和创建者ID
pop.setCreateTime(new Date());
pop.setCreateUserId(mgtPopEditDto.getPopId());
+ try {
+ pop.setShowStartTime(DateUtils.parseDate(mgtPopEditDto.getShowStartTime(),"yyyy-MM-dd"));
+ pop.setShowEndTime(DateUtils.parseDate(mgtPopEditDto.getShowEndTime(),"yyyy-MM-dd"));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
// 保存或更新管理弹窗
this.saveOrUpdate(pop);
}
@@ -95,7 +103,6 @@
public void deleteMgtPop(MgtBaseGetDto mgtBaseGetDto){
Pop pop = this.getById(Long.valueOf(mgtBaseGetDto.getId()));
pop.setDelFlag(1);
- pop.insertOrUpdate();
this.saveOrUpdate(pop);
}
}
--
Gitblit v1.7.1