bug处理

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillPlanDetailVo.java

@@ -41,6 +41,9 @@ public class CoreDrillPlanDetailVo {
     @ApiModelProperty(value = "是否立即生效", notes = "0:否,1:是")
     private Boolean buildTaskNow = Boolean.FALSE;
 
+    @ApiModelProperty(value = "是否已下发", notes = "0:否,1:是")
+    private Integer issue;
+
     @ApiModelProperty(value = "培训机构类型")
     private Integer execOrgType;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingPlanDetailVo.java

@@ -41,6 +41,9 @@ public class CoreEduTrainingPlanDetailVo {
     @ApiModelProperty(value = "是否立即生效", notes = "0:否,1:是")
     private Boolean buildTaskNow = Boolean.FALSE;
 
+    @ApiModelProperty(value = "是否已下发", notes = "0:否,1:是")
+    private Integer issue;
+
     @ApiModelProperty(value = "培训机构类型")
     private Integer execOrgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -1014,9 +1014,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             long count = coreDrillTaskToUserService.count(new LambdaQueryWrapper<CoreDrillTaskToUser>()
                     .eq(CoreDrillTaskToUser::getDrillTaskId, drillTaskId)
                     .eq(CoreDrillTaskToUser::getType, 1)
+                    .eq(CoreDrillTaskToUser::getSign, 0)
                     .eq(CoreDrillTaskToUser::getUserId, userId));
             //如果当前用户不在参与用户范围中 或  当前时间大于任务的结束时间
-            return item.getStatus() == 1 && count < 1;
+            //count==0 说明这个任务 未签名的参与人员中不包括当前用户，所以需要删除
+            return item.getStatus() == 1 && count == 0;
         });