1.增加统计类型

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LegendDataDto.java

@@ -21,7 +21,7 @@ public class LegendDataDto {
     private String value;
 
     /**
-     * 图列类型
+     * 图列类型：bar-柱状图；line-折线图
      */
     private String chartType;
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml

@@ -106,7 +106,9 @@
 			tzs_safety_problem_tracing
 		WHERE
 			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
-		  AND DATE_FORMAT(problem_time,'%Y-%m') >= #{now}
+			<if test="now != null and now != ''">
+				AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
+			</if>
 	</select>
 	<select id="getOrgCodeAndCompanyCodesByCompanyCodes" resultType="java.util.Map">
 		select org_code AS orgCode,company_code AS companyCode from privilege_company where company_code in