Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -337,11 +337,7 @@ public class BArrangeServiceImpl implements BArrangeService {
                 scheduleDto.setSunday(value[25]);
             scheduleDto.setSubAgencyId(subAgencyId);
             //设置序号
-            if(value[16].equals(values.get(values.indexOf(value) -1 ))){
-                scheduleDto.setDtoSeq(String.valueOf(index));
-            }else{
-                scheduleDto.setDtoSeq(String.valueOf(++index));
-            }
+            scheduleDto.setDtoSeq(String.valueOf(values.indexOf(value)));
             scheduleDto.setCommonBusinessId();
             UserUtil.setCurrentPersistOperation(scheduleDto);
             scheduleDtos.add(scheduleDto);
@@ -356,12 +352,17 @@ public class BArrangeServiceImpl implements BArrangeService {
         }
         String result = "";
         if (scheduleDtos.size()>0){
-            bArrangeRepository.avoidRepeatDto(subAgencyId);
+            int deleteNum = bArrangeRepository.avoidRepeatDto(subAgencyId);
             int line1 = bArrangeRepository.insertList(scheduleDtos);
             if (line1 < 1 ) {
                 throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DB_INSERT_ERROR);
             }else{
-                result+="成功导入"+scheduleDtos.size()+"条数据。";
+                if(deleteNum > 0){
+                    result+="覆盖原先数据，成功导入"+scheduleDtos.size()+"条数据。";
+                }else{
+                    result+="成功导入"+scheduleDtos.size()+"条数据。";
+                }
+
             }
         }
 
@@ -531,12 +532,16 @@ public class BArrangeServiceImpl implements BArrangeService {
 
         String result = "";
         if (list.size()>0){
-            bSlScheduleRepository.avoidRepeatBSlSchedule(subAgencyId);
+            int deleteNum = bSlScheduleRepository.avoidRepeatBSlSchedule(subAgencyId);
             int line1 = bSlScheduleRepository.insertList(list);
             if (line1 < 1 ) {
                 throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DB_INSERT_ERROR);
             }else{
-                result+="成功导入"+list.size()+"条数据。";
+                if(deleteNum > 0){
+                    result+="覆盖原先数据，成功导入"+list.size()+"条数据。";
+                }else{
+                    result+="成功导入"+list.size()+"条数据。";
+                }
             }
         }