培训/演练 类型默认值联动代码提交

project_data/sql/0.0.3/soc/soc.sql

@@ -620,7 +620,20 @@ END IF;
 		ALTER TABLE `sys_org_physical_defense_construction`
 			ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '未达标原因';
     END IF;
-	
+
+	-- 培训计划表新增字段 培训类型
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_edu_training_plan'
+                    AND column_name = 'type') THEN
+        alter table core_edu_training_plan
+            add type int default 0 not null comment '培训类型,0:行社安全保卫教育培训,1:行社消防安全培训,2:营业网点安全保卫教育培训,3:营业网点消防安全培训,4:其他' after id;
+    END IF;
+
+
+
+
 
 
     END ??
@@ -734,9 +747,9 @@ update sys_dict_type  SET dict_name = '预案演练项目' WHERE dict_name = '
 delete  from sys_dict_type where dict_type='core_drill_category';
 delete  from sys_dict_data where dict_type='core_drill_category';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('预案演练类型', 'core_drill_category', '0', null, now(), null, now(), null);
-INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (10, '应急预案演练', '1', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
-INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (20, '灭火和应急疏散预案演练', '2', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
-INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (30, '其他', '3', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (10, '应急预案演练', '0', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (20, '灭火和应急疏散预案演练', '1', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (30, '其他', '2', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
 
 -- 报警控制器
 ALTER TABLE `core_protection_log`

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

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
@@ -30,6 +28,10 @@ public class CoreDrillPlan extends BaseEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
+    @TableField(value = "type")
+    @ApiModelProperty(value = "培训类型")
+    private int type;
+
     @TableField(value = "plan_name")
     @ApiModelProperty(value = "计划名称")
     private String planName;
@@ -46,7 +48,7 @@ public class CoreDrillPlan extends BaseEntity {
     @ApiModelProperty(value = "计划状态：0：启用，1禁用")
     private Integer planStatus;
 
-   @TableField(value = "exec_org_type")
+    @TableField(value = "exec_org_type")
     @ApiModelProperty(value = "执行机构类型")
     private Integer execOrgType;
 
@@ -88,7 +90,7 @@ public class CoreDrillPlan extends BaseEntity {
     @ApiModelProperty(value = "计划所属机构path")
     private String belongOrgPath;
 
-   @TableField(value = "standard")
+    @TableField(value = "standard")
     @ApiModelProperty(value = "是否是标准计划,0:否,1:是")
     private Integer standard;
 
@@ -116,85 +118,4 @@ public class CoreDrillPlan extends BaseEntity {
     @TableField(value = "remark")
     @ApiModelProperty(value = "备注")
     private String remark;
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-
-
-                .append("id", getId())
-
-
-                .append("planName", getPlanName())
-
-
-                .append("planCycle", getPlanCycle())
-
-
-                .append("execTimes", getExecTimes())
-
-
-                .append("planStatus", getPlanStatus())
-
-
-                .append("execOrgType", getExecOrgType())
-
-
-                .append("planStartDate", getPlanStartDate())
-
-
-                .append("planEndDate", getPlanEndDate())
-
-
-                .append("buildTaskNow", getBuildTaskNow())
-
-
-                .append("createOrgId", getCreateOrgId())
-
-
-                .append("createOrgName", getCreateOrgName())
-
-
-                .append("createOrgPath", getCreateOrgPath())
-
-
-                .append("belongOrgId", getBelongOrgId())
-
-
-                .append("belongOrgName", getBelongOrgName())
-
-
-                .append("belongOrgPath", getBelongOrgPath())
-
-
-                .append("standard", getStandard())
-
-
-                .append("issue", getIssue())
-
-
-                .append("beIssue", getBeIssue())
-
-
-                .append("parentId", getParentId())
-
-
-                .append("fileList", getFileList())
-
-
-                .append("deleted", getDeleted())
-
-
-                .append("createBy", getCreateBy())
-
-
-                .append("createTime", getCreateTime())
-
-
-                .append("updateBy", getUpdateBy())
-
-
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

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

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

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

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 
@@ -17,6 +16,9 @@ import java.util.List;
 public class CoreDrillPlanUpdateDto {
     private Long id;
 
+    @ApiModelProperty(value = "培训类型")
+    private int type;
+
     @NotBlank(message = "计划名称不能为空")
     @ApiModelProperty(value = "计划名称")
     private String planName;

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

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

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

@@ -1,19 +1,19 @@
 package com.xunmei.common.core.domain.edu.domain;
 
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 教育培训计划对象 core_edu_training_plan
@@ -32,6 +32,10 @@ public class CoreEduTrainingPlan extends BaseEntity {
     @TableId
     private Long id;
 
+    @TableField("type")
+    @ApiModelProperty(value = "培训类型")
+    private int type;
+
     @TableField("plan_name")
     @ApiModelProperty(value = "计划名称")
     private String planName;

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

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 
@@ -17,6 +16,8 @@ import java.util.List;
 public class CoreEduTrainingPlanEditDto {
 
     private Long id;
+    @ApiModelProperty(value = "培训类型")
+    private int type;
 
     @NotBlank(message = "计划名称不能为空")
     @ApiModelProperty(value = "计划名称")

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

@@ -16,6 +16,9 @@ import java.util.List;
 public class CoreEduTrainingPlanInsertDto {
 
 
+    @ApiModelProperty(value = "培训类型")
+    private int type;
+
     @NotBlank(message = "计划名称不能为空")
     @ApiModelProperty(value = "计划名称")
     private String planName;

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

@@ -14,6 +14,9 @@ public class CoreEduTrainingPlanDataVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "培训类型")
+    private Integer type;
+
     @ApiModelProperty(value = "计划名称")
     private String planName;
 

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

@@ -18,6 +18,9 @@ public class CoreEduTrainingPlanDetailVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "计划周期")
+    private Integer type;
+
     @ApiModelProperty(value = "计划名称")
     private String planName;
 

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

@@ -15,8 +15,12 @@ import java.util.Map;
 public enum EduTrainingType {
 
 
-    MYAQJYPX(0, "每月安全培训教育"),
-    ZXAQJYPX(1, "专项安全培训教育");
+    HSANBWJYPX(0, "行社安全保卫教育培训"),
+    HSXFAQPX(1, "行社消防安全培训"),
+    YYWDAQBWJYPX(1, "营业网点安全保卫教育培训"),
+    YYWDXFAQPX(1, "营业网点消防安全培训"),
+    QT(1, "其他"),
+    ;
 
 
     /**

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

@@ -193,6 +193,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         CoreEduTrainingPlan plan = new CoreEduTrainingPlan();
         BeanUtils.copyProperties(request, plan);
         plan.setId(IdWorker.getId());
+        plan.setType(request.getType());
         plan.setCreateTime(new Date());
         plan.setUpdateTime(new Date());
         plan.setCreateBy(SecurityUtils.getUserId().toString());
@@ -328,6 +329,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         }
         plan.setBuildTaskNow(request.getBuildTaskNow() ? 1 : 0);
         plan.setUpdateTime(DateUtils.getNowDate());
+        plan.setType(request.getType());
         plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
         plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));

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

@@ -33,6 +33,7 @@ import com.xunmei.common.core.enums.RegisterBookType;
 import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
+import com.xunmei.common.core.enums.edu.EduTrainingType;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateUtils;
@@ -187,7 +188,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     private void dealData(CoreEduTrainingTaskPageVo record, List<CoreEduTrainingTaskPageVo> records, Map<Long, List<CoreEduTrainingTaskToRole>> listMap) {
         record.setNo(records.indexOf(record) + 1);
-        //record.setTypeText(EduTrainingType.getName(record.getType()));
+        record.setTypeText(EduTrainingType.getName(record.getType()));
         record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
 
        /* List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
@@ -222,7 +223,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     public CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id) {
         CoreEduTrainingTaskDetailVo detailVo = coreEduTrainingTaskMapper.selectEduTrainingTaskDetail(id);
         detailVo.setStatusText(EduTrainingDoStatus.getName(detailVo.getStatus()));
-        //detailVo.setTypeText(EduTrainingType.getName(detailVo.getType()));
+        detailVo.setTypeText(EduTrainingType.getName(detailVo.getType()));
         if (ObjectUtil.isNotEmpty(detailVo.getFile())) {
             detailVo.setFileList(JSON.parseArray(detailVo.getFile(), String.class));
         }
@@ -447,7 +448,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
         List<SysWorkTime> workTimeList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData(),
+                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.INNER).getData(),
                 ErrorMsgConstants.QUERY_ORG_WORK_TIME_ERROR);
         if (workTimeList.isEmpty()) {
             log.error("生成任务时，需要生成任务的机构均未营业,本次任务跳过!");
@@ -489,6 +490,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 DateRange dateRange = dateRangeMap.get(i);
                 CoreEduTrainingTask trainingTask = new CoreEduTrainingTask();
                 trainingTask.setId(IdWorker.getId());
+                trainingTask.setType(plan.getType());
                 trainingTask.setPlanId(plan.getId());
                 trainingTask.setPlanCycle(plan.getPlanCycle());
                 trainingTask.setStartDate(DateUtils.getPreciseTime(dateRange.getStartTime()));

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

@@ -259,7 +259,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
                 String oldName =  lista.get(i).getTaskName();
                 String str  =  "第"+(i+1)+"次调阅";
                 int index = oldName.lastIndexOf("第");
-                lista.get(i).setTaskName(oldName.substring(0,index)+str);
+                if (index>0){
+                    lista.get(i).setTaskName(oldName.substring(0,index)+str);
+                }
+
             }
             this.saveBatch(lista);
         }