浏览代码

教育培训代码提交

jingyuanchao 2 年之前
父节点
当前提交
b26229e34e

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -97,7 +97,7 @@ public class CoreEduTrainingTaskController extends BaseController {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskSign(request));
     }
 
-    @ApiOperation(value = "教育培训签名")
+    @ApiOperation(value = "生成教育培训登记簿")
     @GetMapping("build/{id}")
     public AjaxResult pdf(@PathVariable("id") Long id) {
         return coreEduTrainingTaskService.buildEduPdf(id);

+ 9 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -388,7 +388,15 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         }
         taskToUser.setSign(1);
         taskToUser.setSignImage(request.getSignImage());
-        return taskToUserMapper.updateSign(taskToUser);
+        final int sign = taskToUserMapper.updateSign(taskToUser);
+        final List<CoreEduTrainingTaskToUser> taskToUserList = taskToUserMapper.selectList(new LambdaUpdateWrapper<CoreEduTrainingTaskToUser>()
+                .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, request.getId()));
+        //如果存在用户数据,筛选出参与人员中签名图片为空的数据,如果count等于0说明全部签名完成
+        final long count = taskToUserList.stream().filter(user -> ObjectUtil.equal(user.getType(), 1) && ObjectUtil.isEmpty(user.getSignImage())).count();
+        if (ObjectUtil.isNotEmpty(taskToUserList) && count < 1) {
+            buildEduPdf(request.getId());
+        }
+        return sign;
     }
 
     @Override