Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteConfigService.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.CORE_SERVICE, fallbackFactory = RemoteConfigFallbackFactory.class)
+@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteConfigFallbackFactory.class)
 public interface RemoteConfigService {
     @GetMapping("/config/findFirstByCode")
     R<SysConfig> findFirstByCode(@RequestParam("code") String code, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteDictDataService.java

@@ -0,0 +1,30 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.system.api.domain.SysDictData;
+import com.xunmei.system.api.factory.RemoteDictDataFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+
+/**
+ * 字典服务
+ * 
+ * @author xunmei
+ */
+@FeignClient(contextId = "remoteDictDataService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDictDataFallbackFactory.class)
+public interface RemoteDictDataService
+{
+    /**
+     * 字典服务，根据类型获取字典
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    @GetMapping(value = "/type/{dictType}")
+     public List<SysDictData> dictType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDictDataFallbackFactory.java

@@ -0,0 +1,32 @@
+package com.xunmei.system.api.factory;
+
+import com.xunmei.system.api.RemoteDictDataService;
+import com.xunmei.system.api.domain.SysDictData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 字典服务降级处理
+ *
+ * @author xunmei
+ */
+@Component
+public class RemoteDictDataFallbackFactory implements FallbackFactory<RemoteDictDataService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteDictDataFallbackFactory.class);
+
+    @Override
+    public RemoteDictDataService create(Throwable throwable) {
+        log.error("字典服务调用失败:{}", throwable.getMessage());
+        return new RemoteDictDataService() {
+
+            @Override
+            public List<SysDictData> dictType(String dictType, String source) {
+                return null;
+            }
+        };
+    }
+}

soc-api/soc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -6,3 +6,4 @@ com.xunmei.system.api.factory.RemoteConfigFallbackFactory
 com.xunmei.system.api.factory.RemoteWorkTimesFallbackFactory
 com.xunmei.system.api.factory.RemoteSyncOrgAndUserFactory
 com.xunmei.system.api.factory.RemoteTaskFallbackFactory
+com.xunmei.system.api.factory.RemoteDictDataFallbackFactory

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/ErrorMsgConstants.java

@@ -6,4 +6,5 @@ public class ErrorMsgConstants {
     public static final String REMOTE_CALL_ERROR = "远程调用错误: ";
 
     public static final String QUERY_ORG_DATA_ERROR = "获取机构信息失败!";
+    public static final String QUERY_DICT_DATA_ERROR = "获取字典信息失败!";
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskPageDto.java

@@ -1,13 +1,17 @@
 package com.xunmei.common.core.domain.edu.dto;
 
-import com.xunmei.common.core.web.domain.BaseEntity;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
 @Data
-public class CoreEduTrainingTaskPageDto extends BaseEntity {
+@EqualsAndHashCode(callSuper = true)
+public class CoreEduTrainingTaskPageDto extends PageRequest {
 
 
     @ApiModelProperty(value = "学习主题")
@@ -23,4 +27,16 @@ public class CoreEduTrainingTaskPageDto extends BaseEntity {
     @ApiModelProperty("任务时间范围")
     private Date[] range;
 
+    private Date startTime;
+
+    private Date endTime;
+
+
+    public CoreEduTrainingTaskPageDto() {
+        if (ObjectUtil.isNotEmpty(this.range)) {
+            this.startTime = DateUtil.beginOfDay(this.range[0]);
+            this.endTime = DateUtil.endOfDay(this.range[0]);
+        }
+    }
+
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -0,0 +1,74 @@
+package com.xunmei.common.core.domain.edu.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CoreEduTrainingTaskDetailVo {
+
+    private int no;
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "教育培训计划Id")
+    private Long planId;
+
+    @ApiModelProperty(value = "机构")
+    private Long orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "学习主题")
+    private String title;
+
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * 类型
+     */
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeText;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始日期")
+    private Date startDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "截止日期")
+    private Date endDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训时间")
+    private Date dateTime;
+
+
+    @TableField("content")
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+
+    @TableField("note")
+    @ApiModelProperty(value = "总结")
+    private String note;
+
+    @TableField("image_list")
+    @ApiModelProperty(value = "图片")
+    private String imageList;
+
+
+    @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
+    private List<CoreEduTrainingTaskToUser> taskUserList;
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -1,7 +1,70 @@
 package com.xunmei.common.core.domain.edu.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class CoreEduTrainingTaskPageVo {
+
+    private int no;
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "教育培训计划Id")
+    private Long planId;
+
+    @ApiModelProperty(value = "机构")
+    private Long orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "学习主题")
+    private String title;
+
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * 类型
+     */
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeText;
+
+    @ApiModelProperty(value = "主持人")
+    private Long hostId;
+
+    @ApiModelProperty(value = "主持人名称")
+    private Long hostName;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始日期")
+    private Date startDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "截止日期")
+    private Date endDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训时间")
+    private Date dateTime;
+
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     */
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "状态名称")
+    private String statusText;
+
+    private String taskRoleNameList;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/domain/CoreMonitoringRetrievalTask.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.domain;
+package com.xunmei.common.core.domain.retrieval.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/dto/RetrievalTaskPageDto.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/dto/RetrievalTaskPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.dto;
+package com.xunmei.common.core.domain.retrieval.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/vo/CoreMonitoringRetrievalTaskVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.vo;
+package com.xunmei.common.core.domain.retrieval.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -130,6 +130,8 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     @ApiModelProperty(value = "状态")
     private Long status;
 
+    private String statusText;
+
     /**
      * 角色id
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingDoStatus.java

@@ -10,9 +10,9 @@ import java.util.Map;
 @AllArgsConstructor
 public enum EduTrainingDoStatus {
 
-    UN_START(0, "未开始"),
-    DONE(1, "已完成"),
-    overdue(2, "逾期"),
+    WAIT_RECORDED(0, "未开始"),
+    WAIT_SIGN(1, "已完成"),
+    DONE(2, "逾期"),
 
 
     ;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/web/domain/PageRequest.java

@@ -0,0 +1,25 @@
+package com.xunmei.common.core.web.domain;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+@Data
+public class PageRequest {
+
+    private Long orgId;
+
+    private String orgPath;
+
+    private Boolean checkSub;
+
+    private int page = 0;
+
+    private int size = 10;
+
+    public <T> Page<T> getPageRequest() {
+        Page<T> mePage = new Page<>();
+        mePage.setCurrent(this.getPage());
+        mePage.setSize(this.getSize());
+        return mePage;
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -1,6 +1,6 @@
 package com.xunmei.core.access.dto;
 
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import lombok.Data;
 
 import java.util.Date;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -11,9 +11,8 @@ import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingTaskMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +23,5 @@ public interface CoreEduTrainingTaskMapper extends BaseMapper<CoreEduTrainingTas
 
     Page<CoreEduTrainingTaskPageVo> selectPageData(Page<CoreEduTrainingTaskPageVo> page, @Param("request") CoreEduTrainingTaskPageDto request);
 
+    CoreEduTrainingTaskDetailVo selectEduTrainingTaskDetail(@Param("id") Long id);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
@@ -24,7 +25,7 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
      * @param id 教育任务主键
      * @return 教育任务
      */
-    CoreEduTrainingTask selectCoreEduTrainingTaskById(Long id);
+    CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id);
 
     /**
      * 查询教育任务列表

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

@@ -1,7 +1,9 @@
 package com.xunmei.core.edu.service.impl;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -9,17 +11,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToExecOrg;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToRole;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToRole;
+import com.xunmei.common.core.domain.edu.domain.*;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
+import com.xunmei.common.core.enums.edu.EduTrainingType;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
+import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToRoleMapper;
+import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToUserMapper;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
 import com.xunmei.system.api.RemoteOrgService;
@@ -48,10 +51,33 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private RemoteOrgService orgService;
     @Autowired
     private ICoreEduTrainingTaskToRoleService coreEduTrainingTaskToRoleService;
+    @Autowired
+    private CoreEduTrainingTaskToRoleMapper taskToRoleMapper;
+    @Autowired
+    private CoreEduTrainingTaskToUserMapper taskToUserMapper;
 
     @Override
     public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
-        IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPage(), request);
+        if (Boolean.TRUE.equals(request.getCheckSub())) {
+            SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            request.setOrgPath(org.getPath());
+        }
+        IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPageRequest(), request);
+        if (ObjectUtil.isNotEmpty(pageData.getRecords())) {
+            List<Long> idList = pageData.getRecords().stream().map(CoreEduTrainingTaskPageVo::getId).collect(Collectors.toList());
+            List<CoreEduTrainingTaskToRole> roleList = taskToRoleMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>()
+                    .in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, idList));
+            Map<Long, List<CoreEduTrainingTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToRole::getEduTrainingTaskId));
+            for (CoreEduTrainingTaskPageVo record : pageData.getRecords()) {
+                record.setTypeText(EduTrainingType.getName(record.getType()));
+                record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
+                List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
+                if (ObjectUtil.isEmpty(coreEduTrainingTaskToRoles)) {
+                    continue;
+                }
+                record.setTaskRoleNameList(coreEduTrainingTaskToRoles.stream().map(CoreEduTrainingTaskToRole::getRoleName).collect(Collectors.joining(",")));
+            }
+        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);
 
@@ -66,8 +92,11 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
      * @return 教育任务
      */
     @Override
