feature 1.统一公司物料导入返回值

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java

@@ -6,14 +6,18 @@ import com.dxhy.base.file.exception.ExcelReadException;
 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;
 import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDeleteDTO;
 import com.dxhy.order.consumer.modules.taxcodematch.service.SdenergyTaxCodeMatchService;
+import com.dxhy.order.consumer.utils.InterfaceResponseUtils;
 import com.dxhy.order.model.PageUtils;
 import com.dxhy.order.model.R;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -149,39 +153,49 @@ public class SdenergyTaxCodeMatchController {
         if(ObjectUtil.isEmpty(uploadList) ){
             return R.error("数据解析为空");
         }
-        List<String> errorMsgList = Lists.newArrayList();
+        List<Map<String,String>> errorMsgList = Lists.newArrayList();
-        int resultIndex = 3;
+        int resultIndex = 2;
         for (SdenergyTaxCodeMatch taxCodeMatch : uploadList) {
+            resultIndex++;
             String wlflbm = taxCodeMatch.getWlflbm();
             if(StringUtils.isNotBlank(wlflbm)){
                 SdenergyTaxCodeMatch codeMatch = sdenergyTaxCodeMatchService.queryByWlflbm(taxCodeMatch.getWlflbm());
                 if(codeMatch != null){
-                    errorMsgList.add("第" + resultIndex + "行，物料分类编码已存在");
+                    errorMsgList.add(buildEMsgMap("第" + resultIndex + "行，物料分类编码已存在"));
                     continue;
                 }
             }else {
-                errorMsgList.add("第" + resultIndex + "行，物料分类编码不能为空");
+                errorMsgList.add(buildEMsgMap("第" + resultIndex + "行，物料分类编码不能为空"));
                 continue;
             }
             String ssflbm = taxCodeMatch.getSsflbm();
             if(StringUtils.isBlank(ssflbm)){
-                errorMsgList.add("第" + resultIndex + "行，税收分类编码不能为空");
+                errorMsgList.add(buildEMsgMap("第" + resultIndex + "行，税收分类编码不能为空"));
                 continue;
             }else {
                 TaxClassCodeEntity entity = taxClassCodeService.queryTaxClassCodeEntityBySpbm(ssflbm);
                 if(entity != null){
                     taxCodeMatch.setSsflmc(entity.getSpjc());
                 }else {
-                    errorMsgList.add("第" + resultIndex + "行，税收分类编码有误");
+                    errorMsgList.add(buildEMsgMap("第" + resultIndex + "行，税收分类编码有误"));
                     continue;
                 }
             }
         }
         if (ObjectUtil.isNotEmpty(errorMsgList)) {
-            return R.error(errorMsgList);
+            return R.error("9999","导入失败").put(OrderManagementConstant.DATA, errorMsgList).put("isPass", false).put("count", errorMsgList.size());
         }
-        return sdenergyTaxCodeMatchService.upload(uploadList) > 0 ? R.ok() : R.error();
+        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());
     }
 
 
+    public Map<String,String> buildEMsgMap(String errorMsg){
+        Map<String, String> map = Maps.newHashMap();
+        map.put("errorMsg",errorMsg);
+        return map;
+    }
+
 }