增加 培训列表 及 运维人员培训状态变更接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MaintenanceTrainingDto.java

@@ -22,7 +22,7 @@ public class MaintenanceTrainingDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "运维人员id")
-    private Long maintenanceId;
+    private String userId;
 
     @ApiModelProperty(value = "培训资料id")
     private Long trainingId;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TrainingDto.java

@@ -30,4 +30,7 @@ public class TrainingDto  extends BaseDto {
     @ApiModelProperty(value = "文件地址")
     private String files;
 
+    @ApiModelProperty(value = "学习状态")
+    private String status;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MaintenanceTraining.java

@@ -25,8 +25,8 @@ public class MaintenanceTraining extends BaseEntity {
     /**
      * 运维人员id
      */
-	@TableField("maintenance_id")
-    private Long maintenanceId;
+	@TableField("user_id")
+    private String userId;
 
     /**
      * 培训资料id

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java

@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaintenanceMapper extends BaseMapper<Maintenance> {
 
+    public  void updateTraining(String userId);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceTrainingMapper.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceTraining;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaintenanceTrainingMapper extends BaseMapper<MaintenanceTraining> {
 
+   Map<String,Integer> selectTrainingStatus(String userId);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/TrainingMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Training;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 培训信息表 Mapper 接口
@@ -11,4 +14,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TrainingMapper extends BaseMapper<Training> {
 
+/**
+ * 查询当前人培训资料学习状态
+ * */
+   Page<TrainingDto> currentStudyStatusList(
+           @Param("current") Integer current,
+           @Param("size") Integer size,
+           @Param("userId") String userId);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper">
 
+    <update id="updateTraining">
+    update hygf_maintenance set training_status = '未培训' where foundation_id = (
+        select  sequence_nbr from  std_user_biz where amos_user_id = #{userId}
+    ) and is_delete = 0
+    </update>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceTrainingMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceTrainingMapper">
 
+    <select id="selectTrainingStatus" resultType="java.util.Map">
+        SELECT
+            count(ht.sequence_nbr) as total,
+            count(hmt.sequence_nbr) as num
+        FROM
+            hygf_training AS ht
+                LEFT JOIN hygf_maintenance_training hmt ON hmt.training_id = ht.sequence_nbr AND hmt.user_id = #{userId}
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/TrainingMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.TrainingMapper">
 
+    <select id="currentStudyStatusList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto">
+        SELECT
+            ht.name,
+            ht.type,
+            ht.files,
+            count(hmt.sequence_nbr) as status
+        FROM
+            hygf_training AS ht
+                LEFT JOIN hygf_maintenance_training hmt ON hmt.training_id = ht.sequence_nbr AND hmt.user_id = #{userId}
+
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceTrainingController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -30,6 +31,8 @@ public class MaintenanceTrainingController extends BaseController {
 
     @Autowired
     MaintenanceTrainingServiceImpl maintenanceTrainingServiceImpl;
+    @Autowired
+	MaintenanceServiceImpl maintenanceService;
 
     /**
      * 新增
@@ -41,6 +44,11 @@ public class MaintenanceTrainingController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<MaintenanceTrainingDto> save(@RequestBody MaintenanceTrainingDto model) {
 	    model = maintenanceTrainingServiceImpl.createWithModel(model);
+		boolean flag = maintenanceTrainingServiceImpl.selectTrainingStatus(model.getUserId());
+		//如果是true 则已学习完 需修改运维人员的培训状态为完成 当为完成时  运维方可进行工单业务
+		if (flag){
+			maintenanceService.updateTraining(model.getUserId());
+		}
 		return ResponseHelper.buildResponse(model);
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TrainingController.java

@@ -85,32 +85,31 @@ public class TrainingController extends BaseController {
 	}
 
 	/**
-     * 列表分页查询
+	 * 列表全部数据查询
      *
-     * @param current 当前页
-     * @param current 每页大小
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "培训信息表分页查询",  notes = "培训信息表分页查询")
-	public ResponseModel<Page<TrainingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<TrainingDto> page = new Page<TrainingDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(trainingServiceImpl.queryForTrainingPage(page));
+	@ApiOperation(httpMethod = "GET",value = "培训信息表列表全部数据查询",   notes = "培训信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TrainingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(trainingServiceImpl.queryForTrainingList());
 	}
 
 	/**
-	 * 列表全部数据查询
+	 * 列表分页查询
      *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "培训信息表列表全部数据查询",   notes = "培训信息表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<TrainingDto>> selectForList() {
-	    return ResponseHelper.buildResponse(trainingServiceImpl.queryForTrainingList());
+	@GetMapping(value = "/page")
+	public ResponseModel<Page<TrainingDto>> currentStudyStatusList(Integer current, Integer size) {
+		Page<TrainingDto> page = new Page<TrainingDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+	    return ResponseHelper.buildResponse(trainingServiceImpl.currentStudyStatusList(current,size));
 	}
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java

@@ -51,4 +51,9 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
 
         return null;
    }
+
+
+   public void updateTraining(String userId){
+
+   }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceTrainingServiceImpl.java

@@ -4,10 +4,12 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceTraining;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceTrainingMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IMaintenanceTrainingService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceTrainingDto;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务实现类
@@ -21,6 +23,8 @@ public class MaintenanceTrainingServiceImpl extends BaseService<MaintenanceTrain
      * 分页查询
      */
     public Page<MaintenanceTrainingDto> queryForMaintenanceTrainingPage(Page<MaintenanceTrainingDto> page)   {
+
+
         return this.queryForPage(page, null, false);
     }
 
@@ -30,4 +34,17 @@ public class MaintenanceTrainingServiceImpl extends BaseService<MaintenanceTrain
     public List<MaintenanceTrainingDto> queryForMaintenanceTrainingList()   {
         return this.queryForList("" , false);
     }
+
+    public boolean selectTrainingStatus(String userId){
+
+        //查询培训科目总数及当前已学习总数
+        Map<String, Integer> map = this.getBaseMapper().selectTrainingStatus(userId);
+        Integer total = map.get("total");
+        Integer num = map.get("num");
+        //如果相减是0 即已学习完 反之为学习完
+        if ((total - num) == 0){
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TrainingServiceImpl.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.Training;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.TrainingMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.ITrainingService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TrainingDto;
+import org.apache.ibatis.annotations.Param;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +23,8 @@ public class TrainingServiceImpl extends BaseService<TrainingDto,Training,Traini
      * 分页查询
      */
     public Page<TrainingDto> queryForTrainingPage(Page<TrainingDto> page)   {
+
+
         return this.queryForPage(page, null, false);
     }
 
@@ -30,4 +34,16 @@ public class TrainingServiceImpl extends BaseService<TrainingDto,Training,Traini
     public List<TrainingDto> queryForTrainingList()   {
         return this.queryForList("" , false);
     }
+
+
+
+    /**
+     * 查询当前人培训资料学习状态
+     * */
+   public Page<TrainingDto> currentStudyStatusList(Integer current, Integer size){
+        //查询当前人userId
+       String exeUserId = RequestContext.getExeUserId();
+        //通过userId查询对应运维人员培训表中的数据来区分是否学习
+      return this.getBaseMapper().currentStudyStatusList(current,size,exeUserId);
+   }
 }
\ No newline at end of file