diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index ffded71..79109f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -225,11 +225,11 @@ * 开票地址-省 */ @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province_name") + @TableField("invoice_province") private String invoiceProvince; @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province") + @TableField("invoice_province_name") private String invoiceProvinceName; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index ffded71..79109f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -225,11 +225,11 @@ * 开票地址-省 */ @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province_name") + @TableField("invoice_province") private String invoiceProvince; @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province") + @TableField("invoice_province_name") private String invoiceProvinceName; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 928f4e4..5f44e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -305,6 +305,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getFileNo()), "file_no", request.getFileNo()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index ffded71..79109f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -225,11 +225,11 @@ * 开票地址-省 */ @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province_name") + @TableField("invoice_province") private String invoiceProvince; @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province") + @TableField("invoice_province_name") private String invoiceProvinceName; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 928f4e4..5f44e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -305,6 +305,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getFileNo()), "file_no", request.getFileNo()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index fea55b7..ae4c45a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -308,6 +308,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java index ffded71..79109f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterTraceSupplier.java @@ -225,11 +225,11 @@ * 开票地址-省 */ @ApiModelProperty(value = "开票地址-省(code)", dataType = "String") - @TableField("invoice_province_name") + @TableField("invoice_province") private String invoiceProvince; @ApiModelProperty(value = "开票地址-省(名称)", dataType = "String") - @TableField("invoice_province") + @TableField("invoice_province_name") private String invoiceProvinceName; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 928f4e4..5f44e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -305,6 +305,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getFileNo()), "file_no", request.getFileNo()); wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileCode()), "file_code", request.getFileCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index fea55b7..ae4c45a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -308,6 +308,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java index 7c3bf41..01b5844 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java @@ -330,6 +330,11 @@ List passedList = baseApprovalService.getPassedList(request.getFormId()); QueryWrapper wrapper = new QueryWrapper<>(); + //无审批通过则返回空数据 + if (CollectionUtils.isEmpty(passedList)) { + wrapper.eq("id", 12344321); + return wrapper; + } wrapper.like(StringUtils.isNotBlank(request.getDirector()), "director", request.getDirector()); wrapper.like(StringUtils.isNotBlank(request.getEffectiveCompany()), "effective_company", request.getEffectiveCompany()); wrapper.like(!Objects.isNull(request.getDeptId()), "dept_id", request.getDeptId());