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 2128b52..0d63af1 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -68,17 +68,7 @@ public class TraceOrderController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - @AuthRuleAnnotation("") - @GetMapping("udi/trace/order/filterBatchNo") - public BaseResponse filterCompanyName(TraceProductRecordRequest traceProductRecordRequest) { - List traceProductRecordResponses = traceOrderService.filterBatchNo(traceProductRecordRequest); - PageInfo pageInfo = new PageInfo<>(traceProductRecordResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(traceProductRecordResponses); - return ResultVOUtils.success(pageSimpleResponse); - } diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml index b8d7d00..5164370 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml @@ -5,7 +5,7 @@ resultType="com.glxp.api.res.trace.TraceRecordResponse"> SELECT tr.recordCode, tr.remark, trd.*, mid.* FROM trace_record_log tr - LEFT JOIN trace_product_record trd ON trd.recordIdFk = tr.id + LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk LEFT JOIN (SELECT tor.billNo, tor.fromCorp, tor.toCorp, tor.createUser, uc.companyName FROM trace_order tor LEFT JOIN user_company uc ON uc.id = tor.companyIdFk) mid diff --git a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml index 2ca467b..b314bb0 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml @@ -17,7 +17,7 @@ and cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%') - and ggxh = #{ggxh} + and ggxh LIKE CONCAT('%', #{ggxh}, '%') and ylqxzcrbarmc = #{ylqxzcrbarmc}