From d8b2d821b30b07ac2c8ded1b5a6a2d7682d226da Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Mon, 6 Jun 2022 23:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/common/constant/UserConstants.java | 4 + .../cal/controller/CalShiftController.java | 30 +++++ .../ktg/mes/cal/mapper/CalShiftMapper.java | 3 + .../ktg/mes/cal/service/ICalShiftService.java | 2 + .../cal/service/impl/CalShiftServiceImpl.java | 5 + .../resources/mapper/cal/CalShiftMapper.xml | 118 ++++++++++++++++++ 6 files changed, 162 insertions(+) create mode 100644 ktg-mes/src/main/resources/mapper/cal/CalShiftMapper.xml 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 52a7f72..cf34261 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 @@ -131,4 +131,8 @@ public class UserConstants public static final String TRANSACTION_TYPE_MISC_RECPT = "MISC_RECPT"; //杂项入库 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"; + } 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 6bb3460..6487bb2 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 @@ -2,6 +2,10 @@ package com.ktg.mes.cal.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import com.ktg.mes.cal.domain.CalPlan; +import com.ktg.mes.cal.service.ICalPlanService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +38,9 @@ public class CalShiftController extends BaseController @Autowired private ICalShiftService calShiftService; + @Autowired + private ICalPlanService calPlanService; + /** * 查询计划班次列表 */ @@ -77,6 +84,18 @@ public class CalShiftController extends BaseController @PostMapping public AjaxResult add(@RequestBody CalShift calShift) { + int count = calShiftService.checkShiftCount(calShift.getPlanId()); + CalPlan plan = calPlanService.selectCalPlanByPlanId(calShift.getPlanId()); + if(UserConstants.CAL_SHIFT_TYPE_SINGLE.equals(plan.getShiftType())&&count>0){ + return AjaxResult.error("轮班方式为 白班 时只能有一个班次!"); + } + if(UserConstants.CAL_SHIFT_TYPE_TWO.equals(plan.getShiftType())&&count>1){ + return AjaxResult.error("轮班方式为 白班 时只能有两个班次!"); + } + if(UserConstants.CAL_SHIFT_TYPE_THREE.equals(plan.getShiftType())&&count>2){ + return AjaxResult.error("轮班方式为 白班 时只能有三个班次!"); + } + return toAjax(calShiftService.insertCalShift(calShift)); } @@ -88,6 +107,17 @@ public class CalShiftController extends BaseController @PutMapping public AjaxResult edit(@RequestBody CalShift calShift) { + int count = calShiftService.checkShiftCount(calShift.getPlanId()); + CalPlan plan = calPlanService.selectCalPlanByPlanId(calShift.getPlanId()); + if(UserConstants.CAL_SHIFT_TYPE_SINGLE.equals(plan.getShiftType())&&count>0){ + return AjaxResult.error("轮班方式为 白班 时只能有一个班次!"); + } + if(UserConstants.CAL_SHIFT_TYPE_TWO.equals(plan.getShiftType())&&count>1){ + return AjaxResult.error("轮班方式为 白班 时只能有两个班次!"); + } + if(UserConstants.CAL_SHIFT_TYPE_THREE.equals(plan.getShiftType())&&count>2){ + return AjaxResult.error("轮班方式为 白班 时只能有三个班次!"); + } return toAjax(calShiftService.updateCalShift(calShift)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalShiftMapper.java b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalShiftMapper.java index 580204a..c83573b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalShiftMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalShiftMapper.java @@ -27,6 +27,9 @@ public interface CalShiftMapper */ public List selectCalShiftList(CalShift calShift); + + public int checkShiftCount(Long planId); + /** * 新增计划班次 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalShiftService.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalShiftService.java index c90c45d..3bb3b61 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalShiftService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalShiftService.java @@ -27,6 +27,8 @@ public interface ICalShiftService */ public List selectCalShiftList(CalShift calShift); + public int checkShiftCount(Long planId); + /** * 新增计划班次 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalShiftServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalShiftServiceImpl.java index 565f309..19d0ffc 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalShiftServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalShiftServiceImpl.java @@ -44,6 +44,11 @@ public class CalShiftServiceImpl implements ICalShiftService return calShiftMapper.selectCalShiftList(calShift); } + @Override + public int checkShiftCount(Long planId) { + return calShiftMapper.checkShiftCount(planId); + } + /** * 新增计划班次 * diff --git a/ktg-mes/src/main/resources/mapper/cal/CalShiftMapper.xml b/ktg-mes/src/main/resources/mapper/cal/CalShiftMapper.xml new file mode 100644 index 0000000..798069e --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/cal/CalShiftMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + select shift_id, plan_id, order_num, shift_name, start_time, end_time, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from cal_shift + + + + + + + + + + insert into cal_shift + + plan_id, + order_num, + shift_name, + start_time, + end_time, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{planId}, + #{orderNum}, + #{shiftName}, + #{startTime}, + #{endTime}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update cal_shift + + plan_id = #{planId}, + order_num = #{orderNum}, + shift_name = #{shiftName}, + start_time = #{startTime}, + end_time = #{endTime}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where shift_id = #{shiftId} + + + + delete from cal_shift where shift_id = #{shiftId} + + + + delete from cal_shift where shift_id in + + #{shiftId} + + + \ No newline at end of file