培训/演练:修改 bug修改

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

@@ -77,8 +77,8 @@ public class CoreDrillPlanPageVo {
     @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在已完成的任务", notes = "1:存在, 0/null:不存在")
     private Integer done;
 
-    @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在未完成的任务", notes = "1:存在, 0/null:不存在")
-    private Integer unDone;
+    @ApiModelProperty(value = "标准机构下发的计划是否已生成了任务", notes = "1:生成, 0/null:未生成")
+    private Integer haTask;
 
     //private String planRoleNameList;
 

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

@@ -64,10 +64,10 @@ public class CoreEduTrainingPlanPageVo {
 
     @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在已完成的任务", notes = "1:存在, 0/null:不存在")
     private Integer done;
-    @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在未完成的任务", notes = "1:存在, 0/null:不存在")
-    private Integer unDone;
+    @ApiModelProperty(value = "标准机构下发的计划是否已生成了任务", notes = "1:生成, 0/null:未生成")
+    private Integer hasTask;
 
-    private String planRoleNameList;
+    //private String planRoleNameList;
 
     private List<CoreEduTrainingPlanPageVo> children;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillTaskMapper.java

@@ -58,4 +58,6 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
     Integer checkHasTaskIsDoneByPlanIdOrParentId(@Param("planId") Long planId);
 
     Integer checkHasTaskUnDoneByPlanParentId(@Param("planId") Long planId);
+
+    Integer checkHasTaskByPlanParentId(@Param("planId") Long planId);
 }

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

@@ -140,9 +140,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (record.getStandard() == 1) {
             final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);
-            //是否存在未完成的任务
-            final Integer unDone = coreDrillTaskMapper.checkHasTaskUnDoneByPlanParentId(record.getId());
-            record.setUnDone(unDone);
+            //是否已生成了任务
+            final Integer hasTask = coreDrillTaskMapper.checkHasTaskByPlanParentId(record.getId());
+            record.setHaTask(hasTask);
         }
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingTaskMapper.java

@@ -55,4 +55,6 @@ public interface CoreEduTrainingTaskMapper extends BaseMapper<CoreEduTrainingTas
 
 
     Integer checkHasTaskUnDoneByPlanParentId(@Param("planId") Long planId);
+
+    Integer checkHasTaskByPlanParentId(@Param("planId") Long planId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -136,9 +136,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             //是否存在已完成的任务
             final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);
-            //是否存在未完成的任务
-            final Integer unDone = coreEduTrainingTaskMapper.checkHasTaskUnDoneByPlanParentId(record.getId());
-            record.setUnDone(unDone);
+            //是否已生成了任务
+            final Integer hasTask = coreEduTrainingTaskMapper.checkHasTaskByPlanParentId(record.getId());
+            record.setHasTask(hasTask);
         }
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -384,4 +384,8 @@
           and (t.plan_id = #{planId} or plan_id in (select id from core_drill_plan where parent_id = #{planId}))
         limit 1
     </select>
+
+    <select id="checkHasTaskByPlanParentId" resultType="java.lang.Integer">
+        SELECT 1 FROM `core_drill_task` where plan_id= #{planId} LIMIT 1;
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -289,4 +289,8 @@
           and (t.plan_id = #{planId} or plan_id in (select id from core_edu_training_plan where parent_id = #{planId}))
         limit 1
     </select>
+
+    <select id="checkHasTaskByPlanParentId" resultType="java.lang.Integer">
+        SELECT 1 FROM `core_edu_training_task` where plan_id=#{planId} LIMIT 1;
+    </select>
 </mapper>