From 1dea9c7be00dced2fd120238da0dcb1e7c713df0 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 14 Apr 2023 19:25:32 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E8=B0=83=E6=95=B4=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SdenergyTaxCodeMatchController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java index 15994c75..56146f02 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java @@ -7,7 +7,6 @@ import com.dxhy.base.file.handle.ExcelReadHandle; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; import com.dxhy.order.constant.OrderInfoContentEnum; -import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; @@ -183,12 +182,12 @@ public class SdenergyTaxCodeMatchController { } } if (ObjectUtil.isNotEmpty(errorMsgList)) { - return R.error("9999","导入失败").put(OrderManagementConstant.DATA, errorMsgList).put("isPass", false).put("count", errorMsgList.size()); + return R.error("9999","导入失败").put("list", errorMsgList).put("isPass", false).put("count", errorMsgList.size()); } if(sdenergyTaxCodeMatchService.upload(uploadList) > 0){ return InterfaceResponseUtils.buildReturnInfo(OrderInfoContentEnum.SUCCESS, null).put("count", uploadList.size()); } - return R.error("9999","导入失败").put(OrderManagementConstant.DATA, errorMsgList).put("isPass", false).put("count", errorMsgList.size()); + return R.error("9999","导入失败").put("list", errorMsgList).put("isPass", false).put("count", errorMsgList.size()); }