From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
index c31db04..c03dac6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
@@ -14,6 +14,7 @@
import org.jeecg.modules.mdc.entity.MdcShiftSub;
import org.jeecg.modules.mdc.mapper.MdcShiftSubMapper;
import org.jeecg.modules.mdc.service.IMdcShiftSubService;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -50,21 +51,7 @@
}
@Override
- public MdcShiftSub addMdcShiftSub(JSONObject jsonbject) {
- MdcShiftSub mdcShiftSub = jsonbject.toJavaObject(MdcShiftSub.class);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
- String startDate = simpleDateFormat.format(jsonbject.getDate("startDate"));
- mdcShiftSub.setStartDate(startDate);
- String endDate = simpleDateFormat.format(jsonbject.getDate("endDate"));
- mdcShiftSub.setEndDate(endDate);
- if (jsonbject.getDate("sleepStartDate") != null) {
- String sleepStartDate = simpleDateFormat.format(jsonbject.getDate("sleepStartDate"));
- mdcShiftSub.setSleepStartDate(sleepStartDate);
- }
- if (jsonbject.getDate("sleepEndDate") != null) {
- String sleepEndDate = simpleDateFormat.format(jsonbject.getDate("sleepEndDate"));
- mdcShiftSub.setSleepEndDate(sleepEndDate);
- }
+ public MdcShiftSub addMdcShiftSub(MdcShiftSub mdcShiftSub) {
this.save(mdcShiftSub);
return mdcShiftSub;
}
--
Gitblit v1.9.3