Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1131,8 +1131,21 @@ END IF;
 			ADD COLUMN `plan_id` bigint NULL COMMENT '生成任务的计划id' AFTER `parent_plan_id`;
     END IF;
 
+    -- 演练任务增加演练结束时间
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_drill_task'
+                    AND column_name = 'drill_end_time') THEN
+        alter table core_drill_task
+            change drill_time drill_start_time datetime(6) null comment '演练开始时间';
+
+        alter table core_drill_task
+            add drill_end_time datetime(6) null comment '演练结束时间' after drill_start_time;
+    END IF;
+
 
-	ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;
+ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;
 -- 机构扩展添加是否业务库
 	ALTER TABLE sys_org_extend MODIFY COLUMN business_library INT COMMENT '是否业务库';
 -- 处理自增id步长问题

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -27,6 +28,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_drill_task")
+@FieldNameConstants
 @ApiModel(value = "预案演练任务对象", description = "预案演练任务对象")
 public class CoreDrillTask extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -88,10 +90,15 @@ public class CoreDrillTask extends BaseEntity {
     private Date endDate;
 
 
-    @TableField("drill_time")
+    @TableField("drill_start_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "演练时间")
-    private LocalDateTime drillTime;
+    @ApiModelProperty(value = "演练开始时间")
+    private LocalDateTime drillStartTime;
+
+    @TableField("drill_end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "演练结束时间")
+    private LocalDateTime drillEndTime;
 
     @TableField("drill_site")
     @ApiModelProperty(value = "演练地点")
@@ -164,7 +171,8 @@ public class CoreDrillTask extends BaseEntity {
                 .append("presetCase", getPresetCase())
                 .append("drillSituation", getDrillSituation())
                 .append("title", getTitle())
-                .append("drillTime", getDrillTime())
+                .append("drillStartTime", getDrillStartTime())
+                .append("drillEndTime", getDrillEndTime())
                 .append("drillSite", getDrillSite())
                 .append("hostId", getHostId())
                 .append("fileList", getFileList())

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -21,6 +22,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_drill_task_to_user")
+@FieldNameConstants
 @ApiModel(value = "CoreDrillTaskToUser对象", description = "预案演练任务角色关系")
 public class CoreDrillTaskToUser {
     private static final long serialVersionUID = 1L;

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

@@ -1,14 +1,11 @@
 package com.xunmei.common.core.domain.drill.dto;
 
-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.drill.domain.CoreDrillTaskToUser;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -16,14 +13,18 @@ import java.util.List;
 public class CoreDrillTaskEditDto {
 
 
-    @NotNull
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    private String title;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "演练时间")
-    private LocalDateTime drillTime;
+    private LocalDateTime drillStartTime;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "演练时间")
+    private LocalDateTime drillEndTime;
 
 
     @ApiModelProperty(value = "演练地点")
@@ -56,4 +57,6 @@ public class CoreDrillTaskEditDto {
     @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
     private List<CoreDrillTaskToUser> absentList;
 
+    private List<String> fileList;
+
 }

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

@@ -1,11 +1,9 @@
 package com.xunmei.common.core.domain.drill.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.drill.domain.CoreDrillTaskToUser;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -67,9 +65,13 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "计划任务截止日期")
     private LocalDateTime endDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训开始时间")
-    private LocalDateTime drillTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "演练时间")
+    private LocalDateTime drillStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "演练时间")
+    private LocalDateTime drillEndTime;
 
     @ApiModelProperty(value = "预设案由")
     private String presetCase;

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

@@ -60,9 +60,13 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "任务计划截止日期")
     private Date endDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "演练执行时间")
