报名情况修改

jsjp-admin/src/main/java/com/miaxis/app/controller/tms/TmsStudentInfoController.java

@@ -124,8 +124,8 @@ public class TmsStudentInfoController extends BaseController {
      */
     @GetMapping("/getDayStuCountBySchoolId")
     @ApiOperation("根据ID获取学员员详细信息")
-    public Response<TmsBmCountVo> getDayStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
-        return Response.success(studentInfoService.getDayStuCountBySchoolId(bmCountDTO));
+    public Response<TmsBmCountVo> getDayStuCountBySchoolId(TmsBmDayDTO bmDayDTO) {
+        return Response.success(studentInfoService.getDayStuCountBySchoolId(bmDayDTO));
     }
 
 
@@ -134,8 +134,8 @@ public class TmsStudentInfoController extends BaseController {
      */
     @GetMapping("/getMonthStuCountBySchoolId")
     @ApiOperation("根据驾校ID查询当月报名情况")
-    public Response<TmsBmCountVo> getMonthStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
-        return Response.success(studentInfoService.getMonthStuCountBySchoolId(bmCountDTO));
+    public Response<TmsBmCountVo> getMonthStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO) {
+        return Response.success(studentInfoService.getMonthStuCountBySchoolId(bmMonthDTO));
     }
 
     /**
@@ -143,8 +143,8 @@ public class TmsStudentInfoController extends BaseController {
      */
     @GetMapping("/getYearStuCountBySchoolId")
     @ApiOperation("根据驾校ID查询当年报名情况")
-    public Response<TmsBmCountVo> getYearStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
-        return Response.success(studentInfoService.getYearStuCountBySchoolId(bmCountDTO));
+    public Response<TmsBmCountVo> getYearStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO) {
+        return Response.success(studentInfoService.getYearStuCountBySchoolId(bmMonthDTO));
     }
 
 }

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsBmCountDTO.java → jsjp-service/src/main/java/com/miaxis/tms/dto/TmsBmDayDTO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "TmsBmCountDTO", description = "查询报名人数DTO")
-public class TmsBmCountDTO implements Serializable {
+public class TmsBmDayDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -22,7 +22,7 @@ public class TmsBmCountDTO implements Serializable {
     @ApiModelProperty(value = "城市编号")
     private String city;
 
-    @ApiModelProperty(value = "查询是日时为天，月和年的单时为月， “-1”上个月，“-12”去年")
-    private Integer vDay;
+    @ApiModelProperty(value = "查询是日时为天'-1'为一天前,0为当日")
+    private Integer day;
 
 }

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

@@ -0,0 +1,28 @@
+package com.miaxis.tms.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TmsBmCountDTO", description = "查询报名人数DTO")
+public class TmsBmMonthDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "驾校ID")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "城市编号")
+    private String city;
+
+    @ApiModelProperty(value = "月份 '-1'为一个月前,0为当月")
+    private Integer month;
+
+}

jsjp-service/src/main/java/com/miaxis/tms/mapper/TmsStudentInfoMapper.java

@@ -29,9 +29,9 @@ public interface TmsStudentInfoMapper extends BaseMapper<TmsStudentInfoVo> {
 
     List<TmsStudentInfoTempVo> getTmsStudentInfoTempList(TmsStudentInfoTempDTO studentInfoDto);
 
-    TmsBmCountVo getDayStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getDayStuCountBySchoolId(TmsBmDayDTO bmCountDTO);
 
-    TmsBmCountVo getMonthStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getMonthStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO);
 
-    TmsBmCountVo getYearStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getYearStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO);
 }

jsjp-service/src/main/java/com/miaxis/tms/service/ITmsStudentInfoService.java

