学时获取接口

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

@@ -6,22 +6,27 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 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.TrainFinishDTO;
 import com.miaxis.newgzpt.service.IGzptTrainRecordService;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import com.miaxis.newgzpt.vo.TrainFinishVO;
+import com.miaxis.question.domain.QuestionError;
+import com.miaxis.question.dto.QuestionCollectionDto;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -60,5 +65,17 @@ public class GzptTrainRecordController extends BaseController {
     }
 
 
+    @GetMapping("/getTrainFinishNew")
+    @ApiOperation("查询题目收藏列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<TrainFinishVO> getTrainFinishNew(@ModelAttribute TrainFinishDTO trainFinishDTO){
+        startPage();
+        List<TrainFinishVO> list = gzptTrainRecordService.getTrainFinishNew(trainFinishDTO);
+        return toResponsePageInfo(list);
+    }
+
 }
 

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

@@ -0,0 +1,32 @@
+package com.miaxis.newgzpt.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 TrainFinishDTO implements Serializable {
+
+    @ApiModelProperty(value = "学员outID")
+    private long studentId;
+
+    @ApiModelProperty(value = "科目")
+    private String trainSubject;
+
+    @ApiModelProperty(value = "地区编号")
+    private String dqbh;
+
+}

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

@@ -2,6 +2,10 @@ package com.miaxis.newgzpt.mapper;
 
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.vo.TrainFinishVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface GzptTrainRecordMapper extends BaseMapper<GzptTrainRecord> {
 
     void saveGzptTrainRecord(GzptTrainRecord gzptTrainRecord);
+
+    List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO);
 }

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

@@ -2,6 +2,10 @@ package com.miaxis.newgzpt.service;
 
 import com.miaxis.newgzpt.domain.GzptTrainRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.dto.TrainFinishDTO;
+import com.miaxis.newgzpt.vo.TrainFinishVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IGzptTrainRecordService extends IService<GzptTrainRecord> {
 
     void saveGzptTrainRecord(GzptTrainRecord gzptTrainRecord);
+
+    List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO);
 }

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

@@ -3,12 +3,15 @@ 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.TrainFinishDTO;
 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.TrainFinishVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +35,9 @@ public class GzptTrainRecordServiceImpl extends ServiceImpl<GzptTrainRecordMappe
 
         gzptTrainRecordMapper.saveGzptTrainRecord(gzptTrainRecord);
     }
+
+    @Override
+    public List<TrainFinishVO> getTrainFinishNew(TrainFinishDTO trainFinishDTO) {
+        return gzptTrainRecordMapper.getTrainFinishNew(trainFinishDTO);
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.miaxis.newgzpt.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TrainFinishVO {
+
+
+    @ApiModelProperty(value = "学时ID")
+    private long id; //学时ID
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime; //开始时间
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;   //结束时间
+
+    @ApiModelProperty(value = "培训学时 单位min")
+    private Integer duration;  //培训学时 单位min
+
+    @ApiModelProperty(value = "有效学时分钟数")
+    private Integer vaildTime;  //有效学时分钟数
+
+    @ApiModelProperty(value = "培训阶段(1:第一部分2:第二部分3:第三部分4:第四部分)")
+    private Integer trainSubject; //培训阶段(1:第一部分2:第二部分3:第三部分4:第四部分)
+
+    @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

@@ -16,4 +16,22 @@
         #{classid})
     </select>
 
+
+
+    <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
+        </if>
+
+        <if test="trainSubject!=null">
+            and r.cri_train_subject = #{trainSubject}
+        </if>
+    </select>
+
+
+
+
 </mapper>