diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java index e781eceb..d0ad9787 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java @@ -1,9 +1,6 @@ package org.jeecg.modules.kc.kcZzThpjb.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -224,7 +221,7 @@ public class KcZzThpjbController extends JeecgController newList = list; + List newList = new ArrayList<>(); int errNum = 0; for(int i=0;i listPar = kcZzThpjbService.list(queryWrapper); if(listPar!=null&&listPar.size()>0){ errNum++; - newList.remove(KcZzThpjbPar); - errorRest += "数据重复:"+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"
"; + errorRest += "已经导入(重复数据):"+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"
"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh()); @@ -252,7 +248,7 @@ public class KcZzThpjbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); - + newList.add(KcZzThpjbPar); KcTingke kcTingke = new KcTingke(); kcTingke.setTingketime(DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd")); kcTingke.setKechengbiaoid(KcKetangbiao.getId()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java index 90b607f5..3dab554c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java @@ -1,9 +1,6 @@ package org.jeecg.modules.kc.kcZzXstkb.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -207,7 +204,7 @@ public class KcZzXstkbController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzXstkb.class, params); String rest = ""; String errorRest = ""; - List newList = list; + List newList = new ArrayList<>(); int errNum = 0; for(int i=0;i listPar = kcZzXstkbService.list(queryWrapper); if(listPar!=null&&listPar.size()>0){ errNum++; - newList.remove(KcZzXstkbPar); - errorRest += KcZzXstkbPar.getKcbh()+"-"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"
"; + errorRest += "已经导入(重复数据):"+KcZzXstkbPar.getKcbh()+"-"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"
"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh()); @@ -234,6 +230,7 @@ public class KcZzXstkbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ + newList.add(KcZzXstkbPar); KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); KcTingke kcTingke = new KcTingke(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java index fb5693b1..7d6286ff 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java @@ -1,9 +1,6 @@ package org.jeecg.modules.kc.kcZzYbtkb.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -225,7 +222,7 @@ public class KcZzYbtkbController extends JeecgController newList = list; + List newList = new ArrayList<>(); int errNum = 0; for(int i=0;i listPar = kcZzYbtkbService.list(queryWrapper); if(listPar!=null&&listPar.size()>0){ errNum++; - newList.remove(KcZzYbtkbPar); errorRest += "已经导入(重复数据):"+KcZzYbtkbPar.getKcmc()+"-"+KcZzYbtkbPar.getSkjs()+"-"+KcZzYbtkbPar.getSkdd()+"-"+KcZzYbtkbPar.getTkjsbh()+"-"+KcZzYbtkbPar.getTkjsxm()+"
"; }else{ QueryWrapper kcKetangbiaoQueryWrapper = new QueryWrapper<>(); @@ -252,6 +248,7 @@ public class KcZzYbtkbController extends JeecgController kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){ + newList.add(KcZzYbtkbPar); KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0); KcTingke kcTingke = new KcTingke();