From 68a2f24362052908ade08c4fa2d13a86a3a6fcad Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 29 May 2024 19:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E6=9F=A5=E8=AF=A2=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=E5=86=85=E7=9A=84=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesShiftService.java | 4 +++- .../controller/base/MesShiftController.java | 28 ++++++++++++++++++++++ .../serviceimpl/base/MesShiftService.java | 15 ++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java index 9499325..e1b4b90 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesShift; +import java.util.List; + /** * @Description: * @CreateDate 2024/04/16 @@ -9,5 +11,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShift; */ public interface IMesShiftService extends IBaseMesService { - + List findMesShift(MesShift mesShift); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java index ad1d546..ea8f476 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java @@ -1,12 +1,40 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesShift; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShift") public class MesShiftController extends BaseMesController { + + @Autowired + private IMesShiftService mesShiftService; + + @GetMapping(value = "/find") + @ApiOperation(value = "查询班次信息", notes = "查询班次信息") + public ResultBean findMesShift(MesShift mesShift) { + try { + mesShift.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + List mesShiftList = mesShiftService.findMesShift(mesShift); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(mesShiftList); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java index 3fc9aa6..a9e548f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; @@ -11,6 +12,8 @@ import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesShiftService extends BaseMesService implements IMesShiftService { @@ -77,4 +80,16 @@ public class MesShiftService extends BaseMesService implements IMesShi } } + @Override + public List findMesShift(MesShift mesShift) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesShift.getOrganizeCode()); + String nowDate = TimeTool.getNowTime(true); + DdlPreparedPack.getNumEqualPack(mesShift.getIsValid(), "isValid", packBean); + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesShift.getShiftName(), "shiftName", packBean); + DdlPreparedPack.getStringSmallerPack(nowDate,"beginDate",packBean); + DdlPreparedPack.getStringBiggerPack(nowDate,"endDate",packBean); + return baseRDao.findByHqlWhere(packBean); + } }