mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

班组修改

Browse Source
This commit is contained in:
JinLu.Yin
2022-06-07 15:45:42 +08:00
parent d8b2d821b3
commit 3ec4fb7505
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalShiftController.java
View File

@@ -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));

19
ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalShift.java
View File

@@ -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;
}