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

@@ -596,7 +596,7 @@ END IF;
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_resumption_plan_to_point'
-                    AND column_name = 'validate_date') THEN
+                    AND column_name = 'effective_date') THEN
 		ALTER TABLE `core_resumption_plan_to_point`
 			ADD COLUMN `effective_date` date NULL COMMENT '生效日期。不为null';
 		UPDATE core_resumption_plan_to_point set effective_date='2000-01-01';
@@ -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/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>