工作台代码提交,知识库发布机构修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/dto/PanelListDto.java

@@ -12,9 +12,12 @@ public class PanelListDto {
 
     private Long userId;
     private Long orgId;
+    private String orgPath;
 
     private List<Long> roleIdList;
 
+    private List<Integer> statusList;
+
 
     private Date startTime;
     private Date endTime;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -1,6 +1,9 @@
 package com.xunmei.common.core.domain.panel.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +15,9 @@ public class PanelListVo {
     @ApiModelProperty(value = "面板功能类型")
     private Integer type;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "面板任务id")
+    private Long id;
 
     @ApiModelProperty(value = "面板功能名称")
     private String taskName;

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

@@ -11,6 +11,7 @@ import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskReportDto;
 import com.xunmei.common.core.domain.drill.vo.*;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -41,5 +42,7 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
 
     int updateStatusById(@Param("drillTaskId") Long drillTaskId, @Param("recStatus") Integer recStatus);
 
-    List<PanelListVo> selectCurUserTaskList(@Param("request") PanelListDto request);
+    List<PanelListVo> selectCurUserTaskList(@Param("request") PanelListDto request,@Param("list") List<Integer> list);
+
+    List<PanelListVo> selectWaitEvaluateTaskList(@Param("request") PanelListDto panelListDto);
 }

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

@@ -799,7 +799,17 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
-        List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto);
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                orgService.selectOrgById(panelListDto.getOrgId(), SecurityConstants.FROM_SOURCE), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        List<Integer> statusList = new ArrayList<>();
+        Collections.addAll(statusList,0,1);
+        List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto,statusList);
+
+        if (!OrgTypeEnum.YINGYE_WANGDIAN.getCode().equals(sysOrg.getType())) {
+            //查询待评价数据
+            List<PanelListVo> list2 = coreDrillTaskMapper.selectWaitEvaluateTaskList(panelListDto);
+            list.addAll(list2);
+        }
 
         list.forEach(item -> {
             item.setType(PanelTypeEnums.DRILL.getCode());

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

@@ -141,7 +141,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     private void dealData(CoreEduTrainingTaskPageVo record, List<CoreEduTrainingTaskPageVo> records, Map<Long, List<CoreEduTrainingTaskToRole>> listMap) {
         record.setNo(records.indexOf(record) + 1);
-        record.setTypeText(EduTrainingType.getName(record.getType()));
+        //record.setTypeText(EduTrainingType.getName(record.getType()));
         record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
 
         List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
@@ -176,7 +176,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     public CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id) {
         CoreEduTrainingTaskDetailVo detailVo = coreEduTrainingTaskMapper.selectEduTrainingTaskDetail(id);
 
-        detailVo.setTypeText(EduTrainingType.getName(detailVo.getType()));
+        //detailVo.setTypeText(EduTrainingType.getName(detailVo.getType()));
         if (ObjectUtil.isNotEmpty(detailVo.getFile())) {
             detailVo.setFileList(JSON.parseArray(detailVo.getFile(), String.class));
         }

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

@@ -235,7 +235,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
             sysLearningMaterials.setFileNames(String.join(",", list1));
         }
         sysLearningMaterials.setIsOpen(0);
-        SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
         if (sysOrg != null) {
             sysLearningMaterials.setOrgName(sysOrg.getShortName());
             sysLearningMaterials.setOrgPath(sysOrg.getPath());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/controller/PanelController.java

@@ -4,6 +4,7 @@ package com.xunmei.core.panel.controller;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingPlanPageDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.panel.vo.PanelResultVo;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
@@ -34,8 +35,8 @@ public class PanelController {
     @ApiOperation(value = "App面板接口")
     //@RequiresPermissions("core:panel:list")
     @GetMapping("/list")
-    public List<PanelResultVo> list() throws ExecutionException, InterruptedException, TimeoutException {
-        return panelService.selectPage();
+    public AjaxResult list() throws ExecutionException, InterruptedException, TimeoutException {
+        return AjaxResult.success(panelService.selectPage());
     }
 
 }

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

@@ -279,12 +279,13 @@
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select  title as taskName,t.start_date startTime,t.end_date as endTime
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime
         from core_drill_task t inner join core_drill_task_to_role tr  on t.id=tr.drill_task_id
         where t.org_id =#{request.orgId} and  tr.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
+        and t.status in (0,1,2)
         <if test="request.startTime != null and request.endTime != null">
         and (
         (
@@ -303,4 +304,28 @@
         )
         </if>
     </select>
+
+    <select id="selectWaitEvaluateTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime
+        from core_drill_task t
+        where  t.status =2
+        and t.org_path like concat(#{request.orgPath},'%')
+        <if test="request.startTime != null and request.endTime != null">
+            and (
+            (
+            #{request.startTime}   <![CDATA[<=]]> t.start_date
+            and #{request.endTime}     <![CDATA[>=]]> t.start_date
+            )
+            or
+            (
+            #{request.startTime}   <![CDATA[<=]]> t.end_date
+            and #{request.endTime}     <![CDATA[>=]]> t.end_date
+            )
+            or (
+            #{request.startTime}   <![CDATA[>=]]> t.start_date
+            and #{request.endTime}     <![CDATA[<=]]> t.end_date
+            )
+            )
+        </if>
+    </select>
 </mapper>

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

@@ -66,7 +66,7 @@
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
-        select t.id, plan_id, t.org_id, t.org_name, title, type, status, host_id,u.name as hostName,
+        select t.id, plan_id, t.org_id, t.org_name, title, status, host_id,u.name as hostName,
         start_date, end_date, t.training_start_date_time,t.training_end_date_time, t.pdf_url as pdfUrl
         from core_edu_training_task t left join sys_user u on t.host_id=u.id
         <where>
@@ -190,12 +190,13 @@
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select title as taskName,t.start_date startTime,t.end_date as endTime
-        from core_edu_training_task t inner join core_edu_training_task_to_role tr on t.id=tr.role_id
+        select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime
+        from core_edu_training_task t inner join core_edu_training_task_to_role tr on t.id=tr.edu_training_task_id
         where t.org_id =#{request.orgId} and  tr.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
+        and t.status in (0,1)
             and (
             (
             #{request.startTime}   <![CDATA[<=]]> t.start_date

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

@@ -198,11 +198,12 @@
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
 
-        select name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
-        from core_resumption t where t.org_id =#{request.orgId} and  t.role_id in
+        select distinct t.id as id, name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
+        from core_resumption t where  t.org_id =#{request.orgId} and  t.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
+        and  t.status in (1,2)
         and ((
             #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
         and #{request.endTime} >= t.plan_start_time

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -425,11 +425,12 @@
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-     select  task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
+     select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
         from core_monitoring_retrieval_task t where t.org_id =#{request.orgId} and  t.role_id in
          <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
          </foreach>
+        and t.status in (0,1)
         and ((
                 #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
                 and #{request.endTime} >= t.plan_start_time

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -733,11 +733,12 @@
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
+        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime
         from core_safety_task t where t.org_id =#{request.orgId} and  t.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
+        and t.status in (1,2)
         and ((
         #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
         and #{request.endTime} >= t.plan_start_time