修改导入时的校验

This commit is contained in:
yangjun 2023-06-30 21:42:24 +08:00
parent f99dbacb0c
commit 1506bd9f72
3 changed files with 11 additions and 21 deletions

View File

@ -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<KcZzThpjb, IKcZzThpjbSe
}
}
List<KcZzThpjb> newList = list;
List<KcZzThpjb> newList = new ArrayList<>();
int errNum = 0;
for(int i=0;i<list.size();i++){
KcZzThpjb KcZzThpjbPar = list.get(i);
@ -240,8 +237,7 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
List<KcZzThpjb> listPar = kcZzThpjbService.list(queryWrapper);
if(listPar!=null&&listPar.size()>0){
errNum++;
newList.remove(KcZzThpjbPar);
errorRest += "数据重复:"+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"<br/>";
errorRest += "已经导入(重复数据):"+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
@ -252,7 +248,7 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
List<KcKetangbiao> 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());

View File

@ -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<KcZzXstkb, IKcZzXstkbSe
List<KcZzXstkb> list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzXstkb.class, params);
String rest = "";
String errorRest = "";
List<KcZzXstkb> newList = list;
List<KcZzXstkb> newList = new ArrayList<>();
int errNum = 0;
for(int i=0;i<list.size();i++){
KcZzXstkb KcZzXstkbPar = list.get(i);
@ -223,8 +220,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
List<KcZzXstkb> 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()+"<br/>";
errorRest += "已经导入(重复数据):"+KcZzXstkbPar.getKcbh()+"-"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
@ -234,6 +230,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
kcKetangbiaoQueryWrapper.eq("skjs",KcZzXstkbPar.getSkjs());
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
newList.add(KcZzXstkbPar);
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
KcTingke kcTingke = new KcTingke();

View File

@ -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<KcZzYbtkb, IKcZzYbtkbSe
}
}
List<KcZzYbtkb> newList = list;
List<KcZzYbtkb> newList = new ArrayList<>();
int errNum = 0;
for(int i=0;i<list.size();i++){
KcZzYbtkb KcZzYbtkbPar = list.get(i);
@ -241,7 +238,6 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
List<KcZzYbtkb> 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()+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
@ -252,6 +248,7 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
kcKetangbiaoQueryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs());
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
newList.add(KcZzYbtkbPar);
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
KcTingke kcTingke = new KcTingke();