Skip to content

Z
zjsgfa_mysql
Commit 20b31340 by jiang'yun
Options

修改

parent 2b2031e6
Showing with 224 additions and 59 deletions
src/main/java/com/ruoyi/project/zjsgfa/controller/SjDjjcController.java
...@@ -246,6 +246,9 @@ public class SjDjjcController extends BaseController ...@@ -246,6 +246,9 @@ public class SjDjjcController extends BaseController
} }
// 获取行 // 获取行
XSSFRow row = sheet.getRow(i); XSSFRow row = sheet.getRow(i);
if(row==null){
continue;
}
SjDjjc info=new SjDjjc(); SjDjjc info=new SjDjjc();
jh=new DataFormatter().formatCellValue(row.getCell(0)); jh=new DataFormatter().formatCellValue(row.getCell(0));
if(StringUtils.isEmpty(jh)){ if(StringUtils.isEmpty(jh)){
...@@ -318,6 +321,9 @@ public class SjDjjcController extends BaseController ...@@ -318,6 +321,9 @@ public class SjDjjcController extends BaseController
for(int i=4 ; i<=lastRowNum;i++){ for(int i=4 ; i<=lastRowNum;i++){
XSSFRow row = sheet.getRow(i); XSSFRow row = sheet.getRow(i);
if(row==null){
continue;
}
SjDzfc sjDzfc =new SjDzfc(); SjDzfc sjDzfc =new SjDzfc();
sjDzfc.setSjjh(jh); sjDzfc.setSjjh(jh);
sjDzfc.setYjjh1(yjjh1); sjDzfc.setYjjh1(yjjh1);
...@@ -339,19 +345,32 @@ public class SjDjjcController extends BaseController ...@@ -339,19 +345,32 @@ public class SjDjjcController extends BaseController
sjDzfc.setDcD(dcD); sjDzfc.setDcD(dcD);
String sjdcs=new DataFormatter().formatCellValue( row.getCell(5)); String sjdcs=new DataFormatter().formatCellValue( row.getCell(5));
sjDzfc.setSjdcs(Double.parseDouble(sjdcs)); if(StringUtils.isNotEmpty(sjdcs)){
sjDzfc.setSjdcs(Double.parseDouble(sjdcs));
}
String sjjcgx=new DataFormatter().formatCellValue( row.getCell(6)); String sjjcgx=new DataFormatter().formatCellValue( row.getCell(6));
sjDzfc.setSjjcgx(sjjcgx); sjDzfc.setSjjcgx(sjjcgx);
String sjhd=new DataFormatter().formatCellValue( row.getCell(7)); String sjhd=new DataFormatter().formatCellValue( row.getCell(7));
sjDzfc.setSjhd(Double.parseDouble(sjhd)); if(StringUtils.isNotEmpty(sjhd)){
sjDzfc.setSjhd(Double.parseDouble(sjhd));
}
String sjddsd=new DataFormatter().formatCellValue( row.getCell(8)); String sjddsd=new DataFormatter().formatCellValue( row.getCell(8));
sjDzfc.setSjddsd(Double.parseDouble(sjddsd)); if(StringUtils.isNotEmpty(sjddsd)){
sjDzfc.setSjddsd(Double.parseDouble(sjddsd));
}
String yjdcs1=new DataFormatter().formatCellValue( row.getCell(9)); String yjdcs1=new DataFormatter().formatCellValue( row.getCell(9));
sjDzfc.setYjdcs1(Double.parseDouble(yjdcs1)); if(StringUtils.isNotEmpty(yjdcs1)){
sjDzfc.setYjdcs1(Double.parseDouble(yjdcs1));
}
String yjjcgx1=new DataFormatter().formatCellValue( row.getCell(10)); String yjjcgx1=new DataFormatter().formatCellValue( row.getCell(10));
sjDzfc.setYjjcgx1(yjjcgx1); sjDzfc.setYjjcgx1(yjjcgx1);
...@@ -360,11 +379,17 @@ public class SjDjjcController extends BaseController ...@@ -360,11 +379,17 @@ public class SjDjjcController extends BaseController
sjDzfc.setYjhyjd1(yjhyjd1); sjDzfc.setYjhyjd1(yjhyjd1);
String yjddsd1=new DataFormatter().formatCellValue( row.getCell(12)); String yjddsd1=new DataFormatter().formatCellValue( row.getCell(12));
sjDzfc.setYjddsd1(Double.parseDouble(yjddsd1)); if(StringUtils.isNotEmpty(yjddsd1)){
sjDzfc.setYjddsd1(Double.parseDouble(yjddsd1));
}
String yjdcs2=new DataFormatter().formatCellValue( row.getCell(13)); String yjdcs2=new DataFormatter().formatCellValue( row.getCell(13));
sjDzfc.setYjdcs2(Double.parseDouble(yjdcs2)); if(StringUtils.isNotEmpty(yjdcs2)){
sjDzfc.setYjdcs2(Double.parseDouble(yjdcs2));
}
String yjjcgx2=new DataFormatter().formatCellValue( row.getCell(14)); String yjjcgx2=new DataFormatter().formatCellValue( row.getCell(14));
sjDzfc.setYjjcgx2(yjjcgx2); sjDzfc.setYjjcgx2(yjjcgx2);
...@@ -373,7 +398,10 @@ public class SjDjjcController extends BaseController ...@@ -373,7 +398,10 @@ public class SjDjjcController extends BaseController
sjDzfc.setYjhyjd2(yjhyjd2); sjDzfc.setYjhyjd2(yjhyjd2);
String yjddsd2=new DataFormatter().formatCellValue( row.getCell(16)); String yjddsd2=new DataFormatter().formatCellValue( row.getCell(16));
sjDzfc.setYjddsd2(Double.parseDouble(yjddsd2)); if(StringUtils.isNotEmpty(yjddsd2)){
sjDzfc.setYjddsd2(Double.parseDouble(yjddsd2));
}
sjDzfcList.add(sjDzfc); sjDzfcList.add(sjDzfc);
} }
...@@ -396,6 +424,9 @@ public class SjDjjcController extends BaseController ...@@ -396,6 +424,9 @@ public class SjDjjcController extends BaseController
SjJsjg sjJsjg =new SjJsjg(); SjJsjg sjJsjg =new SjJsjg();
sjJsjg.setJh(jh); sjJsjg.setJh(jh);
XSSFRow row = sheet.getRow(i); XSSFRow row = sheet.getRow(i);
if(row==null){
continue;
}
String kc=new DataFormatter().formatCellValue(row.getCell(0)); String kc=new DataFormatter().formatCellValue(row.getCell(0));
if(StringUtils.isEmpty(kc)){ if(StringUtils.isEmpty(kc)){
return AjaxResult.error("井身结构表第"+(i+1)+"行开次不能为空"); return AjaxResult.error("井身结构表第"+(i+1)+"行开次不能为空");
...@@ -524,6 +555,9 @@ public class SjDjjcController extends BaseController ...@@ -524,6 +555,9 @@ public class SjDjjcController extends BaseController
List<SjJygjGdfdcs> sjJygjGdfdcsList=new ArrayList<>(); List<SjJygjGdfdcs> sjJygjGdfdcsList=new ArrayList<>();
for(int i=5; i<=lastRowNum;i++){ for(int i=5; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjJygjGdfdcs gdfdcs =new SjJygjGdfdcs(); SjJygjGdfdcs gdfdcs =new SjJygjGdfdcs();
gdfdcs.setJh(jh); gdfdcs.setJh(jh);
String js=new DataFormatter().formatCellValue(row.getCell(0)); String js=new DataFormatter().formatCellValue(row.getCell(0));
...@@ -573,6 +607,9 @@ public class SjDjjcController extends BaseController ...@@ -573,6 +607,9 @@ public class SjDjjcController extends BaseController
List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList=new ArrayList<>(); List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList=new ArrayList<>();
for(int i=3; i<=lastRowNum;i++){ for(int i=3; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjJygjGdsjgdcs gdfdcs =new SjJygjGdsjgdcs(); SjJygjGdsjgdcs gdfdcs =new SjJygjGdsjgdcs();
gdfdcs.setJh(jh); gdfdcs.setJh(jh);
int ks=11; int ks=11;
...@@ -582,35 +619,65 @@ public class SjDjjcController extends BaseController ...@@ -582,35 +619,65 @@ public class SjDjjcController extends BaseController
} }
gdfdcs.setJs(Double.parseDouble(js)); gdfdcs.setJs(Double.parseDouble(js));
String jx=new DataFormatter().formatCellValue(row.getCell(ks+1)); String jx=new DataFormatter().formatCellValue(row.getCell(ks+1));
gdfdcs.setJx(Double.parseDouble(jx)); if(StringUtils.isNotEmpty(jx)){
gdfdcs.setJx(Double.parseDouble(jx));
}
String fw=new DataFormatter().formatCellValue(row.getCell(ks+2)); String fw=new DataFormatter().formatCellValue(row.getCell(ks+2));
gdfdcs.setFw(Double.parseDouble(fw)); if(StringUtils.isNotEmpty(fw)){
gdfdcs.setFw(Double.parseDouble(fw));
}
String bhfw=new DataFormatter().formatCellValue(row.getCell(ks+3)); String bhfw=new DataFormatter().formatCellValue(row.getCell(ks+3));
gdfdcs.setBhfw(Double.parseDouble(bhfw)); gdfdcs.setBhfw(Double.parseDouble(bhfw));
cs=new DataFormatter().formatCellValue(row.getCell(ks+4)); String cs1=new DataFormatter().formatCellValue(row.getCell(ks+4));
gdfdcs.setCs(Double.parseDouble(cs)); if(StringUtils.isNotEmpty(cs1)){
gdfdcs.setCs(Double.parseDouble(cs1));
}
bhj=new DataFormatter().formatCellValue(row.getCell(ks+5)); bhj=new DataFormatter().formatCellValue(row.getCell(ks+5));
gdfdcs.setBhj(Double.parseDouble(bhj)); if(StringUtils.isNotEmpty(bhj)){
gdfdcs.setBhj(Double.parseDouble(bhj));
}
String nbwy=new DataFormatter().formatCellValue(row.getCell(ks+6)); String nbwy=new DataFormatter().formatCellValue(row.getCell(ks+6));
gdfdcs.setNbwy(Double.parseDouble(nbwy)); if(StringUtils.isNotEmpty(nbwy)){
gdfdcs.setNbwy(Double.parseDouble(nbwy));
}
String dxwy=new DataFormatter().formatCellValue(row.getCell(ks+7)); String dxwy=new DataFormatter().formatCellValue(row.getCell(ks+7));
gdfdcs.setDxwy(Double.parseDouble(dxwy)); if(StringUtils.isNotEmpty(dxwy)){
gdfdcs.setDxwy(Double.parseDouble(dxwy));
}
String zxl=new DataFormatter().formatCellValue(row.getCell(ks+8)); String zxl=new DataFormatter().formatCellValue(row.getCell(ks+8));
gdfdcs.setZxl(Double.parseDouble(zxl)); if(StringUtils.isNotEmpty(zxl)){
gdfdcs.setZxl(Double.parseDouble(zxl));
}
String fwbhl=new DataFormatter().formatCellValue(row.getCell(ks+9)); String fwbhl=new DataFormatter().formatCellValue(row.getCell(ks+9));
gdfdcs.setFwbhl(Double.parseDouble(fwbhl)); if(StringUtils.isNotEmpty(fwbhl)){
gdfdcs.setFwbhl(Double.parseDouble(fwbhl));
}
String qjbhl=new DataFormatter().formatCellValue(row.getCell(ks+10)); String qjbhl=new DataFormatter().formatCellValue(row.getCell(ks+10));
gdfdcs.setQjbhl(Double.parseDouble(qjbhl)); if(StringUtils.isNotEmpty(qjbhl)){
gdfdcs.setQjbhl(Double.parseDouble(qjbhl));
}
String gjm=new DataFormatter().formatCellValue(row.getCell(ks+11)); String gjm=new DataFormatter().formatCellValue(row.getCell(ks+11));
gdfdcs.setGjm(Double.parseDouble(gjm)); if(StringUtils.isNotEmpty(gjm)){
gdfdcs.setGjm(Double.parseDouble(gjm));
}
sjJygjGdsjgdcsList.add(gdfdcs); sjJygjGdsjgdcsList.add(gdfdcs);
} }
...@@ -627,6 +694,9 @@ public class SjDjjcController extends BaseController ...@@ -627,6 +694,9 @@ public class SjDjjcController extends BaseController
List<SjZjyFdsj> sjZjyFdsjList =new ArrayList<>(); List<SjZjyFdsj> sjZjyFdsjList =new ArrayList<>();
for(int i=2; i<=lastRowNum;i++){ for(int i=2; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZjyFdsj fdsj =new SjZjyFdsj(); SjZjyFdsj fdsj =new SjZjyFdsj();
fdsj.setJh(jh); fdsj.setJh(jh);
String kc=new DataFormatter().formatCellValue(row.getCell(0)); String kc=new DataFormatter().formatCellValue(row.getCell(0));
...@@ -650,6 +720,9 @@ public class SjDjjcController extends BaseController ...@@ -650,6 +720,9 @@ public class SjDjjcController extends BaseController
List<SjZjyCljl> sjZjyCljlList =new ArrayList<>(); List<SjZjyCljl> sjZjyCljlList =new ArrayList<>();
for(int i=2; i<=lastRowNum;i++){ for(int i=2; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZjyCljl cljl =new SjZjyCljl(); SjZjyCljl cljl =new SjZjyCljl();
cljl.setJh(jh); cljl.setJh(jh);
int ks =5; int ks =5;
...@@ -684,6 +757,9 @@ public class SjDjjcController extends BaseController ...@@ -684,6 +757,9 @@ public class SjDjjcController extends BaseController
List<SjZjyFdxnb> sjZjyFdxnbList =new ArrayList<>(); List<SjZjyFdxnb> sjZjyFdxnbList =new ArrayList<>();
for(int i=2; i<=lastRowNum;i++){ for(int i=2; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZjyFdxnb fdxnb =new SjZjyFdxnb(); SjZjyFdxnb fdxnb =new SjZjyFdxnb();
fdxnb.setJh(jh); fdxnb.setJh(jh);
int ks =12; int ks =12;
...@@ -741,6 +817,9 @@ public class SjDjjcController extends BaseController ...@@ -741,6 +817,9 @@ public class SjDjjcController extends BaseController
List<SjTgTgz> sjTgTgzList =new ArrayList<>(); List<SjTgTgz> sjTgTgzList =new ArrayList<>();
for(int i=4; i<=lastRowNum;i++){ for(int i=4; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjTgTgz tgTgz =new SjTgTgz(); SjTgTgz tgTgz =new SjTgTgz();
tgTgz.setJh(jh); tgTgz.setJh(jh);
String kc=new DataFormatter().formatCellValue(row.getCell(0)); String kc=new DataFormatter().formatCellValue(row.getCell(0));
...@@ -753,26 +832,41 @@ public class SjDjjcController extends BaseController ...@@ -753,26 +832,41 @@ public class SjDjjcController extends BaseController
tgTgz.setJd(jd); tgTgz.setJd(jd);
String wj=new DataFormatter().formatCellValue(row.getCell(2)); String wj=new DataFormatter().formatCellValue(row.getCell(2));
tgTgz.setWj(Double.parseDouble(wj)); if(StringUtils.isNotEmpty(wj)){
tgTgz.setWj(Double.parseDouble(wj));
}
String gj=new DataFormatter().formatCellValue(row.getCell(3)); String gj=new DataFormatter().formatCellValue(row.getCell(3));
tgTgz.setGj(gj); tgTgz.setGj(gj);
String bh=new DataFormatter().formatCellValue(row.getCell(4)); String bh=new DataFormatter().formatCellValue(row.getCell(4));
tgTgz.setBh(Double.parseDouble(bh)); if(StringUtils.isNotEmpty(bh)){
tgTgz.setBh(Double.parseDouble(bh));
}
String kx=new DataFormatter().formatCellValue(row.getCell(5)); String kx=new DataFormatter().formatCellValue(row.getCell(5));
tgTgz.setKx(kx); tgTgz.setKx(kx);
String zjsknj=new DataFormatter().formatCellValue(row.getCell(6)); String zjsknj=new DataFormatter().formatCellValue(row.getCell(6));
tgTgz.setZjsknj(Double.parseDouble(zjsknj)); if(StringUtils.isNotEmpty(zjsknj)){
tgTgz.setZjsknj(Double.parseDouble(zjsknj));
}
String cd=new DataFormatter().formatCellValue(row.getCell(7)); String cd=new DataFormatter().formatCellValue(row.getCell(7));
tgTgz.setCd(Double.parseDouble(cd)); if(StringUtils.isNotEmpty(cd)){
tgTgz.setCd(Double.parseDouble(cd));
}
String zjymd=new DataFormatter().formatCellValue(row.getCell(8)); String zjymd=new DataFormatter().formatCellValue(row.getCell(8));
tgTgz.setZjymd(Double.parseDouble(zjymd)); if(StringUtils.isNotEmpty(zjymd)){
tgTgz.setZjymd(Double.parseDouble(zjymd));
}
sjTgTgzList.add(tgTgz); sjTgTgzList.add(tgTgz);
} }
...@@ -787,6 +881,9 @@ public class SjDjjcController extends BaseController ...@@ -787,6 +881,9 @@ public class SjDjjcController extends BaseController
for(int i=4; i<=lastRowNum;i++){ for(int i=4; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjTgTgxnsj tgTgz =new SjTgTgxnsj(); SjTgTgxnsj tgTgz =new SjTgTgxnsj();
tgTgz.setJh(jh); tgTgz.setJh(jh);
int ks =11; int ks =11;
...@@ -800,26 +897,44 @@ public class SjDjjcController extends BaseController ...@@ -800,26 +897,44 @@ public class SjDjjcController extends BaseController
tgTgz.setGj(gj); tgTgz.setGj(gj);
String bh=new DataFormatter().formatCellValue(row.getCell(ks+2)); String bh=new DataFormatter().formatCellValue(row.getCell(ks+2));
tgTgz.setBh(Double.parseDouble(bh)); if(StringUtils.isNotEmpty(bh)){
tgTgz.setBh(Double.parseDouble(bh));
}
String kx=new DataFormatter().formatCellValue(row.getCell(ks+3)); String kx=new DataFormatter().formatCellValue(row.getCell(ks+3));
tgTgz.setKx(kx); tgTgz.setKx(kx);
String mmzl=new DataFormatter().formatCellValue(row.getCell(ks+4)); String mmzl=new DataFormatter().formatCellValue(row.getCell(ks+4));
tgTgz.setMmzl(Double.parseDouble(mmzl)); if(StringUtils.isNotEmpty(mmzl)){
tgTgz.setMmzl(Double.parseDouble(mmzl));
}
String jgwj=new DataFormatter().formatCellValue(row.getCell(ks+5)); String jgwj=new DataFormatter().formatCellValue(row.getCell(ks+5));
tgTgz.setJgwj(Double.parseDouble(jgwj)); if(StringUtils.isNotEmpty(jgwj)){
tgTgz.setJgwj(Double.parseDouble(jgwj));
}
String klqd=new DataFormatter().formatCellValue(row.getCell(ks+6)); String klqd=new DataFormatter().formatCellValue(row.getCell(ks+6));
tgTgz.setKlqd(Double.parseDouble(klqd)); if(StringUtils.isNotEmpty(klqd)){
tgTgz.setKlqd(Double.parseDouble(klqd));
}
String kjqd=new DataFormatter().formatCellValue(row.getCell(ks+7)); String kjqd=new DataFormatter().formatCellValue(row.getCell(ks+7));
tgTgz.setKjqd(Double.parseDouble(kjqd)); if(StringUtils.isNotEmpty(kjqd)){
tgTgz.setKjqd(Double.parseDouble(kjqd));
}
String knyqd=new DataFormatter().formatCellValue(row.getCell(ks+8)); String knyqd=new DataFormatter().formatCellValue(row.getCell(ks+8));
tgTgz.setKnyqd(Double.parseDouble(knyqd)); if(StringUtils.isNotEmpty(knyqd)){
tgTgz.setKnyqd(Double.parseDouble(knyqd));
}
sjTgTgxnsjList.add(tgTgz); sjTgTgxnsjList.add(tgTgz);
} }
if(sjTgTgxnsjList.size()>0){ if(sjTgTgxnsjList.size()>0){
...@@ -831,6 +946,9 @@ public class SjDjjcController extends BaseController ...@@ -831,6 +946,9 @@ public class SjDjjcController extends BaseController
List<SjTgTgqdjh> sjTgTgqdjhList =new ArrayList<>(); List<SjTgTgqdjh> sjTgTgqdjhList =new ArrayList<>();
for(int i=4; i<=lastRowNum;i++){ for(int i=4; i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjTgTgqdjh tgTgz =new SjTgTgqdjh(); SjTgTgqdjh tgTgz =new SjTgTgqdjh();
tgTgz.setJh(jh); tgTgz.setJh(jh);
int ks =22; int ks =22;
...@@ -843,32 +961,59 @@ public class SjDjjcController extends BaseController ...@@ -843,32 +961,59 @@ public class SjDjjcController extends BaseController
tgTgz.setJd(jd); tgTgz.setJd(jd);
String mmzl=new DataFormatter().formatCellValue(row.getCell(ks+2)); String mmzl=new DataFormatter().formatCellValue(row.getCell(ks+2));
tgTgz.setMmzl(Double.parseDouble(mmzl)); if(StringUtils.isNotEmpty(mmzl)){
tgTgz.setMmzl(Double.parseDouble(mmzl));
}
String djz=new DataFormatter().formatCellValue(row.getCell(ks+3)); String djz=new DataFormatter().formatCellValue(row.getCell(ks+3));
tgTgz.setDjz(Double.parseDouble(djz)); if(StringUtils.isNotEmpty(djz)){
tgTgz.setDjz(Double.parseDouble(djz));
}
String ljz=new DataFormatter().formatCellValue(row.getCell(ks+4)); String ljz=new DataFormatter().formatCellValue(row.getCell(ks+4));
tgTgz.setLjz(Double.parseDouble(ljz)); if(StringUtils.isNotEmpty(ljz)){
tgTgz.setLjz(Double.parseDouble(ljz));
}
String zdzhkwj=new DataFormatter().formatCellValue(row.getCell(ks+5)); String zdzhkwj=new DataFormatter().formatCellValue(row.getCell(ks+5));
tgTgz.setZdzhkwj(Double.parseDouble(zdzhkwj)); if(StringUtils.isNotEmpty(zdzhkwj)){
tgTgz.setZdzhkwj(Double.parseDouble(zdzhkwj));
}
String aqxskwj=new DataFormatter().formatCellValue(row.getCell(ks+6)); String aqxskwj=new DataFormatter().formatCellValue(row.getCell(ks+6));
tgTgz.setAqxskwj(Double.parseDouble(aqxskwj)); if(StringUtils.isNotEmpty(aqxskwj)){
tgTgz.setAqxskwj(Double.parseDouble(aqxskwj));
}
String zdzhkny=new DataFormatter().formatCellValue(row.getCell(ks+7)); String zdzhkny=new DataFormatter().formatCellValue(row.getCell(ks+7));
tgTgz.setZdzhkny(Double.parseDouble(zdzhkny)); if(StringUtils.isNotEmpty(zdzhkny)){
tgTgz.setZdzhkny(Double.parseDouble(zdzhkny));
}
String aqxskny=new DataFormatter().formatCellValue(row.getCell(ks+8)); String aqxskny=new DataFormatter().formatCellValue(row.getCell(ks+8));
tgTgz.setAqxskny(Double.parseDouble(aqxskny)); if(StringUtils.isNotEmpty(aqxskny)){
tgTgz.setAqxskny(Double.parseDouble(aqxskny));
}
String zdzhkl=new DataFormatter().formatCellValue(row.getCell(ks+9)); String zdzhkl=new DataFormatter().formatCellValue(row.getCell(ks+9));
tgTgz.setZdzhkl(Double.parseDouble(zdzhkl)); if(StringUtils.isNotEmpty(zdzhkl)){
tgTgz.setZdzhkl(Double.parseDouble(zdzhkl));
}
String aqxskl=new DataFormatter().formatCellValue(row.getCell(ks+10)); String aqxskl=new DataFormatter().formatCellValue(row.getCell(ks+10));
tgTgz.setAqxskl(Double.parseDouble(aqxskl)); if(StringUtils.isNotEmpty(aqxskl)){
tgTgz.setAqxskl(Double.parseDouble(aqxskl));
}
sjTgTgqdjhList.add(tgTgz); sjTgTgqdjhList.add(tgTgz);
} }
if(sjTgTgqdjhList.size()>0){ if(sjTgTgqdjhList.size()>0){
...@@ -882,6 +1027,9 @@ public class SjDjjcController extends BaseController ...@@ -882,6 +1027,9 @@ public class SjDjjcController extends BaseController
List<SjZlyq> sjZlyqList =new ArrayList<>(); List<SjZlyq> sjZlyqList =new ArrayList<>();
for(int i=2;i<=lastRowNum;i++){ for(int i=2;i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZlyq sjZlyq =new SjZlyq(); SjZlyq sjZlyq =new SjZlyq();
sjZlyq.setJh(jh); sjZlyq.setJh(jh);
String jd=new DataFormatter().formatCellValue(row.getCell(0)); String jd=new DataFormatter().formatCellValue(row.getCell(0));
...@@ -891,10 +1039,16 @@ public class SjDjjcController extends BaseController ...@@ -891,10 +1039,16 @@ public class SjDjjcController extends BaseController
sjZlyq.setJd(jd); sjZlyq.setJd(jd);
String jxj=new DataFormatter().formatCellValue(row.getCell(1)); String jxj=new DataFormatter().formatCellValue(row.getCell(1));
sjZlyq.setJxj(Double.parseDouble(jxj)); if(StringUtils.isNotEmpty(jxj)){
sjZlyq.setJxj(Double.parseDouble(jxj));
}
String qjbhl=new DataFormatter().formatCellValue(row.getCell(2)); String qjbhl=new DataFormatter().formatCellValue(row.getCell(2));
sjZlyq.setQjbhl(Double.parseDouble(qjbhl)); if(StringUtils.isNotEmpty(qjbhl)){
sjZlyq.setQjbhl(Double.parseDouble(qjbhl));
}
sjZlyqList.add(sjZlyq); sjZlyqList.add(sjZlyq);
} }
...@@ -908,6 +1062,9 @@ public class SjDjjcController extends BaseController ...@@ -908,6 +1062,9 @@ public class SjDjjcController extends BaseController
List<SjZlyqZbyq> sjZlyqZbyqList =new ArrayList<>(); List<SjZlyqZbyq> sjZlyqZbyqList =new ArrayList<>();
for(int i=3;i<=lastRowNum;i++){ for(int i=3;i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZlyqZbyq sjZlyq =new SjZlyqZbyq(); SjZlyqZbyq sjZlyq =new SjZlyqZbyq();
sjZlyq.setJh(jh); sjZlyq.setJh(jh);
...@@ -917,8 +1074,12 @@ public class SjDjjcController extends BaseController ...@@ -917,8 +1074,12 @@ public class SjDjjcController extends BaseController
} }
sjZlyq.setBd(bd); sjZlyq.setBd(bd);
bbj=new DataFormatter().formatCellValue(row.getCell(5)); String bbj1=new DataFormatter().formatCellValue(row.getCell(5));
sjZlyq.setBbj(Double.parseDouble(bbj)); if(StringUtils.isNotEmpty(bbj1)){
sjZlyq.setBbj(Double.parseDouble(bbj1));
}
String bz=new DataFormatter().formatCellValue(row.getCell(6)); String bz=new DataFormatter().formatCellValue(row.getCell(6));
sjZlyq.setBz(bz); sjZlyq.setBz(bz);
...@@ -927,13 +1088,16 @@ public class SjDjjcController extends BaseController ...@@ -927,13 +1088,16 @@ public class SjDjjcController extends BaseController
if(sjZlyqZbyqList.size()>0){ if(sjZlyqZbyqList.size()>0){
sjZlyqZbyqMapper.deleteSjZlyqZbyqByJh(jh); sjZlyqZbyqMapper.deleteSjZlyqZbyqByJh(jh);
sjZlyqZbyqMapper.insertSjZlyqZbyqBatch(sjZlyqList); sjZlyqZbyqMapper.insertSjZlyqZbyqBatch(sjZlyqZbyqList);
} }
//质量要求 中靶要求-定向井end--------------------------------------------------- //质量要求 中靶要求-定向井end---------------------------------------------------
//质量要求 质量要求--------------------------------------------------- //质量要求 质量要求---------------------------------------------------
List<SjZlyqXx> sjZlyqXxList =new ArrayList<>(); List<SjZlyqXx> sjZlyqXxList =new ArrayList<>();
for(int i=3;i<=lastRowNum;i++){ for(int i=3;i<=lastRowNum;i++){
row = sheet.getRow(i); row = sheet.getRow(i);
if(row==null){
continue;
}
SjZlyqXx sjZlyq =new SjZlyqXx(); SjZlyqXx sjZlyq =new SjZlyqXx();
sjZlyq.setJh(jh); sjZlyq.setJh(jh);
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjDzfcController.java
...@@ -41,7 +41,7 @@ public class SjDzfcController extends BaseController ...@@ -41,7 +41,7 @@ public class SjDzfcController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjDzfc sjDzfc) public TableDataInfo list(SjDzfc sjDzfc)
{ {
startPage(); // startPage();
List<SjDzfc> list = sjDzfcService.selectSjDzfcList(sjDzfc); List<SjDzfc> list = sjDzfcService.selectSjDzfcList(sjDzfc);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJsjgController.java
...@@ -46,7 +46,7 @@ public class SjJsjgController extends BaseController ...@@ -46,7 +46,7 @@ public class SjJsjgController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjJsjg sjJsjg) public TableDataInfo list(SjJsjg sjJsjg)
{ {
startPage(); // startPage();
List<SjJsjg> list = sjJsjgService.selectSjJsjgList(sjJsjg); List<SjJsjg> list = sjJsjgService.selectSjJsjgList(sjJsjg);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJygjGdfdcsController.java
...@@ -41,7 +41,7 @@ public class SjJygjGdfdcsController extends BaseController ...@@ -41,7 +41,7 @@ public class SjJygjGdfdcsController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjJygjGdfdcs sjJygjGdfdcs) public TableDataInfo list(SjJygjGdfdcs sjJygjGdfdcs)
{ {
startPage(); // startPage();
List<SjJygjGdfdcs> list = sjJygjGdfdcsService.selectSjJygjGdfdcsList(sjJygjGdfdcs); List<SjJygjGdfdcs> list = sjJygjGdfdcsService.selectSjJygjGdfdcsList(sjJygjGdfdcs);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJygjGdsjgdcsController.java
...@@ -41,7 +41,7 @@ public class SjJygjGdsjgdcsController extends BaseController ...@@ -41,7 +41,7 @@ public class SjJygjGdsjgdcsController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjJygjGdsjgdcs sjJygjGdsjgdcs) public TableDataInfo list(SjJygjGdsjgdcs sjJygjGdsjgdcs)
{ {
startPage(); // startPage();
List<SjJygjGdsjgdcs> list = sjJygjGdsjgdcsService.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs); List<SjJygjGdsjgdcs> list = sjJygjGdsjgdcsService.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJygjInfoController.java
...@@ -41,7 +41,7 @@ public class SjJygjInfoController extends BaseController ...@@ -41,7 +41,7 @@ public class SjJygjInfoController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjJygjInfo sjJygjInfo) public TableDataInfo list(SjJygjInfo sjJygjInfo)
{ {
startPage(); // startPage();
List<SjJygjInfo> list = sjJygjInfoService.selectSjJygjInfoList(sjJygjInfo); List<SjJygjInfo> list = sjJygjInfoService.selectSjJygjInfoList(sjJygjInfo);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjTgTgqdjhController.java
...@@ -41,7 +41,7 @@ public class SjTgTgqdjhController extends BaseController ...@@ -41,7 +41,7 @@ public class SjTgTgqdjhController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjTgTgqdjh sjTgTgqdjh) public TableDataInfo list(SjTgTgqdjh sjTgTgqdjh)
{ {
startPage(); // startPage();
List<SjTgTgqdjh> list = sjTgTgqdjhService.selectSjTgTgqdjhList(sjTgTgqdjh); List<SjTgTgqdjh> list = sjTgTgqdjhService.selectSjTgTgqdjhList(sjTgTgqdjh);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjTgTgxnsjController.java
...@@ -41,7 +41,7 @@ public class SjTgTgxnsjController extends BaseController ...@@ -41,7 +41,7 @@ public class SjTgTgxnsjController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjTgTgxnsj sjTgTgxnsj) public TableDataInfo list(SjTgTgxnsj sjTgTgxnsj)
{ {
startPage(); // startPage();
List<SjTgTgxnsj> list = sjTgTgxnsjService.selectSjTgTgxnsjList(sjTgTgxnsj); List<SjTgTgxnsj> list = sjTgTgxnsjService.selectSjTgTgxnsjList(sjTgTgxnsj);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjTgTgzController.java
...@@ -41,7 +41,7 @@ public class SjTgTgzController extends BaseController ...@@ -41,7 +41,7 @@ public class SjTgTgzController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjTgTgz sjTgTgz) public TableDataInfo list(SjTgTgz sjTgTgz)
{ {
startPage(); // startPage();
List<SjTgTgz> list = sjTgTgzService.selectSjTgTgzList(sjTgTgz); List<SjTgTgz> list = sjTgTgzService.selectSjTgTgzList(sjTgTgz);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZjyCljlController.java
...@@ -41,7 +41,7 @@ public class SjZjyCljlController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZjyCljlController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZjyCljl sjZjyCljl) public TableDataInfo list(SjZjyCljl sjZjyCljl)
{ {
startPage(); // startPage();
List<SjZjyCljl> list = sjZjyCljlService.selectSjZjyCljlList(sjZjyCljl); List<SjZjyCljl> list = sjZjyCljlService.selectSjZjyCljlList(sjZjyCljl);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZjyFdsjController.java
...@@ -41,7 +41,7 @@ public class SjZjyFdsjController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZjyFdsjController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZjyFdsj sjZjyFdsj) public TableDataInfo list(SjZjyFdsj sjZjyFdsj)
{ {
startPage(); // startPage();
List<SjZjyFdsj> list = sjZjyFdsjService.selectSjZjyFdsjList(sjZjyFdsj); List<SjZjyFdsj> list = sjZjyFdsjService.selectSjZjyFdsjList(sjZjyFdsj);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZjyFdxnbController.java
...@@ -41,7 +41,7 @@ public class SjZjyFdxnbController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZjyFdxnbController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZjyFdxnb sjZjyFdxnb) public TableDataInfo list(SjZjyFdxnb sjZjyFdxnb)
{ {
startPage(); // startPage();
List<SjZjyFdxnb> list = sjZjyFdxnbService.selectSjZjyFdxnbList(sjZjyFdxnb); List<SjZjyFdxnb> list = sjZjyFdxnbService.selectSjZjyFdxnbList(sjZjyFdxnb);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZlyqController.java
...@@ -41,7 +41,7 @@ public class SjZlyqController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZlyqController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZlyq sjZlyq) public TableDataInfo list(SjZlyq sjZlyq)
{ {
startPage(); // startPage();
List<SjZlyq> list = sjZlyqService.selectSjZlyqList(sjZlyq); List<SjZlyq> list = sjZlyqService.selectSjZlyqList(sjZlyq);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZlyqXxController.java
...@@ -41,7 +41,7 @@ public class SjZlyqXxController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZlyqXxController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZlyqXx sjZlyqXx) public TableDataInfo list(SjZlyqXx sjZlyqXx)
{ {
startPage(); // startPage();
List<SjZlyqXx> list = sjZlyqXxService.selectSjZlyqXxList(sjZlyqXx); List<SjZlyqXx> list = sjZlyqXxService.selectSjZlyqXxList(sjZlyqXx);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjZlyqZbyqController.java
...@@ -41,7 +41,7 @@ public class SjZlyqZbyqController extends BaseController ...@@ -41,7 +41,7 @@ public class SjZlyqZbyqController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SjZlyqZbyq sjZlyqZbyq) public TableDataInfo list(SjZlyqZbyq sjZlyqZbyq)
{ {
startPage(); // startPage();
List<SjZlyqZbyq> list = sjZlyqZbyqService.selectSjZlyqZbyqList(sjZlyqZbyq); List<SjZlyqZbyq> list = sjZlyqZbyqService.selectSjZlyqZbyqList(sjZlyqZbyq);
return getDataTable(list); return getDataTable(list);
} }
......
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjZlyqZbyqMapper.java
...@@ -63,6 +63,6 @@ public interface SjZlyqZbyqMapper ...@@ -63,6 +63,6 @@ public interface SjZlyqZbyqMapper
int deleteSjZlyqZbyqByJh(String jh); int deleteSjZlyqZbyqByJh(String jh);
int insertSjZlyqZbyqBatch(List<SjZlyq> sjZlyqList); int insertSjZlyqZbyqBatch(List<SjZlyqZbyq> sjZlyqZbyqList);
} }
src/main/resources/mybatis/zjsgfa/SjDzfcMapper.xml
...@@ -228,6 +228,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -228,6 +228,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<delete id="deleteSjDzfcByJh"> <delete id="deleteSjDzfcByJh">
delete from sj_dzfc where jh = #{jh} delete from sj_dzfc where sjjh = #{jh}
</delete> </delete>
</mapper> </mapper>
\ No newline at end of file
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