Merge remote-tracking branch 'origin/master'

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -83,7 +83,7 @@ public class CustomerController extends BaseController {
         return AjaxResult.success(baseService.add(customer));
     }
 
-    private void dealWithcustomerData(Customer customer){
+    private void dealWithcustomerData(Customer customer) {
         if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
         if (ObjectUtils.isEmpty(customer.getCompanyId())) {
             try {
@@ -131,6 +131,7 @@ public class CustomerController extends BaseController {
     public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
         List<Customer> customerList = new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 2);
         List<String> resultList = new ArrayList<>();
+        int successCount = 0;
         for (Customer customer : customerList) {
             if (ObjectUtils.isEmpty(customer.getCompanyName())) {
                 continue;
@@ -152,10 +153,13 @@ public class CustomerController extends BaseController {
                     customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
                 }
                 baseService.add(customer);
+                successCount++;
             } catch (Exception e) {
                 resultList.add(customer.getCompanyName().concat(":").concat(e.getMessage()));
             }
         }
-        return AjaxResult.success(resultList);
+        AjaxResult success = AjaxResult.success(resultList);
+        success.put("successCount", successCount);
+        return success;
     }
 }

dsk-operate-ui/src/api/enterpriseData/enterpriseData.js

@@ -42,6 +42,15 @@ let uipSerach= function uipSerach(param) {
 	data: param
   })
 }
+// 认领用户
+let claim= function claim(param) {
+  return request({
+    url: '/customer/claim',
+    method: 'post',
+	data: param
+  })
+}
+
 
 
-export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach}
+export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim}
\ No newline at end of file