学习资料弹窗查询bug修改

project_data/sql/0.0.2/soc/soc.sql

@@ -1480,3 +1480,5 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 -- 新增系统参数：是否强制删除计划及其下属任务数据
 delete from sys_config where config_key='FORCE_DELETE_PLAN_DATA' limit 1;
 INSERT INTO sys_config (config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark) VALUES ('是否强制删除计划', 'FORCE_DELETE_PLAN_DATA', '0', 'Y', 'slsjyc', '2023-09-28 16:38:28', '', null, '0:否,1:是');
+-- 修改培训任务表状态字段含义注释
+alter table core_edu_training_task  modify status int null comment '任务状态:0:待培训,1:待签名,2:已完成,3:已逾期,4:待提交';

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

@@ -162,7 +162,6 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         }
         String[] split = sysOrg.getPath().split("-");
         Stream.of(split).forEach(s -> list.add(Long.valueOf(s)));
-        list.remove(orgId);
         return list;
     }
 
@@ -308,6 +307,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     @Override
     public TableDataInfo filePageList(SysLearningMaterialsFileListPageDto request) {
         final List<Long> list = dealParentOrgId(request);
+
         request.setOrgIdList(list);
         final IPage<SysLearningMaterialsFileListVo> page = sysLearningMaterialsMapper.selectFilePageList(request.getPageRequest(), request);
         final List<SysLearningMaterialsFileListVo> records = page.getRecords();

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

@@ -196,7 +196,7 @@
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        and t.status in (0,1)
+        and t.status in (0,1,4)
             and (
             (
             #{request.startTime}   <![CDATA[<=]]> t.start_date

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

@@ -272,21 +272,12 @@
 
     <select id="selectFilePageList" resultType="com.xunmei.common.core.domain.edu.vo.SysLearningMaterialsFileListVo">
         select id,org_id as orgId,title as title,org_name as orgName,file_list as file
-
         from sys_learning_materials m
-        where m.deleted = 0
-        <include refid="filePageList"/>
-        <if test="request.orgPath != null and request.orgPath != '' ">
-            and m.org_path like concat(#{request.orgPath}, '%')
-        </if>
-        <if test="request.orgIdList.size>0">
-            or ( m.org_id in
+        where m.deleted = 0  and  m.org_id in
             <foreach collection="request.orgIdList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
             <include refid="filePageList"/>
-            )
-        </if>
         order by m.org_id, m.create_time desc
     </select>
     <sql id="pageRequest">