From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
index ff9edec..3f2beea 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmOrderSchedulingServiceImpl.java
@@ -1,20 +1,13 @@
package com.billion.main.om.service.impl;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.billion.common.core.domain.entity.SysUser;
-import com.billion.common.core.domain.model.LoginUser;
-import com.billion.common.exception.ServiceException;
-import com.billion.common.utils.SecurityUtils;
+import com.billion.common.utils.DateUtils;
import com.billion.main.om.domain.OmOrderScheduling;
import com.billion.main.om.mapper.OmOrderSchedulingMapper;
import com.billion.main.om.service.IOmOrderSchedulingService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.text.MessageFormat;
-import java.util.Date;
import java.util.List;
/**
@@ -62,17 +55,19 @@
@Override
public int insertOmOrderScheduling(OmOrderScheduling omOrderScheduling)
{
- List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode()));
- if (CollUtil.isNotEmpty(list)){
- throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
- omOrderScheduling.setCreateTime(new Date());
- omOrderScheduling.setUpdateTime(new Date());
- omOrderScheduling.setCreateBy(user.getUserName());
- omOrderScheduling.setUpdateBy(user.getUserName());
- return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling);
+ omOrderScheduling.setUpdateTime(DateUtils.getNowDate());
+ return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+// List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode()));
+// if (CollUtil.isNotEmpty(list)){
+// throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
+// }
+// LoginUser loginUser = SecurityUtils.getLoginUser();
+// SysUser user = loginUser.getUser();
+// omOrderScheduling.setCreateTime(new Date());
+// omOrderScheduling.setUpdateTime(new Date());
+// omOrderScheduling.setCreateBy(user.getUserName());
+// omOrderScheduling.setUpdateBy(user.getUserName());
+// return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling);
}
/**
@@ -84,17 +79,19 @@
@Override
public int updateOmOrderScheduling(OmOrderScheduling omOrderScheduling)
{
- List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>()
- .eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode())
- .notIn(OmOrderScheduling::getId,omOrderScheduling.getId()));
- if (CollUtil.isNotEmpty(list)){
- throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
- }
- LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
- omOrderScheduling.setUpdateTime(new Date());
- omOrderScheduling.setUpdateBy(user.getUserName());
+ omOrderScheduling.setUpdateTime(DateUtils.getNowDate());
return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
+// List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>()
+// .eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode())
+// .notIn(OmOrderScheduling::getId,omOrderScheduling.getId()));
+// if (CollUtil.isNotEmpty(list)){
+// throw new ServiceException(MessageFormat.format("宸插瓨鍦ㄦ�绘垚搴忓垪鍙蜂负{0}鐨勬暟鎹�",omOrderScheduling.getSfcCode()));
+// }
+// LoginUser loginUser = SecurityUtils.getLoginUser();
+// SysUser user = loginUser.getUser();
+// omOrderScheduling.setUpdateTime(new Date());
+// omOrderScheduling.setUpdateBy(user.getUserName());
+// return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling);
}
/**
--
Gitblit v1.9.3