From ed231dd52b814d1b81e3dbbadcbc05f24fd77f27 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Mon, 29 May 2023 18:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=9F=A5=E8=AF=A2=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trace/TraceOrderController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java index cce70da..a467d3a 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -1,18 +1,21 @@ package com.glxp.api.controller.trace; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.trace.TraceOrderEntity; import com.glxp.api.req.trace.TraceOrderDetailRequest; import com.glxp.api.req.trace.TraceOrderUploadRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceOrderResponse; import com.glxp.api.service.trace.TraceOrderService; +import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; @@ -37,6 +40,22 @@ public class TraceOrderController extends BaseController { @AuthRuleAnnotation("") @GetMapping("udi/trace/order/filter") public BaseResponse getTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) { + /*if ((traceOrderDetailRequest.getUdiCode() == null || traceOrderDetailRequest.getUdiCode().equals("")) && + (traceOrderDetailRequest.getYlqxzcrbarmc() == null || traceOrderDetailRequest.getYlqxzcrbarmc().equals("")) && + (traceOrderDetailRequest.getCpmctymc() == null || traceOrderDetailRequest.getCpmctymc().equals("")) && + (traceOrderDetailRequest.getGgxh() == null || traceOrderDetailRequest.getGgxh().equals("")) && + (traceOrderDetailRequest.getNameCode() == null || traceOrderDetailRequest.getNameCode().equals("")) && + (traceOrderDetailRequest.getBatchNo() == null || traceOrderDetailRequest.getBatchNo().equals("")) && + (traceOrderDetailRequest.getCompanyName() == null || traceOrderDetailRequest.getCompanyName().equals("")) + ) { + return ResultVOUtils.error(500, "查询条件不能为空！"); + }*/ + if (StrUtil.isNotEmpty(traceOrderDetailRequest.getUdiCode())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(traceOrderDetailRequest.getUdiCode()); + if (udiEntity == null) { + return ResultVOUtils.error(500, "无效UDI码！"); + } + } List traceOrderResponses = traceOrderService.queryTraceOrderList(traceOrderDetailRequest); PageInfo pageInfo = new PageInfo<>(traceOrderResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();