添加字段排序接口

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

@@ -25,6 +25,18 @@ public class TmsBmDayListDTO implements Serializable {
     @ApiModelProperty(value = "结束日期")
     private String endDate;
 
+    @ApiModelProperty(value = "排序字段 1：正序  2：倒序")
+    private Integer sortType;
+
+    @ApiModelProperty(value = "排序类型 1：时间  2：学员数")
+    private Integer fieldType;
+
+    @ApiModelProperty(value = "排序类型",hidden = true)
+    private String sort;
+
+    @ApiModelProperty(value = "排序字段",hidden = true)
+    private String field;
+
     @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 

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

@@ -25,6 +25,19 @@ public class TmsBmMonthListDTO implements Serializable {
     @ApiModelProperty(value = "结束月份")
     private String endMonth;
 
+    @ApiModelProperty(value = "排序字段 1：正序  2：倒序")
+    private Integer sortType;
+
+    @ApiModelProperty(value = "排序类型 1：时间  2：学员数")
+    private Integer fieldType;
+
+    @ApiModelProperty(value = "排序类型",hidden = true)
+    private String sort;
+
+    @ApiModelProperty(value = "排序字段",hidden = true)
+    private String field;
+
+
     @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 

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

@@ -25,6 +25,18 @@ public class TmsBmYearListDTO implements Serializable {
     @ApiModelProperty(value = "结束年份（请默认传当前年-5年）")
     private String endYear;
 
+    @ApiModelProperty(value = "排序字段 1：正序  2：倒序")
+    private Integer sortType;
+
+    @ApiModelProperty(value = "排序类型 1：时间  2：学员数")
+    private Integer fieldType;
+
+    @ApiModelProperty(value = "排序类型",hidden = true)
+    private String sort;
+
+    @ApiModelProperty(value = "排序字段",hidden = true)
+    private String field;
+
     @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 

jsjp-service/src/main/java/com/miaxis/tms/service/impl/TmsStudentInfoServiceImpl.java

@@ -141,16 +141,54 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
 
     @Override
     public List<TmsBmCountVo> getEveryDayStuCountBySchoolId(TmsBmDayListDTO dayListDTO) {
+        if(dayListDTO.getFieldType()==2){  //按学员字段排序
+            dayListDTO.setField("stuCount");
+        } else {  //默认按时间字段排序
+            dayListDTO.setField("to_char(tso_applydate, 'yyyy-MM-dd')");
+        }
+
+        if(dayListDTO.getSortType()==1){  //按正序
+            dayListDTO.setSort("asc");
+        } else {  //默认按时间字段排序
+            dayListDTO.setSort("desc");
+        }
+
         return mapper.getEveryDayStuCountBySchoolId(dayListDTO);
     }
 
     @Override
     public List<TmsBmCountVo> getEveryMonthStuCountBySchoolId(TmsBmMonthListDTO monthListDTO) {
+
+        if(monthListDTO.getFieldType()==2){  //按学员字段排序
+            monthListDTO.setField("stuCount");
+        } else {  //默认按时间字段排序
+            monthListDTO.setField("TO_CHAR(tso_applydate, 'yyyy-MM')");
+        }
+
+        if(monthListDTO.getSortType()==1){  //按正序
+            monthListDTO.setSort("asc");
+        } else {  //默认按时间字段排序
+            monthListDTO.setSort("desc");
+        }
+
         return mapper.getEveryMonthStuCountBySchoolId(monthListDTO);
     }
 
     @Override
     public List<TmsBmCountVo> getEveryYearStuCountBySchoolId(TmsBmYearListDTO yearListDTO) {
+
+        if(yearListDTO.getFieldType()==2){  //按学员字段排序
+            yearListDTO.setField("stuCount");
+        } else {  //默认按时间字段排序
+            yearListDTO.setField("TO_CHAR(tso_applydate, 'yyyy')");
+        }
+
+        if(yearListDTO.getSortType()==1){  //按正序
+            yearListDTO.setSort("asc");
+        } else {  //默认按时间字段排序
+            yearListDTO.setSort("desc");
+        }
+
         return mapper.getEveryYearStuCountBySchoolId(yearListDTO);
     }
 

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

@@ -254,7 +254,7 @@
           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
+        order by ${field} ${sort}
     </select>
 
 
@@ -265,7 +265,7 @@
           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
+        ORDER BY ${field} ${sort}
     </select>
 
 
@@ -277,7 +277,7 @@
         AND EXTRACT(YEAR FROM t.tso_applydate) <![CDATA[ >= ]]> #{startYear}
         AND EXTRACT(YEAR FROM t.tso_applydate) <![CDATA[ <= ]]> #{endYear}
         GROUP BY TO_CHAR(tso_applydate, 'yyyy')
-        ORDER BY TO_CHAR(tso_applydate, 'yyyy') DESC
+        ORDER BY ${field} ${sort}
     </select>