|
@@ -336,12 +336,12 @@ public class EnergySumRptService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 工作量中的建筑面积比较特殊,按年的统计报表中只需要统计月份之前最新的记录即可2022.9.14
|
|
|
+ * 工作量中的建筑面积比较特殊,按年的统计报表中只需要统计月份之前最新的记录即可2022.9.21
|
|
|
* @param year
|
|
|
* @return
|
|
|
*/
|
|
|
public Workload getBuilderAreaYearLast(String endMonth){
|
|
|
- String sql="select ifnull(builder_area,0) builder_area from t_workload_value where DATE_FORMAT(rpt_month,'%Y-%m')<=? order by rpt_month desc limit 1";
|
|
|
+ String sql="select ifnull(builder_area,0) builder_area from t_workload_value where DATE_FORMAT(rpt_month,'%Y-%m')<=? and builder_area is not null order by rpt_month desc limit 1";
|
|
|
return dao.queryForObject(sql,Workload.class,endMonth);
|
|
|
}
|
|
|
}
|