演练任务: 行社以下用户屏蔽"待评价"数据

project_data/sql/0.0.4/soc/soc.sql

@@ -5,3 +5,7 @@ DELETE FROM `sys_dict_data` WHERE dict_type='rule_status';
 INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113157, '手册状态', 'rule_status', '0', 'jwx', '2023-11-27 14:55:51', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231114641, 0, '启用', '0', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:36', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231114643, 1, '停用', '1', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+
+-- 修改教育培训任务状态字典描述
+update sys_dict_data set dict_label='待登记' where dict_type='edu_training_do_status' and dict_label='待培训' and dict_value=0 LIMIT 1;
+update sys_dict_data set dict_label='登记中' where dict_type='edu_training_do_status' and dict_label='待提交' and dict_value=4 LIMIT 1;

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.xunmei.common.core.constant.*;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.R;
@@ -135,10 +136,16 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             Map<Long, List<CoreDrillTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreDrillTaskToRole::getDrillTaskId));*/
             final List<CoreDrillTaskPageVo> records = pageData.getRecords();
             final List<SysOrgVO> cacheList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
+            final SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                    orgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             for (CoreDrillTaskPageVo record : records) {
+                //行社以下用户不关心待评价的数据;对于行社以下用户来说签名完成以后就算是已完成,这里仅作文本显示上的修改,不做数据落库上的修改
+                //行社及以上机构用户不受影响
+                if (OrgTypeEnum.HANG_SHE.getCode() >= sysOrg.getType() && record.getStatus().equals(DrillDoStatus.WAIT_COMMENT.getCode())) {
+                    record.setStatus(DrillDoStatus.DONE.getCode());
+                }
                 dealData(record, records, cacheList);
             }
-            // records.sort(getComparator());
         }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);
@@ -169,7 +176,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
     private void dealData(CoreDrillTaskPageVo record, List<CoreDrillTaskPageVo> records, List<SysOrgVO> cacheList) {
         record.setNo(records.indexOf(record) + 1);
-        record.setTypeText(DrillType.getName(record.getType()));
         record.setStatusText(DrillDoStatus.getName(record.getStatus()));
         record.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, record.getCategory()));
         cacheList.stream().filter(org -> ObjectUtil.equal(org.getId(), record.getOrgId())).findFirst().ifPresent(type -> record.setOrgType(type.getType()));