演练bug处理

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

@@ -116,6 +116,8 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "推荐状态",example = "0:正常案例、1:行社优秀案例、2:已推荐地区优秀案例、3:地区优秀案例、4:已推荐省级优秀案例、5:省级优秀案例")
     private Integer recStatus;
 
+    private Integer status;
+
     @ApiModelProperty(value = "推荐状态名称")
     private String recStatusText;
 

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

@@ -126,7 +126,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             child.setPlanRoleNameList(roleNameList);
         }*/
         if (record.getStandard() == 1) {
-            final Integer done = coreDrillTaskMapper.checkHasTaskIsExecuteByPlanParentId(record.getId());
+            final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);
         }
     }

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

@@ -43,7 +43,7 @@
                start_date,
                end_date,
                drill_start_time,
-                drill_end_time,
+               drill_end_time,
                file_list,
                image_list,
                pdf_url,
@@ -65,7 +65,8 @@
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
         select t.id, plan_id, t.org_id, t.org_name, title, type as type, status,rec_status, host_id,u.name as hostName,
-        start_date, end_date, t.drill_start_time,t.drill_end_time, t.pdf_url as pdfUrl,drill_site as drillSite,comment_score as
+        start_date, end_date, t.drill_start_time,t.drill_end_time, t.pdf_url as pdfUrl,drill_site as
+        drillSite,comment_score as
         commentScore,comment
         from core_drill_task t left join sys_user u on t.host_id=u.id
         <where>
@@ -157,7 +158,8 @@
                u2.name            as recorderName,
                t.pdf_url          as pdfUrl,
                t.file_list        as file,
-               t.rec_status       as recStatus
+               t.rec_status       as recStatus,
+               t.status           as status
 
         from core_drill_task t
                  left join sys_user u on u.id = t.host_id