|
@@ -94,6 +94,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
|| ! p.getTid().equals(pn.getTid())) {
|
|
|| ! p.getTid().equals(pn.getTid())) {
|
|
|
p.setYears(getyear(p));
|
|
p.setYears(getyear(p));
|
|
|
p.setPatentAmount(sumAmout(p.getType(),p.getTid(),p.getYears()));
|
|
p.setPatentAmount(sumAmout(p.getType(),p.getTid(),p.getYears()));
|
|
|
|
|
+ p.setStatus(getSatus(p.getEndDate()));
|
|
|
sumYears(p);
|
|
sumYears(p);
|
|
|
}
|
|
}
|
|
|
patentNewLogMapper.insertSelective(pl);
|
|
patentNewLogMapper.insertSelective(pl);
|
|
@@ -222,6 +223,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
}
|
|
}
|
|
|
List<PatentNew> list=new ArrayList<>();
|
|
List<PatentNew> list=new ArrayList<>();
|
|
|
List<Notice> nl=new ArrayList<Notice>();
|
|
List<Notice> nl=new ArrayList<Notice>();
|
|
|
|
|
+ String str= new String();
|
|
|
//循环除了第2行的所有行
|
|
//循环除了第2行的所有行
|
|
|
for(int rowNum = firstRowNum+2;rowNum <= lastRowNum;rowNum++){
|
|
for(int rowNum = firstRowNum+2;rowNum <= lastRowNum;rowNum++){
|
|
|
//获得当前行
|
|
//获得当前行
|
|
@@ -255,7 +257,7 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
trb.setHolders(ExcelUtils.getCellValue(cell));
|
|
trb.setHolders(ExcelUtils.getCellValue(cell));
|
|
|
break;
|
|
break;
|
|
|
case 5:
|
|
case 5:
|
|
|
- String str=ExcelUtils.getCellValue(cell);
|
|
|
|
|
|
|
+ str=ExcelUtils.getCellValue(cell);
|
|
|
if (StringUtils.isNotEmpty(str)) {
|
|
if (StringUtils.isNotEmpty(str)) {
|
|
|
trb.setAuthorizationDate(DateUtils.StringToDate(str, AFTConstants.YYYYMMDD));
|
|
trb.setAuthorizationDate(DateUtils.StringToDate(str, AFTConstants.YYYYMMDD));
|
|
|
}
|
|
}
|