Merge branch 'dev' into 'master'

完成培训接口

See merge request !2

cloud-training-project-api/src/main/java/com/yizhi/training/application/feign/TrainingProjectClient.java

@@ -348,4 +348,14 @@ public interface TrainingProjectClient {
      */
     @GetMapping("/trainingProject/top/get")
     List<TrainingProjectVo> getTop();
+    
+    /**
+     * 完成培训
+     * @param trainingProjectId
+     * @param siteId
+     * @param accountId
+     * @return
+     */
+    @GetMapping("/trainingProject/finished")
+    Boolean trainingProjectFinished(@RequestParam("trainingProjectId") Long trainingProjectId, @RequestParam("siteId") Long siteId, @RequestParam("accountId") Long accountId);
 }

cloud-training-project-service/src/main/java/com/yizhi/training/application/controller/TrainingProjectController.java

@@ -943,5 +943,15 @@ public class TrainingProjectController {
     	List<TrainingProjectVo> list = trainingProjectService.getTop(siteId);
     	return list;
     }
+    
+    /**
+     * 完成培训
+     * @param trainingProjectId
+     * @return
+     */
+    @GetMapping("/finished")
+    Boolean trainingProjectFinished(@RequestParam("trainingProjectId") Long trainingProjectId, @RequestParam("siteId") Long siteId, @RequestParam("accountId") Long accountId) {
+    	return trainingProjectService.trainingProjectFinished(trainingProjectId, siteId, accountId);
+    }
 }
 

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/ITrainingProjectService.java

@@ -246,4 +246,13 @@ public interface ITrainingProjectService extends IService<TrainingProject> {
      * @return
      */
 	List<TrainingProjectVo> getTop(Long siteId);
+
+	/**
+	 * 完成培训
+	 * @param trainingProjectId
+	 * @param siteId
+	 * @param accountId
+	 * @return
+	 */
+	Boolean trainingProjectFinished(Long trainingProjectId, Long siteId, Long accountId);
 }

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java

@@ -1444,4 +1444,19 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
 	public List<TrainingProjectVo> getTop(Long siteId) {
 		return trainingProjectMapper.getTop(siteId);
 	}
+
+	@Override
+	public Boolean trainingProjectFinished(Long trainingProjectId, Long siteId, Long accountId) {
+		
+		TpStudentProjectRecord entity = new TpStudentProjectRecord();
+		entity.setId(idGenerator.generate());
+		entity.setSiteId(siteId);
+		entity.setAccountId(accountId);
+		entity.setTrainingProjectId(trainingProjectId);
+		entity.setFinishDate(new Date());
+		entity.setFinished(1);
+		Integer count = tpStudentProjectRecordMapper.insert(entity);
+		
+		return count == 0 ? false : true;
+	}
 }