diff --git a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java index 381f5cb..1c6401a 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java @@ -70,7 +70,6 @@ public class TraceManuOrderController { @AuthRuleAnnotation("udi/trace/manu/order/filter") @GetMapping("udi/trace/manu/order/filter") public BaseResponse filterLogs(TraceManuOrderRequest traceManuOrderRequest) { - List traceManuOrderResponses = traceManuOrderService.filterTraces(traceManuOrderRequest); PageInfo pageInfo = new PageInfo<>(traceManuOrderResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -83,13 +82,13 @@ public class TraceManuOrderController { @AuthRuleAnnotation("udi/trace/manu/order/relCode") @GetMapping("udi/trace/manu/order/relCode") public BaseResponse filterDetail(TraceManuDetailRequest traceManuDetailRequest) { + List traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest); + PageInfo pageInfo = new PageInfo<>(traceManuCodeRellResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(traceManuCodeRellResponses); + return ResultVOUtils.success(pageSimpleResponse); - List traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest); - PageInfo pageInfo = new PageInfo<>(traceManuCodeRellResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(traceManuCodeRellResponses); - return ResultVOUtils.success(pageSimpleResponse); } @Resource diff --git a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java index df9dd5a..fd8b9b5 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java @@ -193,5 +193,9 @@ public class TraceOrderEntity implements Serializable { @TableField(value = "sourceType") private Long sourceType; + @ApiModelProperty(value = "记录号外键") + @TableField(value = "recordCode") + private String recordCode; + private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml index f28918e..9581fc0 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml @@ -10,6 +10,9 @@ and manuOrderNo = #{manuOrderNo} + + and manuOrderIdFk = #{manuOrderIdFk} + diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml index d7c2a09..bb17790 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml @@ -1,7 +1,7 @@ - +