|
|
@@ -97,14 +97,14 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
throw new ServiceException("上年度没有数据");
|
|
|
}
|
|
|
|
|
|
- List<String> ignorePropList = Arrays.asList("id","yearAndMonth","currentYearIncome", "currentYearCost","previousYearIncome","previousYearCost","lastYearIncome","lastYearCost");
|
|
|
+ List<String> ignorePropList = Arrays.asList("id", "yearAndMonth", "currentYearIncome", "currentYearCost", "previousYearIncome", "previousYearCost", "lastYearIncome", "lastYearCost");
|
|
|
|
|
|
// 企业基础信息表
|
|
|
EnterpriseInfoEntity dbEntity = this.getOne(Wrappers.<EnterpriseInfoEntity>lambdaQuery()
|
|
|
.eq(EnterpriseInfoEntity::getYearAndMonth, enterpriseInfo.getYearAndMonth()));
|
|
|
if (Func.isNull(dbEntity)) {
|
|
|
//新增
|
|
|
- EnterpriseInfoEntity entity = BeanUtil.copyProperties(previousYearData, EnterpriseInfoEntity.class, ignorePropList.toArray(new String[0]));
|
|
|
+ EnterpriseInfoEntity entity = BeanUtil.copyProperties(previousYearData, EnterpriseInfoEntity.class, ignorePropList.toArray(new String[0]));
|
|
|
entity.setTenantId(SecureUtil.getTenantId());
|
|
|
entity.setYearAndMonth(enterpriseInfo.getYearAndMonth());
|
|
|
entity.setPreviousYearCost(previousYearData.getCurrentYearCost());
|
|
|
@@ -115,7 +115,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
return this.save(entity);
|
|
|
} else {
|
|
|
//修改
|
|
|
- BeanUtil.copyProperties(previousYearData, dbEntity, ignorePropList.toArray(new String[0]));
|
|
|
+ BeanUtil.copyProperties(previousYearData, dbEntity, ignorePropList.toArray(new String[0]));
|
|
|
dbEntity.setPreviousYearCost(previousYearData.getCurrentYearCost());
|
|
|
dbEntity.setPreviousYearIncome(previousYearData.getCurrentYearIncome());
|
|
|
dbEntity.setLastYearCost(previousYearData.getPreviousYearCost());
|
|
|
@@ -179,29 +179,27 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- vo.setWorkTime(BigDecimal.valueOf(workTime).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
|
|
+ vo.setWorkTime(BigDecimal.valueOf(workTime).setScale(0, RoundingMode.HALF_UP).doubleValue());
|
|
|
|
|
|
//当列15等于基础研究时,列14=P088中对应研发项目的受托方类型的前5项的委外金额合计。当列15不等于基础研究时,列14等于0
|
|
|
if (Func.equals(vo.getYjlx(), "基础研究")) {
|
|
|
//对应研发项目的受托方类型的前5项的委外金额合计
|
|
|
vo.setWwfy(wwxmCostMapper.getAmountByXmAndYear(year, vo.getXmId()));
|
|
|
-
|
|
|
- XmCostDetailsDTO dto = new XmCostDetailsDTO();
|
|
|
- dto.setXmId(vo.getXmId());
|
|
|
- dto.setYearAndMonth(year + "12");
|
|
|
- List<FinanceCostSummary> summaryList = xmCostDetailsService.financeCostSummary(Condition.getPage(new Query().setCurrent(1).setSize(1)), dto).getRecords();
|
|
|
- if (Func.isEmpty(summaryList)) {
|
|
|
- vo.setCost(BigDecimal.ZERO);
|
|
|
- vo.setCost1(BigDecimal.ZERO);
|
|
|
- } else {
|
|
|
- FinanceCostSummary summary = summaryList.get(0);
|
|
|
- vo.setCost(summary.getTotal());
|
|
|
- vo.setCost1(summary.getTotal());
|
|
|
- }
|
|
|
} else {
|
|
|
+ vo.setWwfy(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+
|
|
|
+ XmCostDetailsDTO dto = new XmCostDetailsDTO();
|
|
|
+ dto.setXmId(vo.getXmId());
|
|
|
+ dto.setYearAndMonth(year + "12");
|
|
|
+ List<FinanceCostSummary> summaryList = xmCostDetailsService.financeCostSummary(Condition.getPage(new Query().setCurrent(1).setSize(1)), dto).getRecords();
|
|
|
+ if (Func.isEmpty(summaryList)) {
|
|
|
vo.setCost(BigDecimal.ZERO);
|
|
|
vo.setCost1(BigDecimal.ZERO);
|
|
|
- vo.setWwfy(BigDecimal.ZERO);
|
|
|
+ } else {
|
|
|
+ FinanceCostSummary summary = summaryList.get(0);
|
|
|
+ vo.setCost(summary.getTotal());
|
|
|
+ vo.setCost1(summary.getTotal());
|
|
|
}
|
|
|
//其中:企业自主开展=用于科学原理的探索发现的经费总额-委托外单位开展
|
|
|
vo.setCost2(vo.getCost1().subtract(vo.getWwfy()));
|
|
|
@@ -340,10 +338,11 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
XmAssetQueryParam param = new XmAssetQueryParam();
|
|
|
param.setYearAndMonth(year + "12");
|
|
|
List<XmFixedAsset> yiqishebeiList = fixedAssetMapper.selectXmFixedAssetPageByYearAndMonth(p2, param, AssetCategoryEnum.仪器设备.getCode());
|
|
|
+ BigDecimal d27 = BigDecimal.ZERO;
|
|
|
for (XmFixedAsset asset : yiqishebeiList) {
|
|
|
- vo.setD27(vo.getD7().add(asset.getAsset() != null ? asset.getAsset().getZcyz() : BigDecimal.ZERO));
|
|
|
+ d27 = d27.add(asset.getAsset() != null ? asset.getAsset().getZcyz() : BigDecimal.ZERO);
|
|
|
}
|
|
|
- vo.setD27(vo.getD27().setScale(2, RoundingMode.HALF_UP));
|
|
|
+ vo.setD27(d27.multiply(BigDecimal.valueOf(0.001)).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
//七、研究开发产出及相关情况
|
|
|
List<CgZlEntity> zlList = zlMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().eq(CgZlEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
@@ -355,12 +354,15 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
Date shenqingRq = zl.getShenqingRq();
|
|
|
Date shouquanRq = zl.getShouquanRq();
|
|
|
if (Func.notNull(shenqingRq)) {
|
|
|
- d29++;
|
|
|
if (Func.equals(year, DateUtil.format(shenqingRq, DateUtil.PATTERN_YYYY))) {
|
|
|
- d30++;
|
|
|
+ d29++;
|
|
|
+ if (Func.equals(zl.getZllx(), "发明专利")) {
|
|
|
+ d30++;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
- if (Func.notNull(shouquanRq) && shouquanRq.before(dateMax) && shouquanRq.after(dateMin)) {
|
|
|
+ if (Func.notNull(shouquanRq) && Func.equals(year, DateUtil.format(shouquanRq, DateUtil.PATTERN_YYYY)) && Func.equals(zl.getFlzt(), "授权有效") && Func.equals(zl.getZllx(), "发明专利")) {
|
|
|
d32++;
|
|
|
}
|
|
|
}
|
|
|
@@ -381,18 +383,19 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
//八、其他相关情况
|
|
|
//当年企业研发准备金合计
|
|
|
List<XmEntity> xmList = xmMapper.selectList(Wrappers.emptyWrapper());
|
|
|
+ BigDecimal d59 = BigDecimal.ZERO;
|
|
|
for (XmEntity xm : xmList) {
|
|
|
String xmyszemx = xm.getXmyszemx();
|
|
|
if (Func.notNull(xmyszemx)) {
|
|
|
List<JSONObject> array = JSON.parseArray(xmyszemx, JSONObject.class);
|
|
|
double sum = array.stream().filter(item -> item.getInteger("year") == Integer.parseInt(year)).mapToDouble(item -> item.getDouble("amount")).sum();
|
|
|
System.out.println("sum:" + sum);
|
|
|
- vo.setD59(vo.getD59().add(BigDecimal.valueOf(sum)));
|
|
|
- System.out.println("d59:" + vo.getD59());
|
|
|
+ d59 = d59.add(BigDecimal.valueOf(sum));
|
|
|
+ System.out.println("d59:" + d59);
|
|
|
}
|
|
|
}
|
|
|
//预算的单位是万,这里要显示千元,故乘以10即可,即1万=10千元
|
|
|
- vo.setD59(vo.getD59().multiply(new BigDecimal("10")).setScale(2, RoundingMode.HALF_UP));
|
|
|
+ vo.setD59(d59.multiply(BigDecimal.valueOf(10)).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
return vo;
|
|
|
}
|
|
|
@@ -426,7 +429,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
for (XmFixedAsset fangwujianzhuwu : fangwujianzhuwuList) {
|
|
|
AssetEntity asset = fangwujianzhuwu.getAsset();
|
|
|
if (asset != null && Func.equals(DateUtil.format(asset.getKssj(), DateUtil.PATTERN_YYYY), year)) {
|
|
|
- yiqishebeiTotal = fangwujianzhuwuTotal.add(asset.getZcyz());
|
|
|
+ fangwujianzhuwuTotal = fangwujianzhuwuTotal.add(asset.getZcyz());
|
|
|
}
|
|
|
}
|
|
|
vo.setD20(fangwujianzhuwuTotal.add(yiqishebeiTotal).multiply(new BigDecimal("0.001")).setScale(2, RoundingMode.HALF_UP));
|
|
|
@@ -496,16 +499,16 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
List<XmWwxmCostVO> wwxmCostVOList = wwxmCostMapper.selectPageByYear(Condition.getPage(new Query().setCurrent(1).setSize(Integer.MAX_VALUE)), wwxmCostQuery);
|
|
|
|
|
|
//①委托境内研究机构
|
|
|
- BigDecimal d15 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内研究机构")).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal d15 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内研究机构") && item.getPayAmount() != null).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
vo.setD15(d15.multiply(new BigDecimal("0.001")).setScale(2, RoundingMode.HALF_UP));
|
|
|
//②委托境内高等学校
|
|
|
- BigDecimal d16 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内高等学校")).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal d16 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内高等学校") && item.getPayAmount() != null).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
vo.setD16(d16.multiply(new BigDecimal("0.001")).setScale(2, RoundingMode.HALF_UP));
|
|
|
//③委托境内企业
|
|
|
- BigDecimal d17 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内企业")).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal d17 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境内企业") && item.getPayAmount() != null).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
vo.setD17(d17.multiply(new BigDecimal("0.001")).setScale(2, RoundingMode.HALF_UP));
|
|
|
//④委托境外机构
|
|
|
- BigDecimal d18 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境外机构")).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal d18 = wwxmCostVOList.stream().filter(item -> Func.equals(item.getStflx(), "境外机构") && item.getPayAmount() != null).map(XmWwxmCostVO::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
vo.setD18(d18.multiply(new BigDecimal("0.001")).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
vo.setD7(vo.getD8().add(vo.getD9()).add(vo.getD10()).add(vo.getD11()).add(vo.getD12()).add(vo.getD13()).add(vo.getD14()).add(vo.getD19()));
|
|
|
@@ -598,7 +601,9 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
//(六)其他相关费用
|
|
|
vo.setD28(Func.isNull(summary) ? BigDecimal.ZERO : summary.getQtxgfyhj_hjje());
|
|
|
//(七)经限额调整后的其他相关费用
|
|
|
- vo.setD34(Func.isNull(summary) ? BigDecimal.ZERO : summary.getQtxgfyhj_adjust_hjje());
|
|
|
+ BigDecimal sum = vo.getD3().add(vo.getD7().add(vo.getD16().add(vo.getD19().add(vo.getD23())))).multiply(BigDecimal.valueOf(0.1)).divide(BigDecimal.valueOf(0.9), 4, RoundingMode.UP);
|
|
|
+ vo.setD34(BigDecimal.valueOf(Math.min(sum.doubleValue(), vo.getD28().doubleValue())));
|
|
|
+// vo.setD34(Func.isNull(summary) ? BigDecimal.ZERO : summary.getQtxgfyhj_adjust_hjje());
|
|
|
|
|
|
//一、自主研发、合作研发、集中研发(3+7+16+19+23+34)
|
|
|
vo.setD2(vo.getD3().add(vo.getD7()).add(vo.getD16()).add(vo.getD19()).add(vo.getD23()).add(vo.getD28()).add(vo.getD34()));
|
|
|
@@ -850,11 +855,6 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
|
|
|
vo.setD28_4(vo.getD28_1().add(vo.getD28_2()).add(vo.getD28_3()));
|
|
|
|
|
|
- vo.setD15_1(vo.getD16_1().add(vo.getD25_1()));
|
|
|
- vo.setD15_2(vo.getD16_2().add(vo.getD25_2()));
|
|
|
- vo.setD15_3(vo.getD16_3().add(vo.getD25_3()));
|
|
|
- vo.setD15_4(vo.getD15_1().add(vo.getD15_2()).add(vo.getD15_3()));
|
|
|
-
|
|
|
vo.setD16_1(vo.getD17_1().add(vo.getD18_1()).add(vo.getD19_1()).add(vo.getD20_1()).add(vo.getD21_1()).add(vo.getD22_1()).add(vo.getD23_1()).add(vo.getD24_1()));
|
|
|
vo.setD16_2(vo.getD17_2().add(vo.getD18_2()).add(vo.getD19_2()).add(vo.getD20_2()).add(vo.getD21_2()).add(vo.getD22_2()).add(vo.getD23_2()).add(vo.getD24_2()));
|
|
|
vo.setD16_3(vo.getD17_3().add(vo.getD18_3()).add(vo.getD19_3()).add(vo.getD20_3()).add(vo.getD21_3()).add(vo.getD22_3()).add(vo.getD23_3()).add(vo.getD24_3()));
|
|
|
@@ -865,6 +865,11 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setD25_3(vo.getD26_3().add(vo.getD28_3().multiply(BigDecimal.valueOf(0.8))));
|
|
|
vo.setD25_4(vo.getD25_1().add(vo.getD25_2()).add(vo.getD25_3()));
|
|
|
|
|
|
+ vo.setD15_1(vo.getD16_1().add(vo.getD25_1()));
|
|
|
+ vo.setD15_2(vo.getD16_2().add(vo.getD25_2()));
|
|
|
+ vo.setD15_3(vo.getD16_3().add(vo.getD25_3()));
|
|
|
+ vo.setD15_4(vo.getD15_1().add(vo.getD15_2()).add(vo.getD15_3()));
|
|
|
+
|
|
|
vo.setD2901(d29_1 == null ? BigDecimal.ZERO : d29_1);
|
|
|
vo.setD2902(d29_2 == null ? BigDecimal.ZERO : d29_2);
|
|
|
vo.setD2903(d29_3 == null ? BigDecimal.ZERO : d29_3);
|
|
|
@@ -872,7 +877,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setD2904(vo.getD2901().add(vo.getD2902()).add(vo.getD2903()));
|
|
|
|
|
|
//九、三年研发费用占销售(营业)收入的比例(15行第4列/29行第4列)
|
|
|
- vo.setD30((vo.getD2904().compareTo(BigDecimal.ZERO) == 0) ? BigDecimal.ZERO : vo.getD15_4().divide(vo.getD2904()));
|
|
|
+ vo.setD30((vo.getD2904().compareTo(BigDecimal.ZERO) == 0) ? BigDecimal.ZERO : vo.getD15_4().divide(vo.getD2904(), 4, RoundingMode.UP));
|
|
|
|
|
|
vo.setD31(d31);
|
|
|
vo.setD32(d32);
|
|
|
@@ -956,13 +961,14 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
}
|
|
|
Date dateMin = DateUtil.parse(year + "-01-01", DateUtil.PATTERN_DATE);
|
|
|
Date dateMax = DateUtil.parse(year + "-12-31", DateUtil.PATTERN_DATE);
|
|
|
- List<CgZlEntity> zlList = zlMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().between(CgZlEntity::getShouquanRq, dateMin, dateMax));
|
|
|
+// List<CgZlEntity> zlList = zlMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().between(CgZlEntity::getShouquanRq, dateMin, dateMax));
|
|
|
+ List<CgZlEntity> zlList = zlMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().apply("DATE_FORMAT(SHOUQUAN_RQ,'%Y') = {0}", year));
|
|
|
int d2 = 0, d3 = 0, d9 = 0, d10 = 0;
|
|
|
if (Func.isNotEmpty(zlList)) {
|
|
|
d2 = (int) zlList.stream().filter(item -> Func.equals(item.getZllx(), "发明专利")).count();
|
|
|
d3 = (int) zlList.stream().filter(item -> Func.equals(item.getZllx(), "发明专利") && Func.equals(item.getSfgfzl(), "是")).count();
|
|
|
d9 = (int) zlList.stream().filter(item -> Func.equals(item.getZllx(), "实用新型专利")).count();
|
|
|
- d10 = (int) zlList.stream().filter(item -> Func.equals(item.getZllx(), "外观专利")).count();
|
|
|
+ d10 = (int) zlList.stream().filter(item -> Func.equals(item.getZllx(), "外观设计专利")).count();
|
|
|
}
|
|
|
vo.setD2(d2);
|
|
|
vo.setD3(d3);
|
|
|
@@ -970,7 +976,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setD10(d10);
|
|
|
|
|
|
int d4 = 0, d5 = 0, d6 = 0, d7 = 0, d8 = 0;
|
|
|
- List<CgQtEntity> qtList = qtMapper.selectList(Wrappers.<CgQtEntity>lambdaQuery().between(CgQtEntity::getShouquanRq, dateMin, dateMax));
|
|
|
+ List<CgQtEntity> qtList = qtMapper.selectList(Wrappers.<CgQtEntity>lambdaQuery().apply("DATE_FORMAT(SHOUQUAN_RQ,'%Y') = {0}", year));
|
|
|
if (Func.isNotEmpty(qtList)) {
|
|
|
d4 = (int) qtList.stream().filter(item -> Func.equals(item.getCmlx(), "植物新品种")).count();
|
|
|
d5 = (int) qtList.stream().filter(item -> Func.equals(item.getCmlx(), "国家级农作物品种")).count();
|
|
|
@@ -1167,16 +1173,16 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
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());
|
|
|
- vo.setQj56(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && zl.getShenqingRq().before(dateMax) && zl.getShenqingRq().after(dateMin) && Func.equals("发明专利", zl.getZllx())).count());
|
|
|
- vo.setQj56_1(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && zl.getShenqingRq().before(dateMax) && zl.getShenqingRq().after(dateMin) && Func.equals("发明专利", zl.getZllx()) && Func.equals("国内", zl.getGb())).count());
|
|
|
- vo.setQj55_1(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && zl.getShenqingRq().before(dateMax) && zl.getShenqingRq().after(dateMin) && Func.equals("境外(欧美日)", zl.getGb())).count());
|
|
|
- vo.setQj55_2(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && zl.getShenqingRq().before(dateMax) && zl.getShenqingRq().after(dateMin) && Func.equals("PCT国际专利", zl.getGb())).count());
|
|
|
+ vo.setQj55(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && Func.equals(DateUtil.format(zl.getShenqingRq(), DateUtil.PATTERN_YYYY), year)).count());
|
|
|
+ vo.setQj56(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && Func.equals(DateUtil.format(zl.getShenqingRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("发明专利", zl.getZllx())).count());
|
|
|
+ vo.setQj56_1(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && Func.equals(DateUtil.format(zl.getShenqingRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("发明专利", zl.getZllx()) && Func.equals("国内", zl.getGb())).count());
|
|
|
+ vo.setQj55_1(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && Func.equals(DateUtil.format(zl.getShenqingRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("境外(欧美日)", zl.getGb())).count());
|
|
|
+ vo.setQj55_2(zlList.stream().filter(zl -> Func.notNull(zl.getShenqingRq()) && Func.equals(DateUtil.format(zl.getShenqingRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("PCT国际专利", zl.getGb())).count());
|
|
|
|
|
|
- vo.setQj74(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin)).count());
|
|
|
- vo.setQj57(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("发明专利", zl.getZllx())).count());
|
|
|
- vo.setQj57_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("发明专利", zl.getZllx()) && Func.equals("国内", zl.getGb())).count());
|
|
|
- vo.setQj75(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("境外(欧美日)", zl.getGb())).count());
|
|
|
+ vo.setQj74(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && Func.equals(DateUtil.format(zl.getShouquanRq(), DateUtil.PATTERN_YYYY), year)).count());
|
|
|
+ vo.setQj57(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && Func.equals(DateUtil.format(zl.getShouquanRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("发明专利", zl.getZllx())).count());
|
|
|
+ vo.setQj57_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && Func.equals(DateUtil.format(zl.getShouquanRq(), DateUtil.PATTERN_YYYY), year) && Func.equals("发明专利", zl.getZllx()) && Func.equals("国内", zl.getGb())).count());
|
|
|
+ vo.setQj75(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && Func.equals(DateUtil.format(zl.getShouquanRq(), DateUtil.PATTERN_YYYY), year) && 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()) && Arrays.asList("境外(除欧美日外)", "境外(欧美日)").contains(zl.getGb())).count());
|
|
|
@@ -1210,10 +1216,10 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
//累计形成国际标准
|
|
|
List<CgJsbzEntity> jsbzList = jsbzMapper.selectList(Wrappers.<CgJsbzEntity>lambdaQuery().eq(CgJsbzEntity::getTenantId, SecureUtil.getTenantId()));
|
|
|
vo.setQj98(jsbzList.stream().filter(item -> Func.equals(item.getBzlb(), "国际标准")).count());
|
|
|
- vo.setQj98_1(jsbzList.stream().filter(item -> Func.notNull(item.getSsrq()) && Func.equals(item.getBzlb(), "国际标准") && Func.equals(item.getState(), "现行有效") && item.getSsrq().before(dateMax) && item.getSsrq().after(dateMin)).count());
|
|
|
+ vo.setQj98_1(jsbzList.stream().filter(item -> Func.notNull(item.getSsrq()) && Func.equals(item.getBzlb(), "国际标准") && Func.equals(item.getState(), "现行有效") && Func.equals(DateUtil.format(item.getSsrq(), DateUtil.PATTERN_YYYY), year)).count());
|
|
|
//累计形成国家或行业标准
|
|
|
vo.setQi27(jsbzList.stream().filter(item -> Func.equals(item.getBzlb(), "国家标准") || Func.equals(item.getBzlb(), "行业标准")).count());
|
|
|
- vo.setQi27_1(jsbzList.stream().filter(item -> Func.notNull(item.getSsrq()) && Func.equals(item.getBzlb(), "国家标准") || Func.equals(item.getBzlb(), "行业标准") && Func.equals(item.getState(), "现行有效") && item.getSsrq() != null && item.getSsrq().before(dateMax) && item.getSsrq().after(dateMin)).count());
|
|
|
+ vo.setQi27_1(jsbzList.stream().filter(item -> Func.notNull(item.getSsrq()) && Func.equals(item.getBzlb(), "国家标准") || Func.equals(item.getBzlb(), "行业标准") && Func.equals(item.getState(), "现行有效") && item.getSsrq() != null && Func.equals(DateUtil.format(item.getSsrq(), DateUtil.PATTERN_YYYY), year)).count());
|
|
|
return vo;
|
|
|
}
|
|
|
|