修改学员无ID问题,时间字段问题

jsjp-admin/src/test/java/com/miaxis/test/Test6.java

@@ -1,10 +1,7 @@
 package com.miaxis.test;
 
 import com.miaxis.JsjpApplication;
-import com.miaxis.newgzpt.domain.GzptSchActivation;
-import com.miaxis.newgzpt.dto.GzptSchActivationListDTO;
 import com.miaxis.newgzpt.service.IGzptSchActivationService;
-import com.miaxis.newgzpt.vo.GzptSchActivationListVO;
 import com.miaxis.tms.dto.TmsStudentInfoDTO;
 import com.miaxis.tms.service.ITmsStudentInfoService;
 import com.miaxis.tms.vo.TmsStudentInfoVo;

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

@@ -19,7 +19,7 @@ public class TmsBmDTO implements Serializable {
     @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
     @ApiModelProperty(value = "月份 '-1'为一个月前,0为当月")

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

@@ -19,7 +19,7 @@ public class TmsBmDayDTO implements Serializable {
     @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
     @ApiModelProperty(value = "查询是日时为天'-1'为一天前,0为当日")

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

@@ -25,7 +25,7 @@ public class TmsBmDayListDTO implements Serializable {
     @ApiModelProperty(value = "请月份（默认传当前月）")
     private String month;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
 

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

@@ -19,7 +19,7 @@ public class TmsBmMonthDTO implements Serializable {
     @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
     @ApiModelProperty(value = "月份 '-1'为一个月前,0为当月")

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

@@ -22,7 +22,7 @@ public class TmsBmMonthListDTO implements Serializable {
     @ApiModelProperty(value = "年份（请默认传当前年）")
     private String year;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
 

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

@@ -25,7 +25,7 @@ public class TmsBmYearListDTO implements Serializable {
     @ApiModelProperty(value = "结束年份（请默认传当前年-5年）")
     private String endYear;
 
-    @ApiModelProperty(value = "城市编号")
+    @ApiModelProperty(value = "城市编号",required = true)
     private String city;
 
 

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

@@ -16,7 +16,7 @@ public class TmsCoachInfoDTO implements Serializable {
     @ApiModelProperty(value = "登录密码")
     private String password;
 
-    @ApiModelProperty(value = "地区编号")
+    @ApiModelProperty(value = "地区编号",required = true)
     private String city;
 
 

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

@@ -13,7 +13,7 @@ public class TmsCoachInfoIdDTO implements Serializable {
     @ApiModelProperty(value = "教练员id")
     private Long id;
 
-    @ApiModelProperty(value = "地区编号")
+    @ApiModelProperty(value = "地区编号",required = true)
     private String city;
 
 

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

@@ -19,7 +19,7 @@ public class TmsCoachInfoPwDTO implements Serializable {
     @ApiModelProperty(value = "登录密码")
     private String newPassword;
 
-    @ApiModelProperty(value = "地区编号")
+    @ApiModelProperty(value = "地区编号",required = true)
     private String city;
 
 

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

@@ -13,7 +13,7 @@ public class TmsStudentInfoDTO implements Serializable {
     @ApiModelProperty(value = "身份证号或姓名或手机")
     private String field;
 
-    @ApiModelProperty(value = "驾校ID",required = true)
+    @ApiModelProperty(value = "驾校ID")
     private Long schoolId;
 
     @ApiModelProperty(value = "教练员ID")

jsjp-service/src/main/java/com/miaxis/tms/vo/TmsStudentInfoIdVo.java

@@ -1,5 +1,6 @@
 package com.miaxis.tms.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -45,6 +46,7 @@ public class TmsStudentInfoIdVo implements Serializable {
     private String active;
 
     @ApiModelProperty(value = "备案时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recordDate;
 
     @ApiModelProperty(value = "联系地址")
@@ -87,24 +89,28 @@ public class TmsStudentInfoIdVo implements Serializable {
     private String trainOneExamStatus;
 
     @ApiModelProperty(value = "第一阶段学时考核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainOneExamTime;
 
     @ApiModelProperty(value = "第二阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainTwoExamStatus;
 
     @ApiModelProperty(value = "第二阶段学时考核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainTwoExamTime;
 
     @ApiModelProperty(value = "第三阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainThreeExamStatus;
 
     @ApiModelProperty(value = "第三阶段学时考核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainThreeExamTime;
 
     @ApiModelProperty(value = "第四阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainFourExamStatus;
 
     @ApiModelProperty(value = "第四阶段学时考核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainFourExamTime;
 
     @ApiModelProperty(value = "科目一已完成学时")

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

@@ -136,7 +136,8 @@
 
 
     <select id="getTmsStudentInfoById"  parameterType="com.miaxis.tms.dto.TmsStudentInfoIdDTO" resultMap="TmsStudentInfoIdResultMap">
-        SELECT t.tso_cardtype,
+        SELECT t.tso_id,
+               t.tso_cardtype,
                t.tso_Idcard,
                t.tso_name,
                t.tso_sex,