@@ -30,11 +30,11 @@ public interface ITmsStudentInfoService extends IService<TmsStudentInfoVo> {
 
     List<TmsSignVo> getTmsSignListByStuId(TmsStudentInfoIdDTO studentInfoIdDTO);
 
-    TmsBmCountVo getDayStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getDayStuCountBySchoolId(TmsBmDayDTO bmDayDTO);
 
-    TmsBmCountVo getMonthStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getMonthStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO);
 
-    TmsBmCountVo getYearStuCountBySchoolId(TmsBmCountDTO bmCountDTO);
+    TmsBmCountVo getYearStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO);
 
 
 

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

@@ -62,18 +62,18 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
     }
 
     @Override
-    public TmsBmCountVo getDayStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
+    public TmsBmCountVo getDayStuCountBySchoolId(TmsBmDayDTO bmCountDTO) {
         return mapper.getDayStuCountBySchoolId(bmCountDTO);
     }
 
     @Override
-    public TmsBmCountVo getMonthStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
-        return mapper.getMonthStuCountBySchoolId(bmCountDTO);
+    public TmsBmCountVo getMonthStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO) {
+        return mapper.getMonthStuCountBySchoolId(bmMonthDTO);
     }
 
     @Override
-    public TmsBmCountVo getYearStuCountBySchoolId(TmsBmCountDTO bmCountDTO) {
-        return mapper.getYearStuCountBySchoolId(bmCountDTO);
+    public TmsBmCountVo getYearStuCountBySchoolId(TmsBmMonthDTO bmMonthDTO) {
+        return mapper.getYearStuCountBySchoolId(bmMonthDTO);
     }
 
 

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

@@ -202,33 +202,33 @@
 
 
 
-    <select id="getDayStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo"  >
-        select trunc(t.tso_applydate) as dateTime,count(1) as stuNum
+    <select id="getDayStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsBmDayDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo"  >
+        select trunc(t.tso_applydate) as dateTime,count(1) as stuCount
         from tms_student_info@tms${city} t
         where 1=1
           and t.tso_school_id = #{schoolId}
-          and trunc(t.tso_applydate) = trunc(sysdate #{vDay})
+          and trunc(t.tso_applydate) = trunc(sysdate #{day})
         group by trunc(t.tso_applydate)
     </select>
 
 
-    <select id="getMonthStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo" >
-        select to_char(tso_applydate, 'yyyy-MM') as dateTime,count(1) as stuNum
+    <select id="getMonthStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsBmMonthDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo" >
+        select to_char(tso_applydate, 'yyyy-MM') as dateTime,count(1) as stuCount
         from tms_student_info@tms${city} t
         where 1=1
           and t.tso_school_id = #{schoolId}
-          and trunc(t.tso_applydate,'MONTH') = ADD_MONTHS(TRUNC(SYSDATE, 'MONTH'), #{vDay})
+          and trunc(t.tso_applydate,'MONTH') = ADD_MONTHS(TRUNC(SYSDATE, 'MONTH'), #{month})
         group by to_char(tso_applydate, 'yyyy-MM')
         order by to_char(tso_applydate, 'yyyy-MM')
     </select>
 
 
-    <select id="getYearStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo" >
-        select to_char(tso_applydate, 'yyyy') as dateTime,count(1) as stuNum
+    <select id="getYearStuCountBySchoolId" parameterType="com.miaxis.tms.dto.TmsBmMonthDTO" resultType="com.miaxis.tms.vo.TmsBmCountVo" >
+        select to_char(tso_applydate, 'yyyy') as dateTime,count(1) as stuCount
         from tms_student_info@tms${city} t
         where 1=1
           and t.tso_school_id = #{schoolId}
-          and trunc(t.tso_applydate,'MONTH') = ADD_MONTHS(TRUNC(SYSDATE, 'MONTH'), #{vDay})
+          and trunc(t.tso_applydate,'MONTH') = ADD_MONTHS(TRUNC(SYSDATE, 'MONTH'), #{month})
         group by to_char(tso_applydate, 'yyyy')
         order by to_char(tso_applydate, 'yyyy')
     </select>