修改年份

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsBmDayListDTO.java

@@ -19,11 +19,11 @@ public class TmsBmDayListDTO implements Serializable {
     @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @ApiModelProperty(value = "请年份（默认传当前年）")
-    private String year;
+    @ApiModelProperty(value = "开始日期")
+    private String startDate;
 
-    @ApiModelProperty(value = "请月份（默认传当前月）")
-    private String month;
+    @ApiModelProperty(value = "结束日期")
+    private String endDate;
 
     @ApiModelProperty(value = "城市编号",required = true)
     private String city;

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsBmMonthListDTO.java

@@ -19,8 +19,11 @@ public class TmsBmMonthListDTO implements Serializable {
     @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @ApiModelProperty(value = "年份（请默认传当前年）")
-    private String year;
+    @ApiModelProperty(value = "开始月份")
+    private String startMonth;
+
+    @ApiModelProperty(value = "结束月份")
+    private String endMonth;
 
     @ApiModelProperty(value = "城市编号",required = true)
     private String city;

jsjp-service/src/main/resources/mapper/tms/TmsStudentInfoMapper.xml

@@ -251,8 +251,8 @@
         from tms_student_info@tms${city} t
         where 1=1
           and t.tso_school_id = #{schoolId}
-          AND EXTRACT(MONTH FROM t.tso_applydate) = #{month}
-          AND EXTRACT(YEAR FROM t.tso_applydate) = #{year}
+          and t.tso_applydate <![CDATA[ >= ]]> to_date(#{startDate},'yyyy-MM-dd')
+          and t.tso_applydate <![CDATA[ < ]]> to_date(#{endDate},'yyyy-MM-dd')+1
         group by to_char(tso_applydate, 'yyyy-MM-dd')
         order by to_char(tso_applydate, 'yyyy-MM-dd') desc
     </select>
@@ -262,7 +262,8 @@
         SELECT TO_CHAR(tso_applydate, 'yyyy-MM') AS dateTime, COUNT(1) AS stuCount
         FROM tms_student_info@tms${city} t
         WHERE t.tso_school_id = #{schoolId}
-          AND EXTRACT(YEAR FROM t.tso_applydate) = #{year}
+          and t.tso_applydate <![CDATA[ >= ]]> to_date(#{startDate},'yyyy-MM')
+          and t.tso_applydate <![CDATA[ < ]]> to_date(#{endDate},'yyyy-MM')+1
         GROUP BY TO_CHAR(tso_applydate, 'yyyy-MM')
         ORDER BY TO_CHAR(tso_applydate, 'yyyy-MM') DESC
     </select>