Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/zzjs

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

@@ -50,6 +50,7 @@ public class GzptTrainRecordController extends BaseController {
     @Autowired
     private IGzptUserInfoService gzptUserInfoService;
 
+
     /**
      * 新增学时
      */
@@ -75,8 +76,17 @@ public class GzptTrainRecordController extends BaseController {
             @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){
+    public ResponsePageInfo<TrainFinishVO> getTrainFinishNew(){
         startPage();
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        GzptUserInfo gzptUserInfo = gzptUserInfoService.getInfoById(student.getGzptUserId());
+        if (gzptUserInfo == null){
+            throw new CustomException("该学员计时账户不存在");
+        }
+
+        TrainFinishDTO trainFinishDTO = new TrainFinishDTO();
+        trainFinishDTO.setDqbh(gzptUserInfo.getCity());
+        trainFinishDTO.setStudentId(gzptUserInfo.getOutId());
         List<TrainFinishVO> list = gzptTrainRecordService.getTrainFinishNew(trainFinishDTO);
         return toResponsePageInfo(list);
     }
@@ -84,16 +94,32 @@ public class GzptTrainRecordController extends BaseController {
 
     @GetMapping("/getTrainFinishKm")
     @ApiOperation("查询已完成科目学时")
-    public ResponsePageInfo<TrainFinishKmVO> getTrainFinishKm(@ModelAttribute TrainFinishKmDTO TrainFinishKmDTO){
+    public ResponsePageInfo<TrainFinishKmVO> getTrainFinishKm(){
         startPage();
-        List<TrainFinishKmVO> list = gzptTrainRecordService.getTrainFinishKm(TrainFinishKmDTO);
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        GzptUserInfo gzptUserInfo = gzptUserInfoService.getInfoById(student.getGzptUserId());
+        if (gzptUserInfo == null){
+            throw new CustomException("该学员计时账户不存在");
+        }
+        TrainFinishKmDTO trainFinishKmDTO = new TrainFinishKmDTO();
+        trainFinishKmDTO.setDqbh(gzptUserInfo.getCity());
+        trainFinishKmDTO.setStudentId(gzptUserInfo.getOutId());
+        List<TrainFinishKmVO> list = gzptTrainRecordService.getTrainFinishKm(trainFinishKmDTO);
         return toResponsePageInfo(list);
     }
 
     @GetMapping("/getTrainSubjectCredit")
     @ApiOperation("查询额定学时")
-    public ResponsePageInfo<TrainCreditVO> getTrainSubjectCredit(@ModelAttribute TrainCreditDTO trainCreditDTO){
+    public ResponsePageInfo<TrainCreditVO> getTrainSubjectCredit(){
         startPage();
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        GzptUserInfo gzptUserInfo = gzptUserInfoService.getInfoById(student.getGzptUserId());
+        if (gzptUserInfo == null){
+            throw new CustomException("该学员计时账户不存在");
+        }
+        TrainCreditDTO trainCreditDTO = new TrainCreditDTO();
+        trainCreditDTO.setDqbh(gzptUserInfo.getCity());
+        trainCreditDTO.setCx(gzptUserInfo.getCartype());
         List<TrainCreditVO> list = gzptTrainRecordService.getTrainSubjectCredit(trainCreditDTO);
         return toResponsePageInfo(list);
     }

zzjs-service/src/main/java/com/miaxis/generator/CodeGenerator.java

@@ -60,11 +60,11 @@ public class CodeGenerator {
 //        dsc.setPassword("cj1234");
 
 
-        dsc.setUrl("jdbc:oracle:thin:@47.99.70.145:1521:orcl");
+        dsc.setUrl("jdbc:oracle:thin:@112.124.201.153:1521:orcl");
         // dsc.setSchemaName("public");
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-        dsc.setUsername("newgzpt");
-        dsc.setPassword("newgzpt2016");
+        dsc.setUsername("tms_xm");
+        dsc.setPassword("tms_xm2017");
         //master
 //        dsc.setUrl("jdbc:mysql://172.16.18.112:3306/xiaodao?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true");
 //        dsc.setDriverName("com.mysql.cj.jdbc.Driver");

zzjs-service/src/main/java/com/miaxis/newgzpt/domain/GzptTrainRecord.java

@@ -28,11 +28,11 @@ public class GzptTrainRecord implements Serializable {
 
     @TableId("ID")
     @ApiModelProperty(hidden = true)
-    private BigDecimal id;
+    private Long id;
 
     @ApiModelProperty(value = "学员ID",hidden = true)
     @TableField("STUDENT_ID")
-    private BigDecimal studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "训练开始时间")
     @TableField("BEGIN_TIME")

zzjs-service/src/main/java/com/miaxis/newgzpt/domain/GzptUserInfo.java

@@ -105,7 +105,7 @@ public class GzptUserInfo implements Serializable {
 
     @ApiModelProperty(value = "外部系统主健ID 如果platForm=1")
     @TableField("OUT_ID")
-    private BigDecimal outId;
+    private Long outId;
 
     @ApiModelProperty(value = "系统版本号 软件版本号")
     @TableField("VERSION")
@@ -125,7 +125,7 @@ public class GzptUserInfo implements Serializable {
 
     @ApiModelProperty(value = "培训阶段 1、第一阶段 2、第二阶段 3、第三阶段 4、第四阶段")
     @TableField("PXJD")
-    private BigDecimal pxjd;
+    private Integer pxjd;
 
     @ApiModelProperty(value = "MD5加密的支付密码")
     @TableField("PAY_PWD")
@@ -136,11 +136,11 @@ public class GzptUserInfo implements Serializable {
 
     @ApiModelProperty(value = "模拟训练激活状态 0 未激活 1 已激活")
     @TableField("MN_STATUS")
-    private BigDecimal mnStatus;
+    private Integer mnStatus;
 
     @ApiModelProperty(value = "远程教育激活状态 0 未激活 1 已激活")
     @TableField("EDU_STATUS")
-    private BigDecimal eduStatus;
+    private Integer eduStatus;
 
     @ApiModelProperty(value = "小程序openin")
     @TableField("OPEN_ID")