From 3ec4fb75054bff2e8392375778ddd92f5ba18b78 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Tue, 7 Jun 2022 15:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/设计文档/数据库设计/mes-cal.sql | 4 ++-- .../ktg/common/constant/UserConstants.java | 4 ++-- .../cal/controller/CalShiftController.java | 4 ++-- .../java/com/ktg/mes/cal/domain/CalShift.java | 19 +++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/doc/设计文档/数据库设计/mes-cal.sql b/doc/设计文档/数据库设计/mes-cal.sql index e514f6c..5e20f4a 100644 --- a/doc/设计文档/数据库设计/mes-cal.sql +++ b/doc/设计文档/数据库设计/mes-cal.sql @@ -79,8 +79,8 @@ create table cal_shift ( plan_id bigint(20) not null comment '计划ID', order_num int(2) not null comment '序号', shift_name varchar(64) not null comment '班次名称', - start_time datetime not null comment '开始时间', - end_time datetime not null comment '结束时间', + start_time varchar(10) not null comment '开始时间', + end_time varchar(10) not null comment '结束时间', remark varchar(500) default '' comment '备注', attr1 varchar(64) default null comment '预留字段1', attr2 varchar(255) default null comment '预留字段2', diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java index cf34261..ff7af35 100644 --- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java +++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java @@ -132,7 +132,7 @@ public class UserConstants public static final String TRANSACTION_TYPE_MISC_ISSUE = "MISC_ISSUE"; //杂项出库 public static final String CAL_SHIFT_TYPE_SINGLE="SINGLE"; - public static final String CAL_SHIFT_TYPE_TWO="TWO"; - public static final String CAL_SHIFT_TYPE_THREE="THREE"; + public static final String CAL_SHIFT_TYPE_TWO="SHIFT_TWO"; + public static final String CAL_SHIFT_TYPE_THREE="SHIFT_THREE"; } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalShiftController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalShiftController.java index 6487bb2..d3863c9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalShiftController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalShiftController.java @@ -90,10 +90,10 @@ public class CalShiftController extends BaseController return AjaxResult.error("轮班方式为 白班 时只能有一个班次！"); } if(UserConstants.CAL_SHIFT_TYPE_TWO.equals(plan.getShiftType())&&count>1){ - return AjaxResult.error("轮班方式为 白班 时只能有两个班次！"); + return AjaxResult.error("轮班方式为 两班倒 时只能有两个班次！"); } if(UserConstants.CAL_SHIFT_TYPE_THREE.equals(plan.getShiftType())&&count>2){ - return AjaxResult.error("轮班方式为 白班 时只能有三个班次！"); + return AjaxResult.error("轮班方式为 三班倒 时只能有三个班次！"); } return toAjax(calShiftService.insertCalShift(calShift)); diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalShift.java b/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalShift.java index c348173..aa6e262 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalShift.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalShift.java @@ -33,14 +33,13 @@ public class CalShift extends BaseEntity private String shiftName; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; + @Excel(name = "开始时间") + private String startTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; + + @Excel(name = "结束时间") + private String endTime; /** 预留字段1 */ private String attr1; @@ -90,21 +89,21 @@ public class CalShift extends BaseEntity { return shiftName; } - public void setStartTime(Date startTime) + public void setStartTime(String startTime) { this.startTime = startTime; } - public Date getStartTime() + public String getStartTime() { return startTime; } - public void setEndTime(Date endTime) + public void setEndTime(String endTime) { this.endTime = endTime; } - public Date getEndTime() + public String getEndTime() { return endTime; }