工作组导入

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java

@@ -76,7 +76,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
     public List<WgdCgfy> importCgfy(MultipartFile file, StringBuilder stringBuilder) {
 
         List<WgdCgfy> res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file);
-
+        if (res != null){
             QueryWrapper<WgdCgfy> queryWrapper = new QueryWrapper<>();
             queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id"));
             List<WgdCgfy> wgdCgfy=iWgdCgfyService.list(queryWrapper);
@@ -94,8 +94,13 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
             });
             if (res.size()>0 && iWgdCgfyService.saveOrUpdateBatch(res)) {
                 return res;
+            }else {
+                stringBuilder.append("表格数据全部重复");
+            }
+            return res;
         }else {
             return null;
         }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java

@@ -75,7 +75,7 @@ public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> impleme
     @Override
     public List<WgdFyfy> importFyfy(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdFyfy> res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file);
-
+        if (res != null){
             QueryWrapper<WgdFyfy> queryWrapper = new QueryWrapper<>();
             queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id"));
             List<WgdFyfy> wgdFyfy=iWgdFyfyService.list(queryWrapper);
@@ -97,5 +97,9 @@ public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> impleme
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java

@@ -80,6 +80,7 @@ public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements
     public List<WgdSrb> importSrb(MultipartFile file, StringBuilder stringBuilder) {
 
         List<WgdSrb> res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdSrb wgdSrb: res) {
@@ -113,5 +114,9 @@ public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java

@@ -77,6 +77,7 @@ public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> impleme
     @Override
     public List<WgdWbtj> importWbtj(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdWbtj> res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdWbtj wgdWbtj: res) {
@@ -166,5 +167,9 @@ public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> impleme
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java

@@ -79,6 +79,7 @@ public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> impleme
 
 
         List<WgdWbxd> res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdWbxd wgdWbxd: res) {
@@ -152,5 +153,9 @@ public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> impleme
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java

@@ -75,7 +75,7 @@ public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements
     public List<WgdZcb> importZcb(MultipartFile file, StringBuilder stringBuilder) {
 
         List<WgdZcb> res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file);
-
+        if (res != null){
             QueryWrapper<WgdZcb> queryWrapper = new QueryWrapper<>();
             queryWrapper.select(WgdZcb.class, info -> !info.getColumn().equals("id"));
             List<WgdZcb> wgdZcb=iWgdZcbService.list(queryWrapper);
@@ -102,5 +102,9 @@ public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java

@@ -90,6 +90,7 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
     @Override
     public List<WgdAssocCost> importAssocCosts(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdAssocCost> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdAssocCost wgdAssocCost: res) {
@@ -142,5 +143,9 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java

@@ -79,6 +79,7 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
     @Override
     public List<WgdAssocInfo> delWithWkData(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdAssocInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdAssocInfo importExcelDTO: res) {
@@ -158,5 +159,9 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java

@@ -81,6 +81,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
     @Override
     public List<WgdCommiInfo> importCommiInfo(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdCommiInfo> res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdCommiInfo wgdCommiInfo: res) {
@@ -151,5 +152,9 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java

@@ -76,7 +76,7 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
     @Override
     public List<WgdExReviseCost> importExReviseCost(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdExReviseCost> res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file);
-
+        if (res != null){
             QueryWrapper<WgdExReviseCost> queryWrapper = new QueryWrapper<>();
             queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id"));
             List<WgdExReviseCost> wgdExReviseCost=iWgdExReviseCostService.list(queryWrapper);
@@ -98,5 +98,9 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java

@@ -78,6 +78,7 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
     @Override
     public List<WgdMeetCost> importMeetCost(MultipartFile file, StringBuilder stringBuilder) {
         List<WgdMeetCost> res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file);
+        if (res != null){
             DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
             int i=1;
             for (WgdMeetCost wgdCommiInfo: res) {
@@ -111,5 +112,9 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
                 stringBuilder.append("表格数据全部重复");
             }
             return res;
+        }else {
+            return null;
+        }
+
     }
 }