|
@@ -3403,13 +3403,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
//2.本年度提报:指本年度“需求待提交”之后状态的数据
|
|
|
StatisticalChartsResVo lastYear = pmDemandMapper.selectSTSLastYear(pmDemandReqVo);
|
|
|
StatisticalChartsResVo thisYear = pmDemandMapper.selectSTSThisYear(pmDemandReqVo);
|
|
|
- if (ObjectUtils.isEmpty(lastYear)) {
|
|
|
+ if (ObjectUtils.isEmpty(lastYear.getNum())) {
|
|
|
lastYear = new StatisticalChartsResVo();
|
|
|
lastYear.setNum(0);
|
|
|
lastYear.setEvaluationTotal(BigDecimal.ZERO);
|
|
|
lastYear.setEvaluationContractTotal(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if (ObjectUtils.isEmpty(thisYear)) {
|
|
|
+ if (ObjectUtils.isEmpty(thisYear.getNum())) {
|
|
|
thisYear = new StatisticalChartsResVo();
|
|
|
thisYear.setNum(0);
|
|
|
thisYear.setEvaluationTotal(BigDecimal.ZERO);
|