Skip to content

Q
qianhe-ydsj
Commit dc05e871 by jiang'yun
Options

修改问题

parent 7ccbabf1
Showing with 11 additions and 10 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwfjxcjController.java
...@@ -188,41 +188,40 @@ public class SjZdbfZsdwfjxcjController extends BaseController ...@@ -188,41 +188,40 @@ public class SjZdbfZsdwfjxcjController extends BaseController
//日期 //日期
String rq=new DataFormatter().formatCellValue(row.getCell(1)); String rq=new DataFormatter().formatCellValue(row.getCell(1));
if(StringUtils.isEmpty(rq)){ if(StringUtils.isEmpty(rq)){
return AjaxResult.error("导入失败，日期不能为空"); return AjaxResult.error("导入失败，第"+(i+1)+"行日期不能为空");
} }
zsdwwtcj.setRq(rq); zsdwwtcj.setRq(rq);
//单位 //单位
String dw=new DataFormatter().formatCellValue(row.getCell(2)) ; String dw=new DataFormatter().formatCellValue(row.getCell(2)) ;
if(StringUtils.isEmpty(dw)){ if(StringUtils.isEmpty(dw)){
return AjaxResult.error("导入失败，单位不能为空"); return AjaxResult.error("导入失败，第"+(i+1)+"行单位不能为空");
} }
//查询单位id //查询单位id
String[] split = dw.split("/"); String[] split = dw.split("/");
if(split.length<2){ if(split.length<2){
return AjaxResult.error("导入失败，输入的单位格式有误!"); return AjaxResult.error("导入失败，第"+(i+1)+"行输入的单位格式有误!");
} }
String ejdw=split[0]; String ejdw=split[0];
SysDept ejdept = deptList.stream().filter(dept -> dept.getDeptName().equals(ejdw)).findFirst().orElse(null); SysDept ejdept = deptList.stream().filter(dept -> dept.getDeptName().equals(ejdw)).findFirst().orElse(null);
if(ejdept==null){ if(ejdept==null){
return AjaxResult.error("导入失败，未匹配到二级单位"); return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到二级单位");
} }
String sjdw=split[1]; String sjdw=split[1];
SysDept sjdept = deptList.stream().filter(dept -> dept.getDeptName().equals(sjdw) && dept.getParentId().equals(ejdept.getDeptId())).findFirst().orElse(null); SysDept sjdept = deptList.stream().filter(dept -> dept.getDeptName().equals(sjdw) && dept.getParentId().equals(ejdept.getDeptId())).findFirst().orElse(null);
if(sjdept==null){ if(sjdept==null){
return AjaxResult.error("导入失败，未匹配到三级单位"); return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到三级单位");
} }
zsdwwtcj.setDeptId(sjdept.getDeptId()); zsdwwtcj.setDeptId(sjdept.getDeptId());
//分类名称 //分类名称
String flmc=new DataFormatter().formatCellValue(row.getCell(3)) ; String flmc=new DataFormatter().formatCellValue(row.getCell(3)) ;
if(StringUtils.isEmpty(flmc)){ if(StringUtils.isEmpty(flmc)){
return AjaxResult.error("导入失败，分类名称不能为空"); return AjaxResult.error("导入失败，第"+(i+1)+"行分类名称不能为空");
} }
zsdwwtcj.setFlmc(flmc); zsdwwtcj.setFlmc(flmc);
//评价标准 //评价标准
String pjbz=new DataFormatter().formatCellValue(row.getCell(4)) ; String pjbz=new DataFormatter().formatCellValue(row.getCell(4)) ;
if(StringUtils.isEmpty(pjbz)){ if(StringUtils.isEmpty(pjbz)){
return AjaxResult.error("导入失败，评价标准不能为空"); return AjaxResult.error("导入失败，第"+(i+1)+"行评价标准不能为空");
} }
//匹配评价标准 //匹配评价标准
String substring = pjbz.substring(4); String substring = pjbz.substring(4);
...@@ -233,13 +232,12 @@ public class SjZdbfZsdwfjxcjController extends BaseController ...@@ -233,13 +232,12 @@ public class SjZdbfZsdwfjxcjController extends BaseController
sjZdbfFjxbzCb.setNd(rq.substring(0,4)); sjZdbfFjxbzCb.setNd(rq.substring(0,4));
SjZdbfFjxbzCb cb=sjZdbfFjxbzMapper.selectSjZdbfFjxbzCb(sjZdbfFjxbzCb); SjZdbfFjxbzCb cb=sjZdbfFjxbzMapper.selectSjZdbfFjxbzCb(sjZdbfFjxbzCb);
if(cb==null){ if(cb==null){
return AjaxResult.error("导入失败，未匹配到评价标准"); return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到评价标准");
} }
zsdwwtcj.setPjbzid(cb.getId()+""); zsdwwtcj.setPjbzid(cb.getId()+"");
zsdwwtcj.setPjbzmc(cb.getPjbz()); zsdwwtcj.setPjbzmc(cb.getPjbz());
String wtms=new DataFormatter().formatCellValue(row.getCell(5)) ; String wtms=new DataFormatter().formatCellValue(row.getCell(5)) ;
zsdwwtcj.setWtmc(wtms); zsdwwtcj.setWtmc(wtms);
list.add(zsdwwtcj); list.add(zsdwwtcj);
} }
if(list.size()>0){ if(list.size()>0){
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwwtcjController.java
...@@ -240,6 +240,9 @@ public class SjZdbfZsdwwtcjController extends BaseController ...@@ -240,6 +240,9 @@ public class SjZdbfZsdwwtcjController extends BaseController
sjZdbfKhpjbzCb.setKhxd(khxd); sjZdbfKhpjbzCb.setKhxd(khxd);
sjZdbfKhpjbzCb.setKhnr(khnr); sjZdbfKhpjbzCb.setKhnr(khnr);
sjZdbfKhpjbzCb.setLx(sjdept.getDeptLx()); sjZdbfKhpjbzCb.setLx(sjdept.getDeptLx());
if(StringUtils.isEmpty(sjdept.getDeptLx())){
return AjaxResult.error("导入失败，第"+(i+1)+"行单位未设置类型");
}
sjZdbfKhpjbzCb.setPx(l); sjZdbfKhpjbzCb.setPx(l);
sjZdbfKhpjbzCb.setNd(rq.substring(0,4)); sjZdbfKhpjbzCb.setNd(rq.substring(0,4));
SjZdbfKhpjbzCb cb=sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzCb(sjZdbfKhpjbzCb); SjZdbfKhpjbzCb cb=sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzCb(sjZdbfKhpjbzCb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment