@@ -109,6 +109,9 @@ public class BatchServiceImpl{
throw new ServiceException("年份不能为空");
}
+ startYear = "";
+ endYear = "";
+
BatchTrendReportVO batchTrendReportVO = new BatchTrendReportVO();
List<BatchTrendReportVO.RowData> rows = new ArrayList<>();
@@ -99,6 +99,9 @@
<if test="year != null and year != '' ">
AND left(bp.pf_date,4) = #{year}
</if>
<if test="keyWord != null and keyWord != ''">
AND (
COALESCE(pro.name, '') LIKE CONCAT('%', #{keyWord}, '%')