|
|
@@ -1088,10 +1088,22 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setQc20_1(a107041.getD31());
|
|
|
}
|
|
|
|
|
|
- vo.setA1071(this.qyyjkfxmqk107_1(year));
|
|
|
+ List<A107_1VO> a107_1VOList = this.qyyjkfxmqk107_1(year);
|
|
|
+ Integer xh = 1;
|
|
|
+ for (A107_1VO a1071VO : a107_1VOList) {
|
|
|
+ a1071VO.setXh(xh + "");
|
|
|
+ a1071VO.setKssjStr(Func.notNull(a1071VO.getKssj()) ? DateUtil.format(a1071VO.getKssj(), DateUtil.PATTERN_DATE) : null);
|
|
|
+ a1071VO.setJssjStr(Func.notNull(a1071VO.getJssj()) ? DateUtil.format(a1071VO.getJssj(), DateUtil.PATTERN_DATE) : null);
|
|
|
+ xh++;
|
|
|
+ }
|
|
|
+ vo.setA1071(a107_1VOList);
|
|
|
|
|
|
//一、研究开发人员情况
|
|
|
A107_2VO a107_2VO = new A107_2VO();
|
|
|
+ A107_2 db107_2 = a107_2Mapper.selectOne(Wrappers.<A107_2>lambdaQuery().eq(A107_2::getYearAndMonth, year).eq(A107_2::getTenantId, SecureUtil.getTenantId()));
|
|
|
+ if (Func.notNull(db107_2)) {
|
|
|
+ BeanUtil.copyProperties(db107_2, a107_2VO);
|
|
|
+ }
|
|
|
this.statisticsYanjiuKaifaRenyuanQingkuang(a107_2VO, year);
|
|
|
vo.setQj09(a107_2VO.getD1());
|
|
|
vo.setQj68(a107_2VO.getD2());
|
|
|
@@ -1121,12 +1133,10 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setQj251(a107_2VO.getD21());
|
|
|
|
|
|
//四、研究开发支出资金来源情况
|
|
|
- A107_2 db107_2 = a107_2Mapper.selectOne(Wrappers.<A107_2>lambdaQuery().eq(A107_2::getYearAndMonth, year).eq(A107_2::getTenantId, SecureUtil.getTenantId()));
|
|
|
- if (Func.notNull(db107_2)) {
|
|
|
- vo.setQj253(db107_2.getD58());
|
|
|
- vo.setQj254(db107_2.getD55());
|
|
|
- vo.setQj255(db107_2.getD56());
|
|
|
- }
|
|
|
+ vo.setQj253(a107_2VO.getD58());
|
|
|
+ vo.setQj254(a107_2VO.getD55());
|
|
|
+ vo.setQj255(a107_2VO.getD56());
|
|
|
+
|
|
|
statisticsD43_D57(a107_2VO, year);
|
|
|
vo.setQj256(a107_2VO.getD57());
|
|
|
vo.setQj252(a107_2VO.getD43());
|
|
|
@@ -1142,7 +1152,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
//(一)自主知识产权情况
|
|
|
List<CgZlEntity> zlList = zlMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().eq(CgZlEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
|
|
|
- Date dateMin = DateUtil.parse(year + "-01-01", DateUtil.PATTERN_DATE);
|
|
|
+ Date dateMin = DateUtil.parse(year + "-01-01", DateUtil.PATTERN_DATE);
|
|
|
Date dateMax = DateUtil.parse(year + "-12-31", DateUtil.PATTERN_DATE);
|
|
|
|
|
|
vo.setQj55(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && zl.getShenqingRq().before(dateMax) && zl.getShenqingRq().after(dateMin)).count());
|
|
|
@@ -1157,15 +1167,18 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setQj75(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("境外(欧美日)", zl.getGb())).count());
|
|
|
|
|
|
vo.setQj83(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt())).count());
|
|
|
- vo.setQj83_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt())).count());
|
|
|
+ vo.setQj83_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt()) && Arrays.asList("境外(除欧美日外)", "境外(欧美日)").contains(zl.getGb())).count());
|
|
|
+ vo.setQj82(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt()) && Func.equals("境外(欧美日)", zl.getGb())).count());
|
|
|
+ vo.setQj73(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt()) && Func.equals("发明专利", zl.getZllx())).count());
|
|
|
+ vo.setQj73_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt()) && Func.equals("发明专利", zl.getZllx()) && Arrays.asList("境外(除欧美日外)", "境外(欧美日)").contains(zl.getGb())).count());
|
|
|
|
|
|
//(三)其他情况
|
|
|
//发表科技论文
|
|
|
List<CgKylwEntity> kylwList = kylwMapper.selectList(Wrappers.<CgKylwEntity>lambdaQuery().eq(CgKylwEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
- vo.setQi25(Func.isEmpty(kylwList)?0:kylwList.size());
|
|
|
+ vo.setQi25(Func.isEmpty(kylwList) ? 0 : kylwList.size());
|
|
|
//拥有软件著作权
|
|
|
List<CgRjzzqEntity> rjzzqList = rjzzqMapper.selectList(Wrappers.<CgRjzzqEntity>lambdaQuery().eq(CgRjzzqEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
- vo.setQj85(Func.isEmpty(rjzzqList)?0:rjzzqList.size());
|
|
|
+ vo.setQj85(Func.isEmpty(rjzzqList) ? 0 : rjzzqList.size());
|
|
|
//其中:当年获得软件著作权
|
|
|
vo.setQj85_1(rjzzqList.stream().filter(item -> Func.notNull(item.getDjpzrq()) && item.getDjpzrq().before(dateMax) && item.getDjpzrq().after(dateMin)).count());
|
|
|
//拥有集成电路布图
|
|
|
@@ -1174,13 +1187,13 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
//其中:当年获得集成电路布图
|
|
|
vo.setQj86_1(qtList.stream().filter(item -> Func.notNull(item.getShouquanRq()) && Func.equals(item.getCmlx(), "集成电路布图设计专有权") && item.getShouquanRq().before(dateMax) && item.getShouquanRq().after(dateMin)).count());
|
|
|
//拥有植物新品种
|
|
|
- vo.setQj87(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "植物新品种")).count());
|
|
|
+ vo.setQj87(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "植物新品种")).count());
|
|
|
vo.setQj87_1(qtList.stream().filter(item -> Func.notNull(item.getShouquanRq()) && Func.equals(item.getCmlx(), "植物新品种") && item.getShouquanRq().before(dateMax) && item.getShouquanRq().after(dateMin)).count());
|
|
|
//拥有国家一类新药品种
|
|
|
- vo.setQj101(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "国家新药")).count());
|
|
|
+ vo.setQj101(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "国家新药")).count());
|
|
|
vo.setQj101_1(qtList.stream().filter(item -> Func.notNull(item.getShouquanRq()) && Func.equals(item.getCmlx(), "国家新药") && item.getShouquanRq().before(dateMax) && item.getShouquanRq().after(dateMin)).count());
|
|
|
//拥有国家一级中药保护品种
|
|
|
- vo.setQj100(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "国家一级中药保护品种")).count());
|
|
|
+ vo.setQj100(qtList.stream().filter(item -> Func.equals(item.getCmlx(), "国家一级中药保护品种")).count());
|
|
|
vo.setQj100_1(qtList.stream().filter(item -> Func.notNull(item.getShouquanRq()) && Func.equals(item.getCmlx(), "国家一级中药保护品种") && item.getShouquanRq().before(dateMax) && item.getShouquanRq().after(dateMin)).count());
|
|
|
//累计形成国际标准
|
|
|
List<CgJsbzEntity> jsbzList = jsbzMapper.selectList(Wrappers.<CgJsbzEntity>lambdaQuery().eq(CgJsbzEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
@@ -1206,8 +1219,10 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
TorchDevYBVO torchDevYBVO = this.torchDevYB(year);
|
|
|
WriteSheet writeSheet = EasyExcel.writerSheet().build();
|
|
|
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
|
|
|
+ excelWriter.fill(torchDevYBVO.getA1071(), fillConfig, writeSheet);
|
|
|
+
|
|
|
//设置list集合数据
|
|
|
- excelWriter.fill(torchDevYBVO, fillConfig, writeSheet);
|
|
|
+ excelWriter.fill(torchDevYBVO, writeSheet);
|
|
|
excelWriter.finish();
|
|
|
if (templateFileName != null) {
|
|
|
templateFileName.close();
|