|
|
@@ -159,38 +159,40 @@ public class CgZlServiceImpl extends BaseServiceImpl<CgZlMapper, CgZlEntity> imp
|
|
|
// 标准数=申请数=授权数
|
|
|
// 其他成果数=申请数=授权数
|
|
|
|
|
|
- JSONObject result = new JSONObject();
|
|
|
+ int intYear = Integer.parseInt(year);
|
|
|
|
|
|
+ JSONObject result = new JSONObject();
|
|
|
long total = 0, shenqingshu = 0, shouquanshu = 0;
|
|
|
- List<CgZlEntity> zlList = baseMapper.selectList(Wrappers.emptyWrapper());
|
|
|
- long zl = zlList.stream().filter(temp -> Func.equals(DateUtil.format(temp.getShenqingRq(), DateUtil.PATTERN_YYYY), year) || Func.equals(DateUtil.format(temp.getShouquanRq(), DateUtil.PATTERN_YYYY), year)).count();
|
|
|
- total += zl;
|
|
|
|
|
|
- shenqingshu += zlList.stream().filter(temp -> temp.getShenqingRq()!=null && Func.equals(DateUtil.format(temp.getShenqingRq(), DateUtil.PATTERN_YYYY), year)).count();
|
|
|
- shouquanshu += zlList.stream().filter(temp -> temp.getShouquanRq()!=null && Func.equals(DateUtil.format(temp.getShouquanRq(), DateUtil.PATTERN_YYYY), year)).count();
|
|
|
+ List<CgZlEntity> zlList = baseMapper.selectList(Wrappers.<CgZlEntity>lambdaQuery().apply("DATE_FORMAT(SHENQING_RQ,'%Y') <= {0} or DATE_FORMAT(SHOUQUAN_RQ,'%Y') <= {1}", year, year));
|
|
|
+
|
|
|
+
|
|
|
+ shenqingshu += zlList.stream().filter(temp-> Func.notNull(temp.getShenqingRq()) && cn.hutool.core.date.DateUtil.year(temp.getShenqingRq()) <= intYear).count();
|
|
|
+ shouquanshu += zlList.stream().filter(temp-> Func.notNull(temp.getShouquanRq()) && cn.hutool.core.date.DateUtil.year(temp.getShouquanRq()) <= intYear).count();
|
|
|
+
|
|
|
+ total += Func.isEmpty(zlList)?0:zlList.size();
|
|
|
|
|
|
- long rjzzq = rjzzqMapper.selectCount(Wrappers.<CgRjzzqEntity>lambdaQuery().apply("DATE_FORMAT(DJPZRQ,'%Y') = {0}", year));
|
|
|
+ long rjzzq = rjzzqMapper.selectCount(Wrappers.<CgRjzzqEntity>lambdaQuery().apply("DATE_FORMAT(DJPZRQ,'%Y') <= {0}", year));
|
|
|
total += rjzzq;
|
|
|
shenqingshu += rjzzq;
|
|
|
shouquanshu += rjzzq;
|
|
|
|
|
|
- long jsbz = jsbzMapper.selectCount(Wrappers.<CgJsbzEntity>lambdaQuery().apply("DATE_FORMAT(SSRQ,'%Y') = {0}", year));
|
|
|
+ long jsbz = jsbzMapper.selectCount(Wrappers.<CgJsbzEntity>lambdaQuery().apply("DATE_FORMAT(SSRQ,'%Y') <= {0}", year));
|
|
|
total += jsbz;
|
|
|
shenqingshu += jsbz;
|
|
|
shouquanshu += jsbz;
|
|
|
|
|
|
- long kylw = kylwMapper.selectCount(Wrappers.<CgKylwEntity>lambdaQuery().apply("DATE_FORMAT(FBRQ,'%Y') = {0}", year));
|
|
|
+ long kylw = kylwMapper.selectCount(Wrappers.<CgKylwEntity>lambdaQuery().apply("DATE_FORMAT(FBRQ,'%Y') <= {0}", year));
|
|
|
total += kylw;
|
|
|
shenqingshu += kylw;
|
|
|
shouquanshu += kylw;
|
|
|
|
|
|
- List<CgQtEntity> qtEntityList = qtMapper.selectList(Wrappers.emptyWrapper());
|
|
|
- long qt = qtEntityList.stream().filter(temp -> Func.equals(DateUtil.format(temp.getShenqingRq(), DateUtil.PATTERN_YYYY), year) || Func.equals(DateUtil.format(temp.getShouquanRq(), DateUtil.PATTERN_YYYY), year)).count();
|
|
|
- total += qt;
|
|
|
- shenqingshu += qt;
|
|
|
- shouquanshu += qt;
|
|
|
+ List<CgQtEntity> qtEntityList = qtMapper.selectList(Wrappers.<CgQtEntity>lambdaQuery().apply("DATE_FORMAT(SHENQING_RQ,'%Y') <= {0} or DATE_FORMAT(SHOUQUAN_RQ,'%Y') <= {1}", year, year));
|
|
|
+ shenqingshu += qtEntityList.stream().filter(temp-> Func.notNull(temp.getShenqingRq())).count();
|
|
|
+ shouquanshu += qtEntityList.stream().filter(temp-> Func.notNull(temp.getShouquanRq())).count();
|
|
|
+ total += Func.isEmpty(qtEntityList)?0:qtEntityList.size();
|
|
|
|
|
|
- result.put("total", total);
|
|
|
+ result.put("total", total);
|
|
|
result.put("shenqingshu", shenqingshu);
|
|
|
result.put("shouquanshu", shouquanshu);
|
|
|
|