Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/AppResumptionDataInfoVo.java

@@ -65,4 +65,7 @@ public class AppResumptionDataInfoVo {
     @ApiModelProperty(value = "要点排序值",notes = "如果没有设置排序,那么放在最后")
     private Integer pointSort=999;
 
+    @ApiModelProperty(value = "数据状态：1保存未处理，2保存已处理")
+    private Integer dataStatus;
+
 }

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

@@ -409,7 +409,7 @@
         t.image_list       as imageList,
         t.host_id          as hostId,
         t.recorder_id      as recorderId,
-        u.name             as hostName,
+        IFNULL(u.name,t.host_name)  as hostName,
         u1.name            as recorderName,
         t.pdf_url          as pdfUrl,
         t.file_list        as file,

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

@@ -259,7 +259,7 @@
         status,
         concat(SUBSTR( t.start_date, 1, 10 ),'-',SUBSTR( t.end_date, 1, 10 )) as taskDate,
         t.org_name,
-        u.name as hostName,
+        IFNULL(u.name,t.host_name) as hostName,
         u1.name as recorderName,
         t.training_start_date_time,
         t.training_end_date_time,

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -243,7 +243,7 @@
         INNER JOIN core_resumption_data d on d.resumption_id = n.resumption_id and d.area_id = a.id
 
         <!--where d.resumption_id = #{dto.resumptionId}-->
-        where n.resumption_id = #{dto.resumptionId}
+        where n.status=1 and n.resumption_id = #{dto.resumptionId}
     </select>
 
     <!--    <resultMap id="secMap" type="com.isp.dict.domain.SecBookDtInst">-->
@@ -281,6 +281,7 @@
                d.submit_time                                       AS executeTime,
                d.res_remark                                        AS resRemark,
                d.res_status                                        AS executeStatus,
+               d.data_status                                       AS dataStatus,
                d.id                                                AS dataId,
                d.item_id,
                d.res_value,