+    private Date drillStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "演练执行时间")
-    private Date drillTime;
+    private Date drillEndTime;
 
     /**
      * @see com.xunmei.common.core.enums.drill.DrillDoStatus

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

@@ -25,8 +25,12 @@ public class CoreDrillTaskRecTaskPageVo {
     @ApiModelProperty(value = "演练类型名称")
     private String typeText;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "演练时间")
-    private Date drillTime;
+    private Date drillStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "演练时间")
+    private Date drillEndTime;
 
 }

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

@@ -6,7 +6,6 @@ import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -14,7 +13,6 @@ import java.util.List;
 public class CoreEduTrainingTaskEditDto {
 
 
-    @NotNull
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
@@ -25,11 +23,11 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "类型")
     private Integer type;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "培训开始时间")
     private LocalDateTime trainingStartDateTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "培训截止时间")
     private LocalDateTime trainingEndDateTime;
 
@@ -62,4 +60,5 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
     private List<CoreEduTrainingTaskToUser> absentList;
 
+    private String title;
 }

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

@@ -56,11 +56,11 @@ public class CoreEduTrainingTaskPageVo {
     private Date endDate;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingStartDateTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingEndDateTime;
 

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

@@ -17,20 +17,16 @@ import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.drill.domain.*;
 import com.xunmei.common.core.domain.drill.dto.*;
 import com.xunmei.common.core.domain.drill.vo.*;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.enums.CycleCommonEnum;
-import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.enums.ExportPdfType;
 import com.xunmei.common.core.enums.OrgTypeEnum;
-import com.xunmei.common.core.enums.drill.DrillDoStatus;
-import com.xunmei.common.core.enums.drill.DrillPlanStatus;
-import com.xunmei.common.core.enums.drill.DrillRecStatus;
-import com.xunmei.common.core.enums.drill.DrillType;
+import com.xunmei.common.core.enums.drill.*;
+import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -46,7 +42,10 @@ import com.xunmei.core.drill.service.ICoreDrillTaskToRoleService;
 import com.xunmei.core.drill.service.ICoreDrillTaskToUserService;
 import com.xunmei.core.thread.ThreadPoolConfig;
 import com.xunmei.system.api.*;
-import com.xunmei.system.api.domain.*;
+import com.xunmei.system.api.domain.SysConfig;
+import com.xunmei.system.api.domain.SysDictData;
+import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -272,28 +271,48 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public int updateCoreDrillTask(CoreDrillTaskEditDto request) {
         CoreDrillTask coreDrillTask = coreDrillTaskMapper.selectById(request.getId());
+        boolean isAdd = false;
+        if (ObjectUtil.isNull(coreDrillTask)) {
+            isAdd = true;
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                            orgService.selectOrgById(SecurityUtils.getLoginUser().getSysUser().getOrgId(), SecurityConstants.INNER),
+                    ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            coreDrillTask = new CoreDrillTask();
+            coreDrillTask.setId(IdWorker.getId());
+            coreDrillTask.setOrgId(sysOrg.getId());
+            coreDrillTask.setOrgName(sysOrg.getShortName());
+            coreDrillTask.setOrgPath(sysOrg.getPath());
+            coreDrillTask.setTitle(request.getTitle());
+            coreDrillTask.setPlanCycle(DrillPlanCycleEnum.NONE.getCode());
+            coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
+            coreDrillTask.setCreateTime(new Date());
+
+        }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());
-        coreDrillTask.setDrillTime(request.getDrillTime());
+        coreDrillTask.setDrillStartTime(request.getDrillStartTime());
+        coreDrillTask.setDrillEndTime(request.getDrillEndTime());
         coreDrillTask.setDrillSite(request.getDrillSite());
         coreDrillTask.setPresetCase(request.getPresetCase());
         coreDrillTask.setDrillSituation(request.getDrillSituation());
         coreDrillTask.setRecorderId(SecurityUtils.getUserId());
         coreDrillTask.setImageList(request.getImageList());
+        if (ObjectUtil.isNotEmpty(request.getFileList())) {
+            coreDrillTask.setFileList(JSON.toJSONString(request.getFileList()));
+        } else {
+            coreDrillTask.setFileList(null);
+        }
+        CoreDrillTask finalCoreDrillTask = coreDrillTask;
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", coreDrillTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         if (ObjectUtil.isNotEmpty(userList)) {
             coreDrillTask.setHostId(userList.get(0).getId());
         } else {
             coreDrillTask.setHostId(SecurityUtils.getUserId());
         }
         List<CoreDrillTaskToUser> taskUserList = request.getTaskUserList();
-        /*if (ObjectUtil.isNotEmpty(request.getTaskUserList())) {
-            taskUserList = request.getTaskUserList();
-        } else {
-            taskUserList = Stream.of(request.getAbsenceList(), request.getAbsentList()).flatMap(Collection::stream).collect(Collectors.toList());
-        }*/
         if (ObjectUtil.isNotEmpty(taskUserList)) {
+            coreDrillTaskToUserService.removeByMap(MapUtil.of("drill_task_id", request.getId()));
             checkTheSameUser(taskUserList);
             for (CoreDrillTaskToUser taskToUser : taskUserList) {
                 taskToUser.setDrillTaskId(request.getId());
@@ -310,6 +329,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         coreDrillTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreDrillTask.setUpdateTime(DateUtils.getNowDate());
 
+        if (isAdd) {
+            return coreDrillTaskMapper.insert(coreDrillTask);
+        }
         return coreDrillTaskMapper.updateById(coreDrillTask);
     }
 
@@ -421,7 +443,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 trainingTask.setPresetCase(null);
                 trainingTask.setDrillSituation(null);
 
-                trainingTask.setDrillTime(null);
+                trainingTask.setDrillStartTime(null);
+                trainingTask.setDrillEndTime(null);
                 trainingTask.setDrillSite(null);
                 trainingTask.setFileList(ObjectUtil.isEmpty(plan.getFileList()) ? null : JSON.toJSONString(plan.getFileList()));
                 trainingTask.setImageList(null);
@@ -596,7 +619,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         String orgName = task.getOrgName();
         String drillSite = task.getDrillSite();
         String imageData = task.getImageList();
-        String drillTime = DateUtil.format(task.getDrillTime(), "yyyy-MM-dd HH:mm:ss");
+        String startTime = DateUtil.format(task.getDrillStartTime(), "yyyy-MM-dd HH:mm");
+        String endTime = DateUtil.format(task.getDrillEndTime(), "yyyy-MM-dd HH:mm");
+        String drillTime = startTime + " - " + endTime;
         String hostName = task.getHostName() == null ? StringUtil.EMPTY_STRING : task.getHostName();
         String typeText = task.getTypeText() == null ? StringUtil.EMPTY_STRING : task.getTypeText();
         String presetCase = task.getPresetCase() == null ? StringUtil.EMPTY_STRING : task.getPresetCase();

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

@@ -292,7 +292,24 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Transactional(rollbackFor = Exception.class)
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
-        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
+        boolean isAdd = false;
+        if (coreEduTrainingTask==null){
+            isAdd = true;
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                            orgService.selectOrgById(SecurityUtils.getLoginUser().getSysUser().getOrgId(), SecurityConstants.INNER),
+                    ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            coreEduTrainingTask=new CoreEduTrainingTask();
+            coreEduTrainingTask.setId(IdWorker.getId());
+            coreEduTrainingTask.setOrgId(sysOrg.getId());
+            coreEduTrainingTask.setOrgName(sysOrg.getShortName());
+            coreEduTrainingTask.setOrgPath(sysOrg.getPath());
+            coreEduTrainingTask.setTitle(request.getTitle());
+            coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
+            coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingStartDateTime());
+            coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());
+            coreEduTrainingTask.setCreateBy(SecurityUtils.getUserId().toString());
+            coreEduTrainingTask.setCreateTime(new Date());
+        }
         coreEduTrainingTask.setType(request.getType());
         coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
         coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
@@ -305,22 +322,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         } else {
             coreEduTrainingTask.setFileList(null);
         }
-
-
         coreEduTrainingTask.setHostId(getHostUserId(coreEduTrainingTask.getOrgId()));
-
-//        if (ObjectUtil.isNotEmpty(request.getTaskUserList())) {
-//            taskUserList = request.getTaskUserList();
-//        }
-//        else {
-//            taskUserList = Stream.of(request.getAbsenceList(), request.getAbsentList()).flatMap(Collection::stream).collect(Collectors.toList());
-//        }
         coreEduTrainingTaskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
         List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
         if (ObjectUtil.isNotEmpty(taskUserList)) {
             checkTheSameUser(taskUserList);
             for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
-                taskToUser.setEduTrainingTaskId(request.getId());
+                taskToUser.setEduTrainingTaskId(coreEduTrainingTask.getId());
                 taskToUser.setSign(0);
             }
             coreEduTrainingTaskToUserService.saveBatch(taskUserList);
@@ -336,6 +344,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
 
+        if (isAdd){
+            return coreEduTrainingTaskMapper.insert(coreEduTrainingTask);
+        }
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -130,6 +130,8 @@ public class CoreSafecheckPlan extends BaseEntity {
     private Long parentId;
     @TableField(exist = false)
     private List<Long> parentIds;
+    @TableField(exist = false)
+    private Integer parentCount;
     /**
      * 检查机构类型
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -259,6 +259,10 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 break;
             }
         }
+        //获取当前计划父计划的次数
+        CoreSafecheckPlan plan = coreSafecheckPlanMapper.selectOne(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getId, coreSafecheckPlan.getParentId()).eq(CoreSafecheckPlan::getIsDeleted, 0));
+        //如果没获取到父计划则默认最低为1
+        coreSafecheckPlan.setParentCount(Math.toIntExact(plan == null ? 1 : plan.getCount()));
         return coreSafecheckPlan;
     }
 

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

@@ -42,7 +42,8 @@
                host_id,
                start_date,
                end_date,
-               drill_time,
+               drill_start_time,
+                drill_end_time,
                file_list,
                image_list,
                pdf_url,
@@ -64,7 +65,7 @@
     <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_time, t.pdf_url as pdfUrl,drill_site as drillSite,comment_score as
+        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
         from core_drill_task t left join sys_user u on t.host_id=u.id
         <where>
@@ -90,31 +91,6 @@
         order by t.update_time desc
     </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,
-               drill_time,
-               image_list,
-               t.host_id,
-               t.recorder_id,
-               u.name      as hostName,
-               u2.name     as recorderName,
-               t.pdf_url   as pdfUrl,
-               t.file_list as file
-        from core_drill_task t
-                 left join sys_user u on u.id = t.host_id
-                 left join sys_user u2 on u2.id = t.recorder_id
-
-        where t.id = #{id}
-    </select>
-
     <select id="selectReport" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskReportVo">
         SELECT t.org_id AS orgId,
         t.org_name AS orgName,
@@ -151,36 +127,37 @@
     <select id="checkHasTaskIsDoneByPlanParentId" resultType="java.lang.Integer">
         select 1
         from core_drill_task
-        where status in (3,4)
+        where status in (3, 4)
           and plan_id in
               (select id from core_drill_plan where deleted = 0 and parent_id = #{planId})
         limit 1
     </select>
 
     <select id="selectDrillTaskDetail" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskDetailVo">
-        select t.id              as id,
-               t.plan_id         as planId,
-               t.org_id          as orgId,
-               t.org_name        as orgName,
-               t.title           as title,
-               t.type            as type,
-               t.start_date      as startDate,
-               t.end_date        as endDate,
-               t.drill_time      as drillTime,
-               t.preset_case     as presetCase,
-               t.drill_situation as drillSituation,
-               t.drill_site      as drillSite,
-               t.comment_score   as commentScore,
-               t.comment         as comment,
-               t.plan_cycle      as planCycle,
-               t.image_list      as imageList,
-               t.host_id         as hostId,
-               t.recorder_id     as recorderId,
-               u.name            as hostName,
-               u2.name           as recorderName,
-               t.pdf_url         as pdfUrl,
-               t.file_list       as file,
-               t.rec_status      as recStatus
+        select t.id               as id,
+               t.plan_id          as planId,
+               t.org_id           as orgId,
+               t.org_name         as orgName,
+               t.title            as title,
+               t.type             as type,
+               t.start_date       as startDate,
+               t.end_date         as endDate,
+               t.drill_start_time as drillStartTime,
+               t.drill_end_time   as drillEndTime,
+               t.preset_case      as presetCase,
+               t.drill_situation  as drillSituation,
+               t.drill_site       as drillSite,
+               t.comment_score    as commentScore,
+               t.comment          as comment,
+               t.plan_cycle       as planCycle,
+               t.image_list       as imageList,
+               t.host_id          as hostId,
+               t.recorder_id      as recorderId,
+               u.name             as hostName,
+               u2.name            as recorderName,
+               t.pdf_url          as pdfUrl,
+               t.file_list        as file,
+               t.rec_status       as recStatus
 
         from core_drill_task t
                  left join sys_user u on u.id = t.host_id
@@ -208,8 +185,8 @@
     </sql>
 
     <select id="selectRecTaskListPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecTaskPageVo">
-        select id,org_name,drill_time,type from core_drill_task t
-        where drill_time is not null
+        select id,org_name,drill_start_time,drill_end_time,type from core_drill_task t
+        where drill_start_time is not null
         <include refid="recTaskListPage"/>
 
 
@@ -293,7 +270,7 @@
     <select id="selectWaitRecTaskList" 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,t.status,t.rec_status
         from core_drill_task t inner join sys_org o on t.org_id=o.id
-        where  t.org_path like concat(#{request.orgPath},'%')
+        where t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
         <if test="request.orgType==3">
             and t.rec_status =0 and o.type=4

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -118,6 +118,9 @@ public class SysUserController extends BaseController {
     @GetMapping("/dictionlist")
     public R<List<SysUser>> list2(SysUser user) {
         try {
+            if (ObjectUtil.isEmpty(user.getOrgId())){
+                user.setOrgId(SecurityUtils.getLoginUser().getOrgId());
+            }
             return R.ok(userService.selectSyncUserList(user));
         } catch (Exception e) {
             return R.fail(e.getMessage());