-    public CoreEduTrainingTask selectCoreEduTrainingTaskById(Long id) {
-        return coreEduTrainingTaskMapper.selectById(id);
+    public CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id) {
+        CoreEduTrainingTaskDetailVo detailVo = coreEduTrainingTaskMapper.selectEduTrainingTaskDetail(id);
+        List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectByMap(MapUtil.of("plan_id", id));
+        detailVo.setTaskUserList(userList);
+        return detailVo;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -5,6 +5,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.resumption.domain.AppPlan;
+import com.xunmei.core.resumption.domain.AppPlanToItem;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
@@ -115,7 +116,11 @@ public class ApiPlanController {
         return AjaxResult.success(app);
     }
 
-
+    @ApiOperation(value = "获取详情")
+    @GetMapping(value = "/getPointIds/{id}")
+    public AjaxResult getPointIds(@PathVariable  Long id){
+        return AjaxResult.success(appPlanService.selectItemIdsByPlanId(id));
+    }
 
     /**
      * 获取详情数据

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -41,8 +41,8 @@ public class TaskController {
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 //        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
-        taskBusiness.syncHour(datetime,6);
-        taskBusiness.syncDay(datetime,0);
+//        taskBusiness.syncHour(datetime,6);
+        taskBusiness.syncDay(datetime,2);
 //        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
         return AjaxResult.success();
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -25,7 +25,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan")
+@TableName("core_resumption_plan")
 @AllArgsConstructor
 public class AppPlan extends Model<AppPlan> implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -60,7 +60,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 检查机构类型
      */
-    private Integer checkOrgType;
+//    private Integer checkOrgType;
     /**
      * 检查类型：0：机构类型，1：具体机构
      */
@@ -72,6 +72,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 计划状态：0：启用，1禁用
      */
+
     private Integer planStatus;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToCheckOrg.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_check_org")
+@TableName("core_resumption_plan_to_check_org")
 public class AppPlanToCheckOrg extends Model<AppPlanToCheckOrg> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToExecOrg.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_exec_org")
+@TableName("core_resumption_plan_to_exec_org")
 public class AppPlanToExecOrg extends Model<AppPlanToExecOrg> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToItem.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 
 /**
- * 计划要点关联表(t_app_plan_to_item)实体类
+ * 计划要点关联表(core_resumption_plan_to_item)实体类
  *
  * @author 高雄
  * @since 2022-05-05 17:02:28
@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_item")
+@TableName("core_resumption_plan_to_item")
 public class AppPlanToItem extends Model<AppPlanToItem> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlanToRole.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("sys_plan_to_role")
+@TableName("core_resumption_plan_to_role")
 public class AppPlanToRole extends Model<AppPlanToRole> implements Serializable {
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/SysResumption.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 import com.xunmei.common.core.web.domain.BaseEntity;
 
 /**
- * 【请填写功能名称】对象 sys_resumption
+ * 【请填写功能名称】对象 core_resumption
  *
  * @author xunmei
  * @date 2023-08-22
@@ -25,7 +25,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sys_resumption")
+@TableName("core_resumption")
 @ApiModel(value = "SysResumption对象", description = "【请填写功能名称】")
 public class SysResumption extends BaseEntity {
     private static final long serialVersionUID = 1L;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppPlanToItemMapper.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
- * 计划要点关联表(t_app_plan_to_item)数据Mapper
+ * 计划要点关联表(core_resumption_plan_to_item)数据Mapper
  *
  * @author 高雄
  * @since 2022-05-05 17:02:28

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/AppPlanService.java

@@ -14,12 +14,14 @@ public interface AppPlanService extends IService<AppPlan> {
 
     /**
      * 获取分页数据
+     *
      * @return
      */
-   Page<AppPlan> selectPage(AppPlanVo info);
+    Page<AppPlan> selectPage(AppPlanVo info);
+
+    List<Long> selectItemIdsByPlanId(Long id);
 
     /**
-     *
      * @param plan_id
      * @return
      */
@@ -29,13 +31,15 @@ public interface AppPlanService extends IService<AppPlan> {
 
     /**
      * 获取规范
+     *
      * @param info
      * @return
      */
-    List<Map<String,Object>> findByOrg(RuleRequestVo info);
+    List<Map<String, Object>> findByOrg(RuleRequestVo info);
 
     /**
      * 检查要点分页
+     *
      * @param info
      * @return
      */
@@ -43,14 +47,16 @@ public interface AppPlanService extends IService<AppPlan> {
 
     /**
      * 新增或者修改
+     *
      * @param app
      * @author 高雄
      * @time 2022/5/5 16:38
      */
-    void saveOrUpdatePlan(AppPlanVo app)throws Exception;
+    void saveOrUpdatePlan(AppPlanVo app) throws Exception;
 
     /**
      * 获取计划详情数据
+     *
      * @param id
      * @return
      */
@@ -58,13 +64,15 @@ public interface AppPlanService extends IService<AppPlan> {
 
     /**
      * 删除计划
+     *
      * @param id
      * @throws Exception
      */
-    void deleted(Long id)throws Exception;
+    void deleted(Long id) throws Exception;
 
     /**
      * 获取履职计划对于的履职角色
+     *
      * @param id
      * @return
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -52,6 +52,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     @Autowired
     private SysResumptionMapper sysResumptionMapper;
 
+    @Override
+    public List<Long> selectItemIdsByPlanId(Long id) {
+        return appPlanToItemMapper.selectItemIdsByPlanId(id);
+    }
 //    @Autowired
 //    private ResumptionService resumptionService;
 
@@ -104,8 +108,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             String name = (String) redisTemplate.opsForValue().get(key);
             ruleItemVo.setSafeTypeText(name);
 
-            if(ObjectUtil.isNotNull(ruleItemVo.getBusinessType())){
-                key="dict_config_point_business_type_"+ruleItemVo.getBusinessType() ;
+            if (ObjectUtil.isNotNull(ruleItemVo.getBusinessType())) {
+                key = "dict_config_point_business_type_" + ruleItemVo.getBusinessType();
                 name = (String) redisTemplate.opsForValue().get(key);
                 ruleItemVo.setBusinessTypeText(name);
             }
@@ -121,7 +125,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         AppPlan plan = convertToAppPlan(app);
         if (app.getId() == null) {
             //新增
-
+            plan.setPlanOfOrgId(app.getPlanCreateOrgId());
+            plan.setPlanOfOrgName(app.getPlanCreateOrgName());
             //验证名称是否重复
             QueryWrapper<AppPlan> qw = new QueryWrapper<>();
             qw.lambda().eq(AppPlan::getPlanName, app.getPlanName());
@@ -154,7 +159,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             AppPlanToItem item = null;
             for (RuleItemVo ruleItemVo : itemList) {
                 item = new AppPlanToItem();
-                item.setItemId(ruleItemVo.getId());
+                item.setItemId(ruleItemVo.getItemId());
                 item.setPlanId(id);
                 item.setPointScan(ruleItemVo.isPointScan());
                 item.setRequired(ruleItemVo.isRequired());
@@ -224,7 +229,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             AppPlanToItem item = null;
             for (RuleItemVo ruleItemVo : itemList) {
                 item = new AppPlanToItem();
-                item.setItemId(ruleItemVo.getId());
+                item.setItemId(ruleItemVo.getItemId());
                 item.setPlanId(id);
                 item.setPointScan(ruleItemVo.isPointScan());
                 item.setRequired(ruleItemVo.isRequired());
@@ -278,8 +283,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             String key = "dict_config_check_type_" + ruleItemVo.getSafeType();
             String name = (String) redisTemplate.opsForValue().get(key);
             ruleItemVo.setSafeTypeText(name);
-            if(ObjectUtil.isNotNull(ruleItemVo.getBusinessType())){
-                key="dict_config_point_business_type_"+ruleItemVo.getBusinessType() ;
+            if (ObjectUtil.isNotNull(ruleItemVo.getBusinessType())) {
+                key = "dict_config_point_business_type_" + ruleItemVo.getBusinessType();
                 name = (String) redisTemplate.opsForValue().get(key);
                 ruleItemVo.setBusinessTypeText(name);
             }
@@ -304,7 +309,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         /**
          * 验证计划是否被应用
          */
-        Long num = sysResumptionMapper.selectCount(new QueryWrapper<SysResumption>().eq("planId",id));
+        Long num = sysResumptionMapper.selectCount(new QueryWrapper<SysResumption>().eq("plan_id", id));
         if (num > 0) {
             throw new RuntimeException("计划已生成任务，不能删除！");
         }
@@ -346,7 +351,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setPlanStatus(app.getPlanStatus());
         plan.setOrgType(app.getExecOrgType());
         plan.setId(app.getId());
+        plan.setPlanType(app.getPlanType());
         plan.setNotResumptionOnRest(app.getNotResumptionOnRest());
+        plan.setExecOrgType(app.getExecOrgType());
 
         return plan;
     }
@@ -355,16 +362,20 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 //        LoginUser loginUser = SecurityUtils.getLoginUser();
         AppPlan plan = new AppPlan();
         plan.setCheckType(app.getExecType());
-        plan.setCheckOrgType(app.getOrgType());
+//        plan.setCheckOrgType(app.getOrgType());
+        plan.setPlanCreateOrgId(app.getPlanCreateOrgId());
+        plan.setPlanCreateOrgName(app.getPlanCreateOrgName());
         Date time = new Date();
-        if(app.getId()==null){
+        if (app.getId() == null) {
             plan.setCreateTime(time);
         }
         plan.setUpdateTime(time);
         plan.setModifiedName(SecurityUtils.getUsername());
         plan.setModifiedBy(SecurityUtils.getUserId());
-        plan.setExecOrgType(app.getOrgType());
+        plan.setExecOrgType(app.getExecOrgType());
         plan.setExecType(app.getExecType());
+        plan.setPlanType(app.getPlanType());
+        plan.setCount(app.getCount());
 
         plan.setDescription(app.getNote());
         plan.setPlanCycle(app.getPlanCycle());
@@ -372,7 +383,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setPlanName(app.getPlanName());
 
         plan.setPlanStatus(app.getPlanStatus());
-        plan.setPlanType(0);
+        plan.setDescription(app.getNote());
 
         plan.setId(app.getId());
         plan.setNotResumptionOnRest(app.getNotResumptionOnRest());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -201,13 +201,14 @@ public class ResumptionTaskBusiness {
      */
     @Async
     public void syncDay(final DateTime dateTime, int plancycle) {//plancycle==0
-        SysConfig officeAllHourParam = systemParameService.findFirstByCode("officeBuilding_open_allhours",SecurityConstants.INNER).getData();
+        R<SysConfig> officeBuilding_open_allhours = systemParameService.findFirstByCode("officeBuilding_open_allhours", SecurityConstants.INNER);
+        SysConfig officeAllHourParam = officeBuilding_open_allhours.getData();
         //获取履职计划
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
-                .eq(AppPlan::getPlanStatus, 0)
-                .eq(AppPlan::getPlanCycle, plancycle)
-                .eq(AppPlan::getPlanType, 0)
-                .notIn(AppPlan::getPlanExec, canteenPlanExec));
+                .eq(AppPlan::getPlanStatus, 1)
+                .eq(AppPlan::getPlanCycle, plancycle));
+//                .eq(AppPlan::getPlanType, 1)
+//                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         for (AppPlan appPlan : AppPlanList) {
             //获取履职计划中对应的检查要点
             List<AppRulePointTaskVo> pointList = appRulePointService.findPointByPlan(appPlan.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -31,11 +31,13 @@ public class AppPlanVo extends PageDto {
     /**
      * 计划状态
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer planStatus;
 
     /**
      * 计划周期
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer planCycle;
 
     /**
@@ -46,21 +48,30 @@ public class AppPlanVo extends PageDto {
     /**
      * 执行时刻
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer planExec;
 
     /**
      * 执行机构类型
      */
     private Integer orgType;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer planType;
 
     /**
      * 执行机构id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private List<Long> orgList;
     /**
      * 执行类型
      */
     private Integer execType;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer execOrgType;
+    private String count;
+    private String planCreateOrgId;
+    private String planCreateOrgName;
 
     /**
      * 备注

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/RuleItemVo.java

@@ -27,6 +27,7 @@ public class RuleItemVo {
     /**
      * 检查项Id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long itemId;
     /**
      * 检查项描述

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -1,6 +1,5 @@
 package com.xunmei.core.retrieval.controller;
 
-import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsPageDto;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -8,8 +7,8 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,8 +35,8 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
 /**
  * 查询监控调阅任务列表
  */
-@ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
-@GetMapping("/list")
+    @ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
+    @GetMapping("/list")
     public TableDataInfo list(RetrievalTaskPageDto request) {
 
         return coreMonitoringRetrievalTaskService.selectPage( request);
@@ -106,4 +105,6 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(ids));
     }
+
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
-import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -1,15 +1,13 @@
 package com.xunmei.core.retrieval.service;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 
 import javax.servlet.http.HttpServletResponse;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -11,12 +11,14 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.system.api.RemoteDictDataService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.stereotype.Service;
@@ -43,6 +45,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
     @Resource
     private RemoteOrgService orgService;
+    @Resource
+    private RemoteDictDataService dictDataService;
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
@@ -73,19 +77,22 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         request.setPageSize(null);
         request.setPageNum(null);
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-
+        List<SysDictData>  listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.dictType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
         final TableDataInfo tableDataInfo = this.selectPage(request);
         if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
             throw new RuntimeException("导出数据为空!");
         }
         List<CoreMonitoringRetrievalTaskVo> list = this.selectPage(request).getRows();
+        list.forEach(r->{
+            r.setStatusText(listDict.stream().filter(d->d.getDictValue().equals(r.getStatus())).findFirst().orElse(new SysDictData()).getDictLabel());
+        });
         list.forEach(r->r.setNo(list.indexOf(r)+1));
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("序号", "no");
         writer.addHeaderAlias("任务名称", "taskName");
         writer.addHeaderAlias("开始时间", "planStartTime");
         writer.addHeaderAlias("结束时间", "planEndTime");
-        writer.addHeaderAlias("状态", "");
+        writer.addHeaderAlias("状态", "statusText");
         writer.addHeaderAlias("调阅机构", "orgName");
         writer.addHeaderAlias("调阅角色", "roleName");
         writer.addHeaderAlias("调阅开始时间", "startTime");

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

@@ -63,5 +63,48 @@
     </select>
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo">
+        select t.id, plan_id, t.org_id, t.org_name, title, type, status, host_id,u.name as hostName,
+        start_date, end_date, date_time
+        from core_edu_training_task t inner join sys_user u on t.host_id=u.id
+        <where>
+            <choose>
+                <when test="request.checkSub==true">
+                    t.org_path like concat(#{request.orgPath}, '%')
+                </when>
+                <otherwise>
+                    t.org_id = #{request.orgId}
+                </otherwise>
+            </choose>
+            <if test="request.title!= null and request.title !=''">
+                and t.title like concat('%',#{request.title}, '%')
+            </if>
+            <if test="request.type!= null">
+                and t.type=#{request.type}
+            </if>
+            <if test="request.status != null">
+                and t.status=#{request.status}
+            </if>
+            <if test="request.startTime != null">
+                and t.date_time >=#{request.startTime}
+            </if>
+            <if test="request.endTime != null">
+                and t.date_time <![CDATA[<=]]> #{request.endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectEduTrainingTaskDetail"
+            resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo">
+        select t.id,
+               plan_id,
+               t.org_id,
+               t.org_name,
+               title,
+               type,
+               start_date,
+               end_date,
+               date_time
+        from core_edu_training_task t
+        where id = #{id}
     </select>
 </mapper>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanMapper">
     <sql id="tableName">
-        sys_plan
+        core_resumption_plan
     </sql>
 
     <sql id="baseColumn">
@@ -38,14 +38,14 @@
         b.orgId,
         b.orgNames
         FROM
-        sys_plan a
+        core_resumption_plan a
         LEFT JOIN (
         SELECT
         m.plan_id,
         GROUP_CONCAT( n.`name` ) orgNames,
         GROUP_CONCAT( n.id ) orgId
         FROM
-        sys_plan_to_exec_org m
+        core_resumption_plan_to_exec_org m
         LEFT JOIN sys_org n ON m.org_id = n.id
         GROUP BY
         m.plan_id
@@ -55,7 +55,7 @@
         r.plan_id,
         group_concat( t.`role_name` ) roleNames
         FROM
-        sys_plan_to_role r
+        core_resumption_plan_to_role r
         LEFT JOIN sys_role t ON r.role_id = t.id
         GROUP BY
         r.plan_id
@@ -78,14 +78,14 @@
                 and a.exec_org_type = #{info.orgType}
             </if>
             <if test="info.roleList != null and info.roleList.size > 0">
-                and a.id in (select plan_id from sys_plan_to_role where role_id in
+                and a.id in (select plan_id from core_resumption_plan_to_role where role_id in
                 <foreach collection="info.roleList" item="roleId" index="index" open="(" separator="," close=")">
                     #{roleId}
                 </foreach>
                 )
             </if>
             <if test="info.orgList != null and info.orgList.size > 0">
-                and a.id in (select plan_id from sys_plan_to_exec_org where org_id in
+                and a.id in (select plan_id from core_resumption_plan_to_exec_org where org_id in
                 <foreach collection="info.orgList" item="orgId" index="index" open="(" separator="," close=")">
                     #{orgId}
                 </foreach>
@@ -126,7 +126,7 @@
 
 
     <select id="selectByPlanId" resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
-        SELECT a.id,
+        SELECT a.item_id,
                b.name as item_name,
                b.desc as item_desc,
 --                b.item_num,
@@ -138,8 +138,8 @@
                h.required,
                d.name  as ruleName,
                a.business_type as businessType
-        FROM (SELECT item_id, point_scan, required FROM sys_plan_to_item WHERE plan_id = #{planId}) h
-                 LEFT JOIN core_resumption_rule_point a ON h.item_id = a.id
+        FROM (SELECT item_id, point_scan, required FROM core_resumption_plan_to_item WHERE plan_id = #{planId}) h
+                 LEFT JOIN core_resumption_rule_point a ON h.item_id = a.item_id
                  LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id
                  LEFT JOIN sys_area c ON a.area_id = c.id
                  LEFT JOIN core_resumption_rule d on b.rule_id = d.id
@@ -148,19 +148,19 @@
 
     <select id="findExecOrgByPlan" parameterType="Long" resultType="Long">
         select org_id
-        from sys_plan_to_exec_org a
+        from core_resumption_plan_to_exec_org a
         INNER JOIN t_org o on a.org_id=o.id and o.deleted=0 and o.is_lock=0 and o.temporarily_closed=0
         where a.plan_id = #{plan_id}
     </select>
     <select id="findRoleByPlan" parameterType="Long" resultType="Long">
         select role_id
-        from sys_plan_to_role a
+        from core_resumption_plan_to_role a
         where a.plan_id = #{plan_id}
     </select>
 
     <select id="selectPlanList" resultType="com.xunmei.core.resumption.vo.appPlan.ObjectDataClass">
         select id as id, plan_name as name
-        from sys_plan
+        from core_resumption_plan
         where plan_status = 0 and exec_type = 0
         <if test="orgType != null">
             and exec_org_type = #{orgType}
@@ -176,7 +176,7 @@
         8.30以后不再需要此类计划
 
         (select id, plan_name as name
-        from sys_plan
+        from core_resumption_plan
         where plan_status = 0 and exec_type = 0
         <if test="orgType != null">
             and exec_org_type = #{orgType}
@@ -189,9 +189,9 @@
         UNION ALL
         (SELECT p.id,
         p.plan_name as name
-        FROM sys_plan_to_exec_org tapo
+        FROM core_resumption_plan_to_exec_org tapo
         INNER JOIN t_org o ON tapo.org_id = o.id
-        INNER JOIN sys_plan p ON tapo.plan_id = p.id
+        INNER JOIN core_resumption_plan p ON tapo.plan_id = p.id
 
         where p.plan_status = 0
 
@@ -206,12 +206,12 @@
 
     <select id="selectPlanByName" resultMap="appPlans">
         select *
-        from sys_plan
+        from core_resumption_plan
         where plan_name like CONCAT('%', #{planName}, '%')
         limit 1
     </select>
     <select id="selectPlanNameById" resultType="java.lang.String">
-        select plan_name from sys_plan where id = #{planId}
+        select plan_name from core_resumption_plan where id = #{planId}
     </select>
     <select id="selectPlanNames" resultType="com.xunmei.common.core.vo.IdNameVo">
         select id, plan_name as name from sys_plan where id in

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToCheckOrgMapper">
     <sql id="tableName">
-        sys_plan_to_check_org
+        core_resumption_plan_to_check_org
     </sql>
 
     <sql id="baseColumn">

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToExecOrgMapper">
     <sql id="tableName">
-        sys_plan_to_exec_org
+        core_resumption_plan_to_exec_org
     </sql>
 
     <sql id="baseColumn">

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToItemMapper">
     <sql id="tableName">
-        sys_plan_to_item
+        core_resumption_plan_to_item
     </sql>
 
     <sql id="baseColumn">
@@ -11,7 +11,7 @@
 
     <select id="selectItemIdsByPlanId" resultType="java.lang.Long">
         select distinct item_id
-        from sys_plan_to_item
+        from core_resumption_plan_to_item
         where plan_id = #{planId}
     </select>
 </mapper>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppPlanToRoleMapper">
     <sql id="tableName">
-        sys_plan_to_role
+        core_resumption_plan_to_role
     </sql>
 
     <sql id="baseColumn">

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

@@ -49,7 +49,7 @@
         select c.id as checkId,  a.collection_area_name as checkName,a.code as  nfccdoe,d.id as pointId,a.area_id as areaId ,a.id as nfcid from t_nfc_bind a
         LEFT JOIN t_area_check c ON a.check_id = c.id
         LEFT JOIN t_app_rule_point d on a.area_id = d.area_id
-        LEFT JOIN t_app_plan_to_item e ON e.item_id = d.id
+        LEFT JOIN core_resumption_plan_to_item e ON e.item_id = d.id
         where a.org_id =  #{orgId}
         and e.plan_id = #{planId}
         and a.check_id is not null

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

@@ -31,7 +31,7 @@
 <!--        inner join t_app_rule_item ri on ri.id=p.item_id-->
 <!--        inner join sys_area a on p.area_id = a.id-->
 <!--        inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'-->
-<!--        inner join t_app_plan_to_item ti on ti.item_id=p.id-->
+<!--        inner join core_resumption_plan_to_item ti on ti.item_id=p.id-->
 <!--        inner join t_app_plan ap on ti.plan_id =ap.id-->
 <!--        where p.deleted = 0-->
 <!--        <if test="pointIds != null and pointIds.size > 0">-->
@@ -49,8 +49,8 @@
 <!--    </select>-->
     <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.AppRulePointTaskVo">
         SELECT a.*, b.point_scan
-        from sys_rule_point a
-                 LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
+        from core_resumption_rule_point a
+                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
         WHERE c.id = #{planid}
     </select>
@@ -96,7 +96,7 @@
 <!--    <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.resumption.AppRulePointTaskVo">-->
 <!--        SELECT a.*, b.point_scan-->
 <!--        from core_resumption_rule_point a-->
-<!--                 LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id-->
+<!--                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id-->
 <!--                 LEFT JOIN t_app_plan c ON b.plan_id = c.id-->
 <!--        WHERE c.id = #{planid}-->
 <!--    </select>-->
@@ -104,7 +104,7 @@
     <select id="findAreaListPlan" parameterType="Long" resultType="java.util.Map">
         SELECT a.area_id as areaid, d.name as areaname
         from core_resumption_rule_point a
-                 LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
+                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
                  LEFT JOIN t_area d ON a.area_id = d.id
         WHERE c.id = #{planid}
@@ -140,7 +140,7 @@
     </update>
 
     <update id="updatePlanItem">
-        update t_app_plan_to_item
+        update core_resumption_plan_to_item
         set item_id=#{newId}
         where item_id = #{id}
     </update>
@@ -199,7 +199,7 @@
          SELECT a.id as pointid,a.point_name as pointname ,a.point_num as pointnum,a.item_id as itemid,a.area_id as areaid,f.name as areaname,a.time_type as timeType,
         b.plan_id as planId,e.item_name as itemname,b.point_scan as pointScan,b.required,a.business_type as businessType
         from core_resumption_rule_point a
-                 LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
+                 LEFT JOIN core_resumption_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
                  LEFT JOIN t_app_rule_item e ON a.item_id = e.id
                  left join t_area f on a.area_id = f.id

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

@@ -30,7 +30,7 @@
             STATUS,
             a.type AS type
         FROM
-            sys_resumption a
+            core_resumption a
                 LEFT JOIN t_app_plan b ON a.plan_id = b.id
         WHERE
             a.ymd_year =#{year}
@@ -95,7 +95,7 @@
             a.plan_start_time ASC
     </select>
     <select id="findOneByTaskIdAndDate" resultType="com.xunmei.core.resumption.domain.Resumption">
-        select * from sys_resumption where id=#{taskid} and ymd_year=#{year} and ymd_quarter=#{quarter}
+        select * from core_resumption where id=#{taskid} and ymd_year=#{year} and ymd_quarter=#{quarter}
 
     </select>
     <select id="findOneByTaskId" resultType="java.util.Map">

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

@@ -35,7 +35,7 @@
 
     <sql id="selectSysResumptionVo">
         select id, create_time, modified_id, modified_name, update_time, exception_count, form_type, org_id, status, type, ymd_date, ymd_day, ymd_month, ymd_quarter, ymd_week, ymd_year, ymd_halfyear, submit_time, ymd_hour, ymd_minute, plan_id, start_time, end_time, plan_start_time, plan_end_time, role_id
-        from sys_resumption
+        from core_resumption
     </sql>
 
     <select id="selectSysResumptionList" parameterType="com.xunmei.core.resumption.domain.SysResumption"
@@ -121,7 +121,7 @@
     </select>
     <select id="findResumptionList" resultType="com.xunmei.core.resumption.vo.WorkChangeResumptionVo">
         select a.id,b.id as planId,b.plan_exec as planExec,a.status,a.org_id as orgId
-        from sys_resumption a left join t_app_plan b on a.plan_id =b.id
+        from core_resumption a left join t_app_plan b on a.plan_id =b.id
         where a.ymd_year = #{year} and a.ymd_quarter=#{quarter} and a.ymd_date=#{date} and `type`=#{type} and b.plan_exec not in (4,5,6) and a.org_id in
         <foreach collection="orgIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -133,7 +133,7 @@
     </select>
 
     <insert id="insertSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        insert into sys_resumption
+        insert into core_resumption
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
                     </if>
@@ -245,7 +245,7 @@
     </insert>
 
     <update id="updateSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        update sys_resumption
+        update core_resumption
         <trim prefix="SET" suffixOverrides=",">
                     <if test="createTime != null">create_time =
                         #{createTime},
@@ -328,17 +328,17 @@
 
     <delete id="deleteSysResumptionById" parameterType="String">
         delete
-        from sys_resumption where id = #{id}
+        from core_resumption where id = #{id}
     </delete>
 
     <delete id="deleteSysResumptionByIds" parameterType="String">
-        delete from sys_resumption where id in
+        delete from core_resumption where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="deleteResumption">
-        delete from sys_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
+        delete from core_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper">
 
-    <resultMap type="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
+    <resultMap type="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
                 <result property="id" column="id"/>
                 <result property="planId" column="plan_id"/>
                 <result property="taskName" column="task_name"/>
@@ -37,7 +37,7 @@
         from core_monitoring_retrieval_task
     </sql>
 
-    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask"
+    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
             resultMap="CoreMonitoringRetrievalTaskResult">
         <include refid="selectCoreMonitoringRetrievalTaskVo"/>
         <where>
@@ -64,7 +64,7 @@
             <include refid="selectCoreMonitoringRetrievalTaskVo"/>
             where id = #{id}
     </select>
-    <select id="selectPageList" resultType="com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo">
+    <select id="selectPageList" resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo">
         select a.*,b.name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
         where 1=1
         <if test="request.orgId != null ">
@@ -92,7 +92,7 @@
         order by a.ymd_date desc
     </select>
 
-    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -200,7 +200,7 @@
         </trim>
     </insert>
 
-    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         update core_monitoring_retrieval_task
         <trim prefix="SET" suffixOverrides=",">
                     <if test="planId != null">plan_id =

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysConfigServiceImpl.java

@@ -44,7 +44,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     }
     @Override
     public SysConfig findFirstByCode(String code) {
-        return configMapper.selectOne(new QueryWrapper<SysConfig>().eq("code", code));
+        return configMapper.selectOne(new QueryWrapper<SysConfig>().eq("config_key", code));
     }
     @Override
     public TableDataInfo<SysConfig> selectPage(SysConfig sysConfig) {