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

project_data/sql/0.0.3/soc/soc.sql

@@ -631,8 +631,28 @@ END IF;
             add type int default 0 not null comment '培训类型,0:行社安全保卫教育培训,1:行社消防安全培训,2:营业网点安全保卫教育培训,3:营业网点消防安全培训,4:其他' after id;
     END IF;
 
+    -- 演练计划表新增字段 演练类型
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_drill_plan'
+                    AND column_name = 'category') THEN
+        alter table core_drill_plan
+            add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
+    END IF;
 
-
+    -- 演练任务表新增字段 演练类型
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_drill_task'
+                    AND column_name = 'category') THEN
+        alter table core_drill_task
+            add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
+        -- 修改表字段释义
+        alter table core_drill_task
+            modify type int null comment '演练项目';
+    END IF;
 
 
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/domain/CoreDrillPlan.java

@@ -28,9 +28,9 @@ public class CoreDrillPlan extends BaseEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
-    @TableField(value = "type")
-    @ApiModelProperty(value = "培训类型")
-    private int type;
+    @TableField(value = "category")
+    @ApiModelProperty(value = "演练类型")
+    private int category;
 
     @TableField(value = "plan_name")
     @ApiModelProperty(value = "计划名称")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/domain/CoreDrillTask.java

@@ -42,6 +42,10 @@ public class CoreDrillTask extends BaseEntity {
     @ApiModelProperty(value = "预案演练计划Id")
     private Long planId;
 
+    @TableField("category")
+    @ApiModelProperty(value = "预案演练类型")
+    private int category;
+
     @TableField("org_id")
     @ApiModelProperty(value = "机构")
     private Long orgId;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillPlanInsertDto.java

@@ -15,10 +15,11 @@ import java.util.List;
  */
 @Data
 public class CoreDrillPlanInsertDto {
-    @ApiModelProperty(value = "演练类型")
-    private int type;
 
 
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
     @NotBlank(message = "计划名称不能为空")
     @ApiModelProperty(value = "计划名称")
     private String planName;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillTaskEditDto.java

@@ -17,6 +17,8 @@ public class CoreDrillTaskEditDto {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    private int category;
+
     private String title;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillPlanDataVo.java

@@ -16,6 +16,12 @@ public class CoreDrillPlanDataVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
+    @ApiModelProperty(value = "演练类型")
+    private String categoryText;
+
     @ApiModelProperty(value = "计划名称")
     private String planName;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillPlanDetailVo.java

@@ -17,8 +17,12 @@ public class CoreDrillPlanDetailVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty(value = "培训类型")
-    private int type;
+
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
+    @ApiModelProperty(value = "演练类型")
+    private String categoryText;
 
     @ApiModelProperty(value = "计划名称")
     private String planName;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillPlanPageVo.java

@@ -1,9 +1,7 @@
 package com.xunmei.common.core.domain.drill.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +21,12 @@ public class CoreDrillPlanPageVo {
     @ApiModelProperty(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
+    @ApiModelProperty(value = "演练类型")
+    private String categoryText;
+
     @ApiModelProperty(value = "计划名称")
     private String planName;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskDetailVo.java

@@ -21,6 +21,13 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "演练计划Id")
     private Long planId;
 
+
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
+    @ApiModelProperty(value = "演练类型")
+    private String categoryText;
+
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     @ApiModelProperty(value = "机构")
     private Long orgId;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskPageVo.java

@@ -18,6 +18,12 @@ public class CoreDrillTaskPageVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "演练类型")
+    private int category;
+
+    @ApiModelProperty(value = "演练类型")
+    private String categoryText;
+
     @ApiModelProperty(value = "预案演练计划Id")
     private Long planId;
 
@@ -35,10 +41,10 @@ public class CoreDrillTaskPageVo {
      * @see com.xunmei.common.core.enums.drill.DrillType
      * 类型
      */
-    @ApiModelProperty(value = "演练类型")
+    @ApiModelProperty(value = "演练项目")
     private Integer type;
 
-    @ApiModelProperty(value = "演练类型名称")
+    @ApiModelProperty(value = "演练项目名称")
     private String typeText;
 
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/utils/DictUtils.java

@@ -73,6 +73,9 @@ public class DictUtils {
     }
 
     public static String getDictLabel(String status, Integer statusNum) {
+        if (ObjectUtil.hasEmpty(status, statusNum)) {
+            return StringUtil.EMPTY_STRING;
+        }
         final List<SysDictData> statusTextList = DictUtils.getDictCache(status);
         if (ObjectUtil.isNotEmpty(statusTextList) && ObjectUtil.isNotNull(statusNum)) {
             Optional<SysDictData> optional = statusTextList.stream()

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
@@ -32,6 +33,7 @@ import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
 import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.drill.mapper.*;
 import com.xunmei.core.drill.service.ICoreDrillPlanService;
@@ -114,6 +116,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (ObjectUtil.equal(record.getCreateOrgId(), orgId)) {
             record.setCreateByTopOrg(1);
         }
+        record.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY,record.getCategory()));
         /*String roleNameList = coreDrillPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreDrillPlanRoleVo::getRoleName).collect(Collectors.joining(","));
         record.setPlanRoleNameList(roleNameList);
         request.setId(record.getId());
@@ -149,6 +152,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         final List<CoreDrillPlanToExecOrg> execOrgList = coreDrillPlanToExecOrgMapper.selectByMap(MapUtil.of("plan_id", id));
         final List<Long> execOrgIdList = execOrgList.stream().map(CoreDrillPlanToExecOrg::getOrgId).collect(Collectors.toList());
         vo.setPlanExecOrgIdList(ObjectUtil.isEmpty(execOrgIdList) ? null : execOrgIdList);
+        vo.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY,vo.getCategory()));
         /*final List<CoreDrillPlanToRole> planToRoles = coreDrillPlanToRoleMapper.selectByMap(MapUtil.of("plan_id", id));
         final List<Long> execRoleIdList = planToRoles.stream().map(CoreDrillPlanToRole::getRoleId).collect(Collectors.toList());
         vo.setPlanRoleId(ObjectUtil.isEmpty(execRoleIdList) ? null : execRoleIdList);*/

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

@@ -132,26 +132,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         return TableDataInfo.build(pageData);
     }
 
-    public static Comparator<CoreDrillTaskPageVo> getComparator() {
-        //将0映射为0，4映射为1，1映射为2，2映射为3，3映射为4，其他情况映射为5
-        //0:待培训,1:待签名,2:已完成,3:已逾期,4:待提交
-        return Comparator.comparingInt((CoreDrillTaskPageVo vo) -> {
-            Integer num = vo.getStatus();
-            if (num == 0) {
-                return 0;
-            } else if (num == 5) {
-                return 1;
-            } else if (num == 1) {
-                return 2;
-            } else if (num == 2) {
-                return 3;
-            } else if (num == 3) {
-                return 4;
-            } else {
-                return 5;
-            }
-        });
-    }
 
     private void dealParam(CoreDrillTaskPageDto request) {
         if (ObjectUtil.isNotNull(request.getIsAppSelect()) && 1 == request.getIsAppSelect()) {
@@ -179,7 +159,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         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()));
         /*List<CoreDrillTaskToRole> coreDrillTaskToRoles = listMap.get(record.getId());
         if (ObjectUtil.isNotEmpty(coreDrillTaskToRoles)) {
             record.setTaskRoleList(coreDrillTaskToRoles);
@@ -231,6 +211,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         //处理演练任务类型字典
         detailVo.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, detailVo.getType()));
         detailVo.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, detailVo.getRecStatus()));
+        detailVo.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, detailVo.getCategory()));
         return detailVo;
     }
 
@@ -316,7 +297,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         } else {
             coreDrillTask.setStatus(DrillDoStatus.WAIT_SUBMIT.getCode());
         }
-
+        coreDrillTask.setCategory(request.getCategory());
         coreDrillTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreDrillTask.setUpdateTime(DateUtils.getNowDate());
 
@@ -440,6 +421,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 }
                 CoreDrillTask trainingTask = new CoreDrillTask();
                 trainingTask.setId(IdWorker.getId());
+                trainingTask.setCategory(plan.getCategory());
                 trainingTask.setPlanId(plan.getId());
                 trainingTask.setPlanCycle(plan.getPlanCycle());
                 if (plan.getExecTimes() > 1) {
@@ -451,7 +433,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 trainingTask.setEndDate(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
                 trainingTask.setPresetCase(null);
                 trainingTask.setDrillSituation(null);
-
                 trainingTask.setDrillStartTime(null);
                 trainingTask.setDrillEndTime(null);
                 trainingTask.setDrillSite(null);

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

@@ -508,7 +508,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 trainingTask.setFileList(ObjectUtil.isEmpty(plan.getFileList()) ? null : JSON.toJSONString(plan.getFileList()));
                 trainingTask.setImageList(null);
                 trainingTask.setOrgId(org.getId());
-                trainingTask.setType(null);
                 trainingTask.setOrgName(org.getShortName());
                 trainingTask.setOrgPath(org.getPath());
                 trainingTask.setStatus(EduTrainingDoStatus.WAIT_RECORDED.getCode());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionExportDto.java

@@ -11,11 +11,15 @@ import java.util.Date;
 
 @Data
 public class QuestionExportDto {
+
+    @ExcelProperty(value="序号",index = 0)
+    private Integer index;
+
     /**
      * 隐患所属机构名称
      */
     @ApiModelProperty(value = "隐患所属机构名称")
-    @ExcelProperty(value="机构名称",index = 0)
+    @ExcelProperty(value="机构名称",index = 1)
     @ColumnWidth(20)
     private String orgName;
 
@@ -23,14 +27,14 @@ public class QuestionExportDto {
      * 来源任务名称
      */
     @ApiModelProperty(value = "来源任务名称")
-    @ExcelProperty(value="隐患来源",index = 1)
+    @ExcelProperty(value="隐患来源",index = 2)
     @ColumnWidth(20)
     private String srcTaskName;
 
     /**
      检查、履职项名称
      */
-    @ExcelProperty(value="标准项",index = 2)
+    @ExcelProperty(value="标准项",index = 3)
     @ColumnWidth(20)
     private String checkItem;
 
@@ -38,7 +42,7 @@ public class QuestionExportDto {
      * 检查内容
      */
     @ApiModelProperty(value = "检查内容")
-    @ExcelProperty(value="标准依据",index = 3)
+    @ExcelProperty(value="标准依据",index = 4)
     @ColumnWidth(40)
     private String checkContent;
 
@@ -46,7 +50,7 @@ public class QuestionExportDto {
      * 隐患描述
      */
     @ApiModelProperty(value = "隐患描述")
-    @ExcelProperty(value="隐患描述",index = 4)
+    @ExcelProperty(value="隐患描述",index = 5)
     @ColumnWidth(20)
     private String questionDesc;
 
@@ -54,7 +58,7 @@ public class QuestionExportDto {
      * 提出人名称
      */
     @ApiModelProperty(value = "提出人名称")
-    @ExcelProperty(value="提出人",index = 5)
+    @ExcelProperty(value="提出人",index = 6)
     @ColumnWidth(15)
     private String submitorName;
 
@@ -63,7 +67,7 @@ public class QuestionExportDto {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "发现时间")
-    @ExcelProperty(value="发现时间",index = 6)
+    @ExcelProperty(value="发现时间",index = 7)
     @ColumnWidth(22)
     private Date submitTime;
 
@@ -71,72 +75,72 @@ public class QuestionExportDto {
      * 整改期限
      */
     @ApiModelProperty(value = "整改期限")
-    @ExcelProperty(value="整改期限",index = 7)
+    @ExcelProperty(value="整改期限",index = 8)
     @ColumnWidth(12)
-    @DateTimeFormat("YYYY-MM-DD")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date reformDeadline;
 
     /**
      * 确认状态
      */
-    @ExcelProperty(value="确认状态",index = 8)
+    @ExcelProperty(value="确认状态",index = 9)
     @ColumnWidth(15)
     private String confirmStatusText;
 
     /**
      * 确认人
      */
-    @ExcelProperty(value="确认人",index = 9)
+    @ExcelProperty(value="确认人",index = 10)
     @ColumnWidth(15)
     private String confirmorName;
 
     /**
      * 确认描述
      */
-    @ExcelProperty(value="异议内容",index = 10)
+    @ExcelProperty(value="异议内容",index = 11)
     @ColumnWidth(15)
     private String confirmDesc;
 
     /**
      * 异议审批状态
      */
-    @ExcelProperty(value="审核结果",index = 11)
+    @ExcelProperty(value="审核结果",index = 12)
     @ColumnWidth(15)
     private String dissentStatusText;
 
     /**
      * 审核人
      */
-    @ExcelProperty(value="审核人",index = 12)
+    @ExcelProperty(value="审核人",index = 13)
     @ColumnWidth(15)
     private String dissenterName;
 
     /**
      * 审核描述
      */
-    @ExcelProperty(value="审核描述",index = 13)
+    @ExcelProperty(value="审核描述",index = 14)
     @ColumnWidth(15)
     private String dissentDesc;
 
     /**
      * 整改日期
      */
-    @ExcelProperty(value="整改日期",index = 14)
+    @ExcelProperty(value="整改时间",index = 15)
     @ColumnWidth(15)
-    @DateTimeFormat("YYYY-MM-DD")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date reformDate;
 
     /**
      * 整改状态
      */
-    @ExcelProperty(value="整改状态",index = 15)
+    @ExcelProperty(value="整改状态",index = 16)
     @ColumnWidth(15)
     private String reformStatusText;
 
     /**
      * 整改描述
      */
-    @ExcelProperty(value="整改描述",index = 16)
+    @ExcelProperty(value="整改描述",index = 17)
     @ColumnWidth(15)
     private String reformDesc;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionReformServiceImpl.java

@@ -176,6 +176,10 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         }
 
         List<QuestionExportDto> list = baseMapper.selectReformExportList(pageDto);
+        Integer index=1;
+        for (QuestionExportDto questionExportDto : list) {
+            questionExportDto.setIndex(index++);
+        }
         response.setContentType("application/vnd.ms-excel");
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), QuestionExportDto.class).sheet("Sheet1").doWrite(list);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -286,6 +286,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             pageDto.setSubmitRange(nd);
         }
         List<QuestionExportDto> list = baseMapper.selectQuestionExportList(pageDto);
+        Integer index=1;
+        for (QuestionExportDto questionExportDto : list) {
+            questionExportDto.setIndex(index++);
+        }
         response.setContentType("application/vnd.ms-excel");
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), QuestionExportDto.class).sheet("Sheet1").doWrite(list);

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

@@ -389,7 +389,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         DateTime time2 = new DateTime(dateTime);
         time2.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 
-        if (appPlan.getPlanExec() == 1 || appPlan.getPlanExec().equals(ExecTimeCommonEnum.NoBusiness.getCode())) {//全天 上班时间-下班时间 00:00:00-23:59:59
+        if (appPlan.getPlanExec() == 1) {//全天 上班时间-下班时间 00:00:00-23:59:59
             planstartTime = time1.setField(DateField.HOUR_OF_DAY, 0).setField(DateField.MINUTE, 0).setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         } else if (appPlan.getPlanExec() == 2) {//营业前 上班时间-营业时间
@@ -402,7 +402,11 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             planstartTime = time1.setField(DateField.HOUR_OF_DAY, Integer.parseInt(closetime.split(":")[0])).setField(DateField.MINUTE, Integer.parseInt(closetime.split(":")[1])).setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         }else if (appPlan.getPlanExec() == 5){ //非营业时间
-            planstartTime = time1.setField(DateField.HOUR_OF_DAY, Integer.parseInt(closetime.split(":")[0])).setField(DateField.MINUTE, Integer.parseInt(closetime.split(":")[1])).setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
+            planstartTime = time1
+                    .setField(DateField.HOUR_OF_DAY, Integer.parseInt(closetime.split(":")[0]))
+                    .setField(DateField.MINUTE, Integer.parseInt(closetime.split(":")[1]))
+                    .setField(DateField.SECOND, 0)
+                    .setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         }
 

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

@@ -481,7 +481,8 @@
         p.standard as standard,
         p.belong_org_id as belongOrgId,
         p.belong_org_name as belongOrgName,
-        p.parent_id as parentId
+        p.parent_id as parentId,
+        p.category as category
 
         from core_drill_plan p left join sys_user u on p.update_by=u.id
         where p.deleted = 0

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

@@ -65,9 +65,8 @@
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
         select t.id, plan_id, t.org_id, t.org_name, title, type as type, status,rec_status, host_id,u.name as hostName,
-        start_date, end_date, t.drill_start_time,t.drill_end_time, t.pdf_url as pdfUrl,drill_site as
-        drillSite,comment_score as
-        commentScore,comment
+        start_date, end_date, t.drill_start_time,t.drill_end_time, t.pdf_url as pdfUrl,
+        drill_site as drillSite,comment_score as commentScore,comment,category
         from core_drill_task t left join sys_user u on t.host_id=u.id
         <where>
             <choose>

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, 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,type,
         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>

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

@@ -419,7 +419,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 .flatMap(Collection::stream)
                 .map(Long::valueOf)
                 .distinct().
-                        collect(Collectors.toList());
+                collect(Collectors.toList());
 
         return sysOrgMapper.selectList(new LambdaQueryWrapper<SysOrg>()
                 .in(SysOrg::getId, orgIdList)
@@ -537,12 +537,19 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                         .collect(Collectors.toList());
                 break;
             default:
-                result = sysOrgList.stream()
-                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getParentId(), org.getId()))
-                        //.filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
-                        .sorted(Comparator.comparing(SysOrgVO::getSort))
-                        .collect(Collectors.toList());
-
+                if (org.getName().contains("地区行社")) {
+                    result = sysOrgList.stream()
+                            .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()))
+                            .sorted(Comparator.comparing(SysOrgVO::getSort))
+                            .collect(Collectors.toList());
+                } else {
+                    result = sysOrgList.stream()
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getParentId(), org.getId()))
+                            //.filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
+                            .sorted(Comparator.comparing(SysOrgVO::getSort))
+                            .collect(Collectors.toList());
+                }
         }
         final List<SysOrg> orgList = BeanHelper.copyProperties(result, SysOrg.class);
         orgList.sort(Comparator.comparing(SysOrg::getSort));