新增任务提醒表

sop-business/src/main/java/com/qmth/sop/business/entity/SysMessage.java

@@ -28,9 +28,15 @@ public class SysMessage implements Serializable {
     @ApiModelProperty(value = "crm单号")
     private String crmNo;
 
-    @ApiModelProperty(value = "类型，DELAY：延期提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告")
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+    @ApiModelProperty(value = "消息类型，BEFORE：提前提醒，AFTER：延期提醒，OFFICE_SOP：教务处SOP，CLOUD_MARK_SOP：云阅卷SOP，QUALITY：质量问题提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告")
     private MessageTypeEnum type;
 
+    @ApiModelProperty(value = "实体业务类型")
+    private String objType;
+
     @ApiModelProperty(value = "公告id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long noticeId;
@@ -63,6 +69,22 @@ public class SysMessage implements Serializable {
     @ApiModelProperty(value = "是否已阅，0：未阅，1：已阅")
     private Boolean status;
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getObjType() {
+        return objType;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
+
     public Long getId() {
         return id;
     }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -563,4 +563,18 @@ CREATE TABLE `t_s_job_remind` (
                                   `create_id` bigint NOT NULL COMMENT '创建人id',
                                   `create_time` bigint NOT NULL COMMENT '创建时间',
                                   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务提醒表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务提醒表';
+
+
+ALTER TABLE sys_message CHANGE COLUMN type type VARCHAR(20)
+    COMMENT '消息类型，BEFORE：提前提醒，AFTER：延期提醒，OFFICE_SOP：教务处SOP，CLOUD_MARK_SOP：云阅卷SOP，QUALITY：质量问题提醒，EXCEPTION_APPROVE：异常审核提醒，VIOLATION：违规提醒，SYSTEM_PLAN_CHANGE：系统计划变更提醒，SYSTEM：系统公告' NOT NULL;
+
+ALTER TABLE sys_message ADD code VARCHAR(100)
+    COMMENT '编号' NULL after crm_no;
+
+ALTER TABLE sys_message ADD obj_type VARCHAR(100)
+    COMMENT '实体业务类型' NULL after type;
+
+INSERT INTO sys_role
+(id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, interpret)
+VALUES(10, NULL, '客户经理', 1, 'ACCOUNT_MANAGER', NULL, NULL, NULL, NULL, 1, '系统角色');

sop-common/src/main/java/com/qmth/sop/common/enums/EnumList.java

@@ -25,7 +25,9 @@ public enum EnumList {
 
     FLOW_TASK_TYPE_ENUM(FlowTaskTypeEnum.class),
 
-    ROLE_TYPE_ENUM(RoleTypeEnum.class);
+    ROLE_TYPE_ENUM(RoleTypeEnum.class),
+
+    MESSAGE_TYPE_ENUM(MessageTypeEnum.class);
 
     private Object obj;
 

sop-common/src/main/java/com/qmth/sop/common/enums/MessageTypeEnum.java

@@ -9,7 +9,15 @@ package com.qmth.sop.common.enums;
  */
 public enum MessageTypeEnum {
 
-    DELAY("延期提醒"),
+    BEFORE("提前提醒"),
+
+    AFTER("延期提醒"),
+
+    OFFICE_SOP("教务处SOP"),
+
+    CLOUD_MARK_SOP("云阅卷SOP"),
+
+    QUALITY("质量问题提醒"),
 
     EXCEPTION_APPROVE("异常审核提醒"),
 

sop-common/src/main/java/com/qmth/sop/common/enums/RoleTypeEnum.java

@@ -25,6 +25,8 @@ public enum RoleTypeEnum {
 
     CUSTOM("技术客服", "系统角色"),
 
+    ACCOUNT_MANAGER("客户经理", "系统角色"),
+
     DEFINED("自定义", "自定义角色");
 
     RoleTypeEnum(String desc, String title) {

sop-server/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -440,6 +440,12 @@ public class SysController {
                     map.put(roleTypeEnum, roleTypeEnum.getTitle());
                 }
                 break;
+            case MESSAGE_TYPE_ENUM://消息类型枚举
+                MessageTypeEnum[] messageTypeEnums = MessageTypeEnum.values();
+                for (MessageTypeEnum messageTypeEnum : messageTypeEnums) {
+                    map.put(messageTypeEnum, messageTypeEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }