学员学时接口增加 学员状态

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

@@ -70,7 +70,6 @@ public class TmsStudentInfoController extends BaseController {
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
     })
     public ResponsePageInfo<TmsStudentInfoVo> allSchoolStudentInfoList(@ModelAttribute TmsAllStudentInfoDTO allStudentInfoDTO) {
-        startPage();
         if(allStudentInfoDTO.getCoachId()!=null) {
             CoachManySchool coachManySchool = coachManySchoolService.getById(allStudentInfoDTO.getCoachId());
             if(coachManySchool!=null) {
@@ -78,6 +77,7 @@ public class TmsStudentInfoController extends BaseController {
             }
         }
         allStudentInfoDTO.setCoachId(null);
+        startPage();
         List<TmsStudentInfoVo> stuInfoList = studentInfoService.getTmsAllStudentInfoList(allStudentInfoDTO);
         return toResponsePageInfo(stuInfoList);
     }
@@ -94,7 +94,6 @@ public class TmsStudentInfoController extends BaseController {
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
     })
     public ResponsePageInfo<TmsStudentInfoVo> list(@ModelAttribute TmsStudentInfoDTO studentInfoDTO) {
-        startPage();
         if(studentInfoDTO.getCoachId()!=null) {
             CoachManySchool coachManySchool = coachManySchoolService.getById(studentInfoDTO.getCoachId());
             if(coachManySchool!=null) {
@@ -102,6 +101,7 @@ public class TmsStudentInfoController extends BaseController {
             }
         }
         studentInfoDTO.setCoachId(null);
+        startPage();
         List<TmsStudentInfoVo> stuInfoList = studentInfoService.getTmsStudentInfoList(studentInfoDTO);
         return toResponsePageInfo(stuInfoList);
     }

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

@@ -89,6 +89,9 @@ public class TmsStudentInfoIdVo implements Serializable {
     @ApiModelProperty(value = "地区名称")
     private String dqmc;
 
+    @ApiModelProperty(value = "第一阶段学时送审状态 0 不允许送审 1 允许送审 2 审核通过 3 退回 4 待审核状态 注:当学时达标标后改1")
+    private String trainOneStatus;
+
     @ApiModelProperty(value = "第一阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainOneExamStatus;
 
@@ -96,6 +99,9 @@ public class TmsStudentInfoIdVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainOneExamTime;
 
+    @ApiModelProperty(value = "第二阶段学时送审状态 0 不允许送审 1 允许送审 2 审核通过 3 退回  4 待审核状态 注:当学时达标标后改1")
+    private String trainTwoStatus;
+
     @ApiModelProperty(value = "第二阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainTwoExamStatus;
 
@@ -103,6 +109,9 @@ public class TmsStudentInfoIdVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainTwoExamTime;
 
+    @ApiModelProperty(value = "第三阶段学时送审状态 0 不允许送审 1 允许送审 2 审核通过 3 退回  4 待审核状态 注:当学时达标标后改1")
+    private String trainThreeStatus;
+
     @ApiModelProperty(value = "第三阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainThreeExamStatus;
 
@@ -110,6 +119,9 @@ public class TmsStudentInfoIdVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date trainThreeExamTime;
 
+    @ApiModelProperty(value = "第四阶段学时送审状态 0 不允许送审 1 允许送审 2 审核通过 3 退回  4 待审核状态  注:当学时达标标后改1")
+    private String trainFourStatus;
+
     @ApiModelProperty(value = "第四阶段学时考核状态 0 未考核 1 考核通过 2 考核不通过")
     private String trainFourExamStatus;
 

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

@@ -65,12 +65,16 @@
         <result property="qxmc" column="TSI_QXMC" />
         <result property="dqbh" column="TSI_DQBH" />
         <result property="dqmc" column="TSI_DQMC" />
+        <result property="trainOneStatus" column="SRI_TRAIN_ONE_STATUS" />
         <result property="trainOneExamStatus" column="SRI_TRAIN_ONE_EXAM_STATUS" />
         <result property="trainOneExamTime" column="SRI_TRAIN_ONE_EXAM_TIME" />
+        <result property="trainTwoStatus" column="SRI_TRAIN_TWO_STATUS" />
         <result property="trainTwoExamStatus" column="SRI_TRAIN_TWO_EXAM_STATUS" />
         <result property="trainTwoExamTime" column="SRI_TRAIN_TWO_EXAM_TIME" />
+        <result property="trainThreeStatus" column="SRI_TRAIN_THREE_STATUS" />
         <result property="trainThreeExamStatus" column="SRI_TRAIN_THREE_EXAM_STATUS" />
         <result property="trainThreeExamTime" column="SRI_TRAIN_THREE_EXAM_TIME" />
+        <result property="trainFourStatus" column="SRI_TRAIN_FOUR_STATUS" />
         <result property="trainFourExamStatus" column="SRI_TRAIN_FOUR_EXAM_STATUS" />
         <result property="trainFourExamTime" column="SRI_TRAIN_FOUR_EXAM_TIME" />
         <result property="k1" column="K1" />
@@ -118,8 +122,8 @@
 
     <select id="getTmsMyStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
-               t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+               t2.SRI_TRAIN_ONE_STATUS,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time, t2.SRI_TRAIN_TWO_STATUS,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+               t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
         from tms_student_info@tms${city} t1
                  left join tms_student_train_info@tms${city} t2
                            on t1.tso_id = t2.sri_student_id
@@ -138,8 +142,8 @@
 
     <select id="getTmsStudentInfoList"  parameterType="com.miaxis.tms.dto.TmsStudentInfoDTO" resultMap="TmsStudentInfoResultMap">
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
-        t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+        t2.SRI_TRAIN_ONE_STATUS,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time, t2.SRI_TRAIN_TWO_STATUS,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+        t2.SRI_TRAIN_Three_STATUS,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
         from tms_student_info@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
@@ -186,8 +190,8 @@
         select * from (
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE ,
         t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
-        t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'1' as bm_type
+        t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'1' as bm_type
         from tms_student_info_temp@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
@@ -206,8 +210,8 @@
         union
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.
         TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,
-        t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-        t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
+        t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+        t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,'2' as bm_type
         from tms_student_info@tms${city} t1
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
@@ -258,8 +262,8 @@
                S.TSI_QXMC,
                S.TSI_DQBH,
                S.TSI_DQMC,
-               t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
+               t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+               t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
                nvl(trunc(t2.sri_train_one / 45), 0) || '学时' ||nvl((mod(t2.sri_train_one, 45)), 0) || '分钟' as K1,
                nvl(trunc(t2.sri_train_two / 45), 0) || '学时' ||nvl((mod(t2.sri_train_two, 45)), 0) || '分钟' as K2,
                nvl(trunc(t2.sri_train_three / 45), 0) || '学时' ||nvl((mod(t2.sri_train_three, 45)), 0) || '分钟' as K3,
@@ -309,8 +313,8 @@
                S.TSI_QXMC,
                S.TSI_DQBH,
                S.TSI_DQMC,
-               t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
+               t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+               t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
                nvl(trunc(t2.sri_train_one / 60), 0) || '学时' ||nvl((mod(t2.sri_train_one, 60)), 0) || '分钟' as K1,
                nvl(trunc(t2.sri_train_two / 60), 0) || '学时' ||nvl((mod(t2.sri_train_two, 60)), 0) || '分钟' as K2,
                nvl(trunc(t2.sri_train_three / 60), 0) || '学时' ||nvl((mod(t2.sri_train_three, 60)), 0) || '分钟' as K3,
@@ -360,8 +364,8 @@
                S.TSI_QXMC,
                S.TSI_DQBH,
                S.TSI_DQMC,
-               t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
+               t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+               t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
                nvl(trunc(t2.sri_train_one / 60), 0) || '学时' ||nvl((mod(t2.sri_train_one, 60)), 0) || '分钟' as K1,
                nvl(trunc(t2.sri_train_two / 60), 0) || '学时' ||nvl((mod(t2.sri_train_two, 60)), 0) || '分钟' as K2,
                nvl(trunc(t2.sri_train_three / 60), 0) || '学时' ||nvl((mod(t2.sri_train_three, 60)), 0) || '分钟' as K3,
@@ -411,8 +415,8 @@
                S.TSI_QXMC,
                S.TSI_DQBH,
                S.TSI_DQMC,
-               t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
-               t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
+               t2.Sri_Train_One_Status,t2.Sri_Train_One_Exam_Status,t2.Sri_Train_One_Exam_Time,t2.Sri_Train_TWO_Status,t2.Sri_Train_TWO_Exam_Status,t2.Sri_Train_Two_Exam_Time,
+               t2.Sri_Train_Three_Status,t2.Sri_Train_Three_Exam_Status,t2.Sri_Train_Three_Exam_Time,t2.Sri_Train_Four_Status,t2.Sri_Train_Four_Exam_Status,t2.Sri_Train_Four_Exam_Time,
                nvl(trunc(t2.sri_train_one / 60), 0) || '学时' ||nvl((mod(t2.sri_train_one, 60)), 0) || '分钟' as K1,
                nvl(trunc(t2.sri_train_two / 60), 0) || '学时' ||nvl((mod(t2.sri_train_two, 60)), 0) || '分钟' as K2,
                nvl(trunc(t2.sri_train_three / 60), 0) || '学时' ||nvl((mod(t2.sri_train_three, 60)), 0) || '分钟' as K3,