diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 8eaec7eb2..d6fa440ce 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -298,6 +298,7 @@ public class IoCollectOrderController extends BaseController { /** * 置顶 + * * @param collectOrderRequest * @return */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java index 5779dc822..d5ce79b62 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java @@ -133,13 +133,12 @@ public class IoCollectCode implements Serializable { private Integer scanCount; - /** * 耗材字典外键id */ @TableField(value = "relId") @ApiModelProperty(value = "耗材字典外键id") - private String relId; + private Long relId; private static final long serialVersionUID = 1L; 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 f20ea2545..b50b9ed54 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -42,6 +42,7 @@ public class IoCollectCodeService extends ServiceImpl ioCollectCodes = new ArrayList<>(); - for (IoCollectOrderCodeAuto ioCollectOrderCodeMan : codeAutoList) { - ioCollectCodes.add(IoCollectCode.builder().code(ioCollectOrderCodeMan.getUdiCode()) + for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) { + ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode()) .fromType(collectOrder.getFromType()) .busType(collectOrder.getBusType()) .billNo(collectOrder.getBillNo()) @@ -126,6 +128,7 @@ public class IoCollectCodeService extends ServiceImpl ioCollectCodes = new ArrayList<>(); - for (IoCollectOrderCodeAuto ioCollectOrderCodeMan : codeAutoList) { - ioCollectCodes.add(IoCollectCode.builder().code(ioCollectOrderCodeMan.getUdiCode()) + for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) { + ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode()) .fromType(collectOrder.getFromType()) .busType(collectOrder.getBusType()) .billNo(collectOrder.getBillNo()) @@ -145,6 +148,7 @@ public class IoCollectCodeService extends ServiceImpl