导入报名修改

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/controller/HwRequirementController.java

@@ -507,10 +507,14 @@ public class HwRequirementController {
           try {
 			  List list=hwRequirementService.importExcel(file,hwRequirement);
 			  if(list.size()>0){
-				  JSONArray jsonArray=new JSONArray(list);
-				  return Result.error(jsonArray.toString());
-			  }else{
-				  return Result.ok("文件导入成功！");
+			  	Map map=(Map)list.get(0);
+			  	if(map.size()==1){
+					return Result.ok(map.get("message"));
+				}else{
+					JSONArray jsonArray=new JSONArray(list);
+					return Result.error(jsonArray.toString());
+				}
+
 			  }
           } catch (Exception e) {
               log.error(e.getMessage(),e);

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/service/impl/HwRequirementServiceImpl.java

@@ -210,6 +210,8 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
         Sheet sheet = wb.getSheetAt(0);
         //获取总行数
         int totalRows = sheet.getLastRowNum();
+        //excel数据已经报名数
+        int enrollNum=0;
         //循环取出行放入hwEnrollmentExportList
         for (int i = 8; i <= totalRows; i++) {
             HwEnrollmentExport hwEnrollmentExport = new HwEnrollmentExport();
@@ -432,11 +434,7 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
                     //查询此需求用户是否报名
                     List<HwEnrollment> hwEnrollmentList = hwEnrollmentService.findHwEnrollmentList(hwEnrollment);
                     if (hwEnrollmentList.size() > 0) {
-                        map.put("id", j + 9);
-                        map.put("phone", phone);
-                        map.put("reason", "用户已经报名");
-                        resultlist.add(map);
-                        continue;
+                        enrollNum=enrollNum+1;
                     }
                     //存放用户id，说明此用户已存在数据库
                     HwUserExport hwUserExport=new HwUserExport();
@@ -461,6 +459,9 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
                 hwUserIdList= this.saveUser(hwUserExportList);
                 saveEnrollment(hwRequirement, hwEnrollmentExportList, hwUserIdList);
             }
+            Map map=new HashMap();
+            map.put("message","导入"+(totalRows-7)+"条,成功报名"+(totalRows-7-enrollNum)+"条,"+enrollNum+"条已存在");
+            resultlist.add(map);
         }
         return resultlist;
     }