学时相关接口

zzjs-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptTrainRecordController.java

@@ -12,9 +12,13 @@ import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.dto.TrainCreditDTO;
 import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.dto.TrainFinishKmDTO;
 import com.miaxis.newgzpt.service.IGzptTrainRecordService;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import com.miaxis.newgzpt.vo.TrainCreditVO;
+import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
 import com.miaxis.question.domain.QuestionError;
 import com.miaxis.question.dto.QuestionCollectionDto;
@@ -66,7 +70,7 @@ public class GzptTrainRecordController extends BaseController {
 
 
     @GetMapping("/getTrainFinishNew")
-    @ApiOperation("查询题目收藏列表")
+    @ApiOperation("查询学员学时明细")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
@@ -77,5 +81,22 @@ public class GzptTrainRecordController extends BaseController {
         return toResponsePageInfo(list);
     }
 
+
+    @GetMapping("/getTrainFinishKm")
+    @ApiOperation("查询已完成科目学时")
+    public ResponsePageInfo<TrainFinishKmVO> getTrainFinishKm(@ModelAttribute TrainFinishKmDTO TrainFinishKmDTO){
+        startPage();
+        List<TrainFinishKmVO> list = gzptTrainRecordService.getTrainFinishKm(TrainFinishKmDTO);
+        return toResponsePageInfo(list);
+    }
+
+    @GetMapping("/getTrainSubjectCredit")
+    @ApiOperation("查询额定学时")
+    public ResponsePageInfo<TrainCreditVO> getTrainSubjectCredit(@ModelAttribute TrainCreditDTO trainCreditDTO){
+        startPage();
+        List<TrainCreditVO> list = gzptTrainRecordService.getTrainSubjectCredit(trainCreditDTO);
+        return toResponsePageInfo(list);
+    }
+
 }
 

zzjs-service/src/main/java/com/miaxis/newgzpt/dto/TrainCreditDTO.java

@@ -0,0 +1,28 @@
+package com.miaxis.newgzpt.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 学员基本信息表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TrainCreditDTO implements Serializable {
+
+    @ApiModelProperty(value = "车型")
+    private String cx;
+
+    @ApiModelProperty(value = "地区编号")
+    private String dqbh;
+
+}

zzjs-service/src/main/java/com/miaxis/newgzpt/dto/TrainFinishDTO.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 public class TrainFinishDTO implements Serializable {
 
-    @ApiModelProperty(value = "学员outID")
+    @ApiModelProperty(value = "学员studentId")
     private long studentId;
 
     @ApiModelProperty(value = "科目")

zzjs-service/src/main/java/com/miaxis/newgzpt/dto/TrainFinishKmDTO.java

@@ -0,0 +1,28 @@
+package com.miaxis.newgzpt.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 学员基本信息表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TrainFinishKmDTO implements Serializable {
+
+    @ApiModelProperty(value = "学员studentId")
+    private long studentId;
+
+    @ApiModelProperty(value = "地区编号")
+    private String dqbh;
+
+}

zzjs-service/src/main/java/com/miaxis/newgzpt/mapper/GzptTrainRecordMapper.java

@@ -2,7 +2,11 @@ package com.miaxis.newgzpt.mapper;
 
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.newgzpt.dto.TrainCreditDTO;
 import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.dto.TrainFinishKmDTO;
+import com.miaxis.newgzpt.vo.TrainCreditVO;
+import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
 
 import java.util.List;
@@ -20,4 +24,8 @@ public interface GzptTrainRecordMapper extends BaseMapper<GzptTrainRecord> {
     void saveGzptTrainRecord(GzptTrainRecord gzptTrainRecord);
 
     List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO);
+
+    List<TrainFinishKmVO> getTrainFinishKm(TrainFinishKmDTO trainFinishKmDTO);
+
+    List<TrainCreditVO> getTrainSubjectCredit(TrainCreditDTO trainCreditDTO);
 }

zzjs-service/src/main/java/com/miaxis/newgzpt/service/IGzptTrainRecordService.java

@@ -2,7 +2,11 @@ package com.miaxis.newgzpt.service;
 
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.dto.TrainCreditDTO;
 import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.dto.TrainFinishKmDTO;
+import com.miaxis.newgzpt.vo.TrainCreditVO;
+import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
 
 import java.util.List;
@@ -20,4 +24,8 @@ public interface IGzptTrainRecordService extends IService<GzptTrainRecord> {
     void saveGzptTrainRecord(GzptTrainRecord gzptTrainRecord);
 
     List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO);
+
+    List<TrainFinishKmVO> getTrainFinishKm(TrainFinishKmDTO trainFinishKmDTO);
+
+    List<TrainCreditVO> getTrainSubjectCredit(TrainCreditDTO trainCreditDTO);
 }

zzjs-service/src/main/java/com/miaxis/newgzpt/service/IGzptUserInfoService.java

@@ -1,9 +1,8 @@
 package com.miaxis.newgzpt.service;
 
-import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
-import com.miaxis.system.dto.system.UserInfoDTO;
 
 import java.util.List;
 

zzjs-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptTrainRecordServiceImpl.java

@@ -3,10 +3,14 @@ package com.miaxis.newgzpt.service.impl;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
+import com.miaxis.newgzpt.dto.TrainCreditDTO;
 import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.dto.TrainFinishKmDTO;
 import com.miaxis.newgzpt.mapper.GzptTrainRecordMapper;
 import com.miaxis.newgzpt.service.IGzptTrainRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.newgzpt.vo.TrainCreditVO;
+import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
 import org.springframework.stereotype.Service;
 
@@ -40,4 +44,15 @@ public class GzptTrainRecordServiceImpl extends ServiceImpl<GzptTrainRecordMappe
     public List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO) {
         return gzptTrainRecordMapper.getTrainFinishNew(trainFinishDTO);
     }
+
+    @Override
+    public List<TrainFinishKmVO> getTrainFinishKm(TrainFinishKmDTO trainFinishKmDTO) {
+        return gzptTrainRecordMapper.getTrainFinishKm(trainFinishKmDTO);
+    }
+
+
+    @Override
+    public List<TrainCreditVO> getTrainSubjectCredit(TrainCreditDTO trainCreditDTO) {
+        return gzptTrainRecordMapper.getTrainSubjectCredit(trainCreditDTO);
+    }
 }

zzjs-service/src/main/java/com/miaxis/newgzpt/vo/TrainCreditVO.java

@@ -0,0 +1,25 @@
+package com.miaxis.newgzpt.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TrainCreditVO {
+
+    @ApiModelProperty(value = "科目序号")
+    private String subject; //科目序号
+
+    @ApiModelProperty(value = "所属科目")
+    private String applySubject; //所属科目
+
+    @ApiModelProperty(value = "科目名称")
+    private String subjectName; //科目名称
+
+    @ApiModelProperty(value = "车型")
+    private String carType; //车型
+
+    @ApiModelProperty(value = "定额公里数")
+    private Integer ration; //定额公里数
+}

zzjs-service/src/main/java/com/miaxis/newgzpt/vo/TrainFinishKmVO.java

@@ -0,0 +1,25 @@
+package com.miaxis.newgzpt.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TrainFinishKmVO {
+
+
+    @ApiModelProperty(value = "学时ID")
+    private Integer km1; //科目一
+
+    @ApiModelProperty(value = "开始时间")
+    private Integer km2; //科目二
+
+    @ApiModelProperty(value = "结束时间")
+    private Integer km3;   //科目三
+
+    @ApiModelProperty(value = "培训学时 单位min")
+    private Integer km4;  //科目四
+
+
+}

zzjs-service/src/main/java/com/miaxis/newgzpt/vo/TrainFinishVO.java

@@ -30,15 +30,6 @@ public class TrainFinishVO {
     @ApiModelProperty(value = "课程编码 1-实操，2-课堂教学，3-模拟器教学，4-远程教学")
     private Integer pxkmType; //课程编码 1-实操，2-课堂教学，3-模拟器教学，4-远程教学；
 
-    @ApiModelProperty(value = "教练名称")
-    private String coachName; //教练名称
-
-    @ApiModelProperty(value = "教练照片")
-    private String photoPath;//教练照片
-
-    @ApiModelProperty(value = "教练表ID")
-    private Long coachId; //教练表ID
-
     @ApiModelProperty(value = "课堂ID")
     private String classId; // 课堂ID 标识学员的一次培训过程，计时终端自行使用 关联学时明细表(电子教学日志编号 平台自主编号)
 

zzjs-service/src/main/resources/mapper/newgzpt/GzptTrainRecordMapper.xml

@@ -21,17 +21,70 @@
     <select id="getTrainFinishNew" resultType="com.miaxis.newgzpt.vo.TrainFinishVO" parameterType="com.miaxis.newgzpt.dto.TrainFinishDTO" >
         select cri_id id,cri_starttime startTime, cri_endtime endTime,cri_vaild_time duration,cri_vaild_time vaildTime, cri_train_subject trainSubject, substr(cri_subjcode,0,1) as pxkmType ,c.tci_name coachName,c.tci_photo_path photoPath,c.tci_id coachId,r.cri_classid classId from tms_train_class_record@tms${dqbh} r,tms_coach_info@tms${dqbh} c
         where r.cri_coach_id = c.tci_id(+) and r.cri_audit_result = '0'
-        and r.cri_is_pay in (1,2) and r.cri_student_id = #{studentId}
-        <if test="dqbh==3503">
-            and r.cri_second_audit_result=0
+        and r.cri_is_pay in (1,2)
+        <if test="studentId!=null">
+            and r.cri_student_id = #{studentId}
         </if>
-
         <if test="trainSubject!=null">
             and r.cri_train_subject = #{trainSubject}
         </if>
     </select>
 
 
+    <select id="getTrainSubjectCredit" resultType="com.miaxis.newgzpt.vo.TrainCreditVO" parameterType="com.miaxis.newgzpt.dto.TrainCreditDTO" >
+        select tsc_train_subject         subject,
+               tsc_APPLY_EXAM_SUBJECT    applySubject,
+               tsc_train_subject_name    subjectName,
+               tsc_permit_drive_car_type carType,
+               tsc_credit_ration         ration
+        from TMS_TRAIN_SUBJECT_CREDIT@tms${dqbh} c
+        <where>
+            <if test="cx!=null">
+                and c.TSC_PERMIT_DRIVE_CAR_TYPE = #{cx}
+            </if>
+        </where>
+    </select>
+
+    <select id="getTrainFinishKm" resultType="com.miaxis.newgzpt.vo.TrainFinishKmVO" parameterType="com.miaxis.newgzpt.dto.TrainFinishDTO" >
+        select
+        (select sum(cri_vaild_time)  from tms_train_class_record@tms${dqbh} r where r.cri_audit_result = '0' and r.cri_is_pay in (1, 2) and r.cri_train_subject = 1
+        <choose>
+            <when test="studentId!=null">
+                and r.cri_student_id = #{studentId}) km1,
+            </when>
+            <otherwise>
+                ) km1,
+            </otherwise>
+        </choose>
+        (select sum(cri_vaild_time) from tms_train_class_record@tms${dqbh} r where r.cri_audit_result = '0' and r.cri_is_pay in (1, 2) and r.cri_train_subject = 2
+        <choose>
+            <when test="studentId!=null">
+                and r.cri_student_id = #{studentId}) km2,
+            </when>
+            <otherwise>
+                ) km2,
+            </otherwise>
+        </choose>
+        (select sum(cri_vaild_time)  from tms_train_class_record@tms${dqbh} r where r.cri_audit_result = '0' and r.cri_is_pay in (1, 2) and r.cri_train_subject = 3
+        <choose>
+            <when test="studentId!=null">
+                and r.cri_student_id = #{studentId}) km3,
+            </when>
+            <otherwise>
+                ) km3,
+            </otherwise>
+        </choose>
+        (select sum(cri_vaild_time)  from tms_train_class_record@tms${dqbh} r where r.cri_audit_result = '0' and r.cri_is_pay in (1, 2) and r.cri_train_subject = 4
+        <choose>
+            <when test="studentId!=null">
+                and r.cri_student_id = #{studentId}) km4
+            </when>
+            <otherwise>
+                ) km4
+            </otherwise>
+        </choose>
+        from dual
+    </select>
 
 
 </mapper>