From 85bee382c4d16bbbdeafd5f236a4d2a8f8fad484 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 3 Sep 2024 14:13:43 +0800 Subject: [PATCH] =?UTF-8?q?9/3=20=E8=BF=BD=E6=BA=AF=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A21.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/collect/IoCollectCodeController.java | 11 +++++++++++ .../glxp/api/res/collect/IoCollectCodeResponse.java | 2 ++ .../api/service/collect/IoCollectCodeService.java | 3 +++ 3 files changed, 16 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java index c47d48fd7..abf01c0a8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java @@ -6,13 +6,16 @@ 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.collect.IoCollectOrder; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.service.collect.IoCollectCodeService; +import com.glxp.api.service.collect.IoCollectOrderService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.Offset; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,6 +32,9 @@ public class IoCollectCodeController extends BaseController { @Resource IoCollectCodeService collectCodeService; + @Resource + IoCollectOrderService collectOrderService; + /** * 追溯码查询 * @param @@ -46,6 +52,11 @@ public class IoCollectCodeController extends BaseController { if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) { ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc()); } + IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo()); + ioCollectCodeResponse.setBillTime(byBillNo.getBillTime()); + if (byBillNo.getRemark() != null){ + ioCollectCodeResponse.setRemark(byBillNo.getRemark()); + } } PageInfo pageInfo = new PageInfo<>(collectOrderCodeManResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java index 8b00a247f..3697044f7 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java @@ -104,5 +104,7 @@ public class IoCollectCodeResponse { private String zczbhhzbapzbh; private String manufactory; private String ylqxzcrbarmc; + private String relId; + private Date billTime; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index b50b9ed54..e4c271f38 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.collect; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; @@ -40,6 +41,7 @@ public class IoCollectCodeService extends ServiceImpl