新增项目变更计划查询列表

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

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.DelayWarnTypeEnum;
-import com.qmth.sop.common.enums.ProductTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -47,19 +46,6 @@ public class TBProjectExchange implements Serializable {
     @NotNull(message = "服务单元id不能为空")
     private Long serviceId;
 
-    @ApiModelProperty(value = "客户经理id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "客户经理id不能为空")
-    private Long accountManagerId;
-
-    @ApiModelProperty(value = "客户类型，OFFICE：教务处，CLOUD_MARK：云阅卷")
-    @NotNull(message = "客户类型不能为空")
-    private ProductTypeEnum customType;
-
-    @ApiModelProperty(value = "客户名称")
-    @NotBlank(message = "客户名称不能为空")
-    private String customName;
-
     @ApiModelProperty(value = "变更类型，PLAN：项目信息及计划，TIME：处理时限，CANCEL：项目取消")
     @NotNull(message = "变更类型不能为空")
     private DelayWarnTypeEnum type;
@@ -107,37 +93,13 @@ public class TBProjectExchange implements Serializable {
         this.approveUserIds = approveUserIds;
     }
 
-    public void setCode(String exchangeNo, Long userId){
+    public void setCode(String exchangeNo, Long userId) {
         this.exchangeNo = exchangeNo;
         setId(SystemConstant.getDbUuid());
         setCreateId(userId);
         setCreateTime(System.currentTimeMillis());
     }
 
-    public Long getAccountManagerId() {
-        return accountManagerId;
-    }
-
-    public void setAccountManagerId(Long accountManagerId) {
-        this.accountManagerId = accountManagerId;
-    }
-
-    public ProductTypeEnum getCustomType() {
-        return customType;
-    }
-
-    public void setCustomType(ProductTypeEnum customType) {
-        this.customType = customType;
-    }
-
-    public String getCustomName() {
-        return customName;
-    }
-
-    public void setCustomName(String customName) {
-        this.customName = customName;
-    }
-
     public String getExchangeNo() {
         return exchangeNo;
     }

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

@@ -799,4 +799,15 @@ INSERT INTO sys_privilege
 VALUES(3027, '流程控件查询接口', '/api/admin/widget/flow/select', 'URL', 64, 26, 'SYS', NULL, 1, 1, 0);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3028, '控件查询列表接口', '/api/admin/widget/list', 'URL', 64, 27, 'SYS', NULL, 1, 1, 0);
+VALUES(3028, '控件查询列表接口', '/api/admin/widget/list', 'URL', 64, 27, 'SYS', NULL, 1, 1, 0);
+
+UPDATE sys_privilege
+SET name='处理申请', url='Finish', `type`='LINK', parent_id=44, `sequence`=1, property='AUTH', related=NULL, enable=1, default_auth=0, front_display=1
+WHERE id=3024;
+
+
+ALTER TABLE t_b_project_exchange DROP COLUMN account_manager_id;
+
+ALTER TABLE t_b_project_exchange DROP COLUMN custom_type;
+
+ALTER TABLE t_b_project_exchange DROP COLUMN custom_name;

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

@@ -11,8 +11,6 @@ public enum DelayWarnTypeEnum {
 
     PLAN("关键信息及计划变更"),
 
-    TIME("处理时限报备"),
-
     CANCEL("项目取消");
 
     private String title;

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

@@ -45,7 +45,9 @@ public enum EnumList {
 
     PRODUCT_TYPE_ENUM(ProductTypeEnum.class),
 
-    PROJECT_EXCHANGE_FLOW_STATUS_ENUM(ProjectExchangeFlowStatusEnum.class);
+    PROJECT_EXCHANGE_FLOW_STATUS_ENUM(ProjectExchangeFlowStatusEnum.class),
+
+    PROJECT_EXCHANGE_APPROVE_ENUM(ProjectExchangeApproveEnum.class);
 
     private Object obj;
 

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

@@ -0,0 +1,32 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 项目计划变更审核操作enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/1/24
+ */
+public enum ProjectExchangeApproveEnum {
+
+    FINISH("已完成"),
+
+    NOT_UPDATE("经沟通，取消变更"),
+
+    PARTIAL_UPDATE("经沟通，部分变更");
+
+    private String title;
+
+    private ProjectExchangeApproveEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    @Override
+    public String toString() {
+        return title;
+    }
+}

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

@@ -502,6 +502,12 @@ public class SysController {
                     map.put(projectExchangeFlowStatusEnum, projectExchangeFlowStatusEnum.getTitle());
                 }
                 break;
+            case PROJECT_EXCHANGE_APPROVE_ENUM://项目计划变更流程审核类型
+                ProjectExchangeApproveEnum[] projectExchangeApproveEnums = ProjectExchangeApproveEnum.values();
+                for (ProjectExchangeApproveEnum projectExchangeApproveEnum : projectExchangeApproveEnums) {
+                    map.put(projectExchangeApproveEnum, projectExchangeApproveEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }