From 0433153f8c4f7bbbaa135ef4c5b729566a58e01a Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 19 九月 2023 11:44:58 +0800
Subject: [PATCH] 班制班次时间问题
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java | 1 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java | 8 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java | 17 ++---------------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java | 27 +++++++++++++++++----------
5 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
index 8fb3426..1de3bf9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -34,6 +35,7 @@
/**
* 鐝琛�(娆¤〃)-鍒嗛〉鏌ヨ
+ *
* @param shiftId
* @param pageNo
* @param pageSize
@@ -43,8 +45,8 @@
@ApiOperation(value = "鐝琛�(娆¤〃)-鍒嗛〉鏌ヨ", notes = "鐝琛�(娆¤〃)-鍒嗛〉鏌ヨ")
@GetMapping("/queryPageList")
public Result<?> queryPageList(@RequestParam String shiftId,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page page = new Page<>(pageNo, pageSize);
IPage<MdcShiftSub> mdcShiftSubIPage = mdcShiftSubService.queryPageList(shiftId, page);
return Result.OK(mdcShiftSubIPage);
@@ -52,63 +54,68 @@
/**
* 鐝琛�(娆¤〃)-鏂板
- * @param jsonbject
+ *
+ * @param mdcShiftSub
* @return
*/
@AutoLog(value = "鐝琛�(娆¤〃)-鏂板")
@ApiOperation(value = "鐝琛�(娆¤〃)-鏂板", notes = "鐝琛�(娆¤〃)-鏂板")
@PostMapping("/addShiftSub")
- public Result<?> addShiftSub(@RequestBody JSONObject jsonbject) {
+ public Result<?> addShiftSub(@RequestBody MdcShiftSub mdcShiftSub) {
//澶勭悊鏄惁瀛樺湪绌哄��
- if (jsonbject.getDate("sleepStartDate") != null || jsonbject.getDate("sleepEndDate") != null ) {
- if (jsonbject.getDate("sleepEndDate") == null || jsonbject.getDate("sleepStartDate") == null) {
+ if (StringUtils.isNotEmpty(mdcShiftSub.getSleepStartDate()) || StringUtils.isNotEmpty(mdcShiftSub.getSleepEndDate())) {
+ if (StringUtils.isEmpty(mdcShiftSub.getSleepEndDate()) || StringUtils.isEmpty(mdcShiftSub.getSleepStartDate())) {
return Result.error("鏂板澶辫触锛屼紤鎭椂闂撮�夋嫨涓嶅");
}
}
- MdcShiftSub result = mdcShiftSubService.addMdcShiftSub(jsonbject);
+ MdcShiftSub result = mdcShiftSubService.addMdcShiftSub(mdcShiftSub);
return Result.OK(result);
}
/**
* 鐝琛�(娆¤〃)-淇敼
+ *
* @param mdcShiftSub
* @return
*/
@AutoLog(value = "鐝琛�(娆¤〃)-淇敼")
@ApiOperation(value = "鐝琛�(娆¤〃)-淇敼", notes = "鐝琛�(娆¤〃)-淇敼")
@PutMapping("/editMdcShiftSub")
- public Result<?> editShiftSub(@RequestBody MdcShiftSub mdcShiftSub){
+ public Result<?> editShiftSub(@RequestBody MdcShiftSub mdcShiftSub) {
Boolean flag = mdcShiftSubService.editMdcShiftSub(mdcShiftSub);
return flag ? Result.OK("淇敼鎴愬姛") : Result.error("淇敼澶辫触");
}
/**
* 鐝琛�(娆¤〃)-鏍规嵁id淇敼瀛愯〃鐘舵��
+ *
* @param jsonObject
* @return
*/
@AutoLog(value = "鐝琛�(娆¤〃)-鏍规嵁id淇敼瀛愯〃鐘舵��")
@ApiOperation(value = "鐝琛�(娆¤〃)-鏍规嵁id淇敼瀛愯〃鐘舵��", notes = "鏍规嵁id淇敼瀛愯〃鐘舵��")
@PutMapping("/updateSubStatusById")
- public Result<?> updateSubStatusById(@RequestBody JSONObject jsonObject){
+ public Result<?> updateSubStatusById(@RequestBody JSONObject jsonObject) {
Boolean flag = mdcShiftSubService.updateSubStatusById(jsonObject);
return flag ? Result.OK("淇敼鎴愬姛") : Result.error("淇敼澶辫触");
}
/**
* 鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎
+ *
* @param id
* @return
*/
@AutoLog(value = "鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎")
@ApiOperation(value = "鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎", notes = "鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎")
@DeleteMapping("/deleteMdcShiftSub")
- public Result<?> deleteMdcShiftSub(@RequestParam String id){
+ public Result<?> deleteMdcShiftSub(@RequestParam String id) {
return mdcShiftSubService.deleteMdcShiftSub(id);
}
/**
* 鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎
+ *
* @param shiftId
* @return
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
index dafb565..50f29e5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
@@ -50,24 +50,32 @@
/**
* 寮�濮嬫椂闂�
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("寮�濮嬫椂闂�")
private String startDate;
/**
* 缁撴潫鏃堕棿
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("缁撴潫鏃堕棿")
private String endDate;
/**
* 寮�濮嬩紤鎭椂闂�
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("寮�濮嬩紤鎭椂闂�")
private String sleepStartDate;
/**
* 缁撴潫浼戞伅鏃堕棿
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("缁撴潫浼戞伅鏃堕棿")
private String sleepEndDate;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
index 4e56a58..1ca7f6b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
@@ -36,10 +36,10 @@
/**
* 鏂板
- * @param jsonbject
+ * @param mdcShiftSub
* @return
*/
- MdcShiftSub addMdcShiftSub(JSONObject jsonbject);
+ MdcShiftSub addMdcShiftSub(MdcShiftSub mdcShiftSub);
/**
* 淇敼
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
index 50d84c6..b2a49d6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
@@ -50,6 +50,7 @@
if (StringUtils.isEmpty(mdcShift.getShiftStatus())) {
mdcShift.setShiftStatus("1");
}
+ mdcShift.setDefaultShift("false");
List<MdcShift> mdcShifts = listMdcName(mdcShift);
//鏌ヨ鏈夐噸澶嶆暟鎹繑鍥瀎alse
if (null != mdcShifts && !mdcShifts.isEmpty()) {
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