教务处流程修改

sop-api/install/mysql/init/init.sql

@@ -2170,6 +2170,7 @@ INSERT INTO `sys_role` VALUES (9, NULL, '技术客服', 1, 'CUSTOM', NULL, NULL,
 INSERT INTO `sys_role` VALUES (10, NULL, '客户经理', 1, 'ACCOUNT_MANAGER', NULL, NULL, 443437441441857536, 1697425679196, 1, '系统角色');
 INSERT INTO `sys_role` VALUES (11, NULL, '乙方总负责人', 1, 'THIRD_PMO', NULL, NULL, 443437441441857536, 1697621767961, 1, '系统角色');
 INSERT INTO `sys_role` VALUES (12, NULL, '设备发货员', 1, 'DEVICE_DELIVERY', NULL, NULL, 1, 1702266042618, 1, '系统角色');
+INSERT INTO `sys_role` VALUES (13, NULL, '项目经理', 1, 'PROJECT_MANAGER', NULL, NULL, 1, 1702266042618, 1, '系统角色');
 
 INSERT INTO `sys_role_privilege` VALUES (446629625196445696, 2, 1024, 1);
 INSERT INTO `sys_role_privilege` VALUES (446629625196445697, 2, 1, 1);

sop-api/install/mysql/upgrade/1.1.0.sql

@@ -1,2 +1,6 @@
 USE sop_db;
 
+--2024/5/13update
+INSERT INTO `sys_role` VALUES (13, NULL, '项目经理', 1, 'PROJECT_MANAGER', NULL, NULL, 1, 1702266042618, 1, '系统角色');
+
+ALTER TABLE t_d_form_widget MODIFY COLUMN role_type varchar(500) NULL COMMENT '角色类型';

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -1009,11 +1009,12 @@ public class ActivitiServiceImpl implements ActivitiService {
                     List<FlowFormWidgetResult> flowFormWidgetResultList = currFlowTaskResult.getFormProperty();
                     for (FlowFormWidgetResult f : flowFormWidgetResultList) {
                         if (Objects.nonNull(sysRole)) {
-                            if (f.getRoleType() == sysRole.getType() && (
-                                    sysRole.getType() == RoleTypeEnum.REGION_MANAGER
-                                            || sysRole.getType() == RoleTypeEnum.EFFECT_ENGINEER)) {
-                                flowFormWidgetResultListNew.add(f);
-                            }
+                            //TODO f.getRoleType()待修改
+                            //                            if (f.getRoleType() == sysRole.getType() && (
+                            //                                    sysRole.getType() == RoleTypeEnum.REGION_MANAGER
+                            //                                            || sysRole.getType() == RoleTypeEnum.EFFECT_ENGINEER)) {
+                            //                                flowFormWidgetResultListNew.add(f);
+                            //                            }
                         } else {
                             if (f.getFormId().contains(SystemConstant.APPROVE_RADIO_REGION) || f.getFormId()
                                     .contains(SystemConstant.APPROVE_REMARK_REGION) || f.getFormId()
@@ -1044,7 +1045,9 @@ public class ActivitiServiceImpl implements ActivitiService {
                     }
                     List<FlowFormWidgetResult> flowFormWidgetResultList = currFlowTaskResult.getFormProperty();
                     for (FlowFormWidgetResult f : flowFormWidgetResultList) {
-                        if (Objects.nonNull(sysRole) && f.getRoleType() != sysRole.getType()) {
+                        //TODO f.getRoleType()待修改
+                        if (Objects.nonNull(sysRole)) {
+                            //                                && f.getRoleType() != sysRole.getType()) {
                             f.setReadable(true);
                             f.setWritable(false);
                         } else {

sop-business/src/main/java/com/qmth/sop/business/bean/result/FlowFormWidgetResult.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.sop.common.enums.RoleTypeEnum;
 import com.qmth.sop.common.enums.WidgetCodeEnum;
 import com.qmth.sop.common.enums.WidgetInputTypeEnum;
 import com.qmth.sop.common.enums.WidgetTypeEnum;
@@ -99,7 +98,7 @@ public class FlowFormWidgetResult implements Serializable {
     private Integer formGroup;
 
     @ApiModelProperty(value = "角色类型")
-    private RoleTypeEnum roleType;
+    private String roleType;
 
     public Integer getFormGroup() {
         return formGroup;
@@ -109,11 +108,11 @@ public class FlowFormWidgetResult implements Serializable {
         this.formGroup = formGroup;
     }
 
-    public RoleTypeEnum getRoleType() {
+    public String getRoleType() {
         return roleType;
     }
 
-    public void setRoleType(RoleTypeEnum roleType) {
+    public void setRoleType(String roleType) {
         this.roleType = roleType;
     }
 

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

@@ -97,7 +97,7 @@ public class TDFormWidget implements Serializable {
     private Integer formGroup;
 
     @ApiModelProperty(value = "角色类型")
-    private RoleTypeEnum roleType;
+    private String roleType;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人")
@@ -107,20 +107,20 @@ public class TDFormWidget implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Long createTime;
 
-    public Integer getFormGroup() {
-        return formGroup;
+    public String getRoleType() {
+        return roleType;
     }
 
-    public void setFormGroup(Integer formGroup) {
-        this.formGroup = formGroup;
+    public void setRoleType(String roleType) {
+        this.roleType = roleType;
     }
 
-    public RoleTypeEnum getRoleType() {
-        return roleType;
+    public Integer getFormGroup() {
+        return formGroup;
     }
 
-    public void setRoleType(RoleTypeEnum roleType) {
-        this.roleType = roleType;
+    public void setFormGroup(Integer formGroup) {
+        this.formGroup = formGroup;
     }
 
     public Long getId() {

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

@@ -34,6 +34,8 @@ public enum RoleTypeEnum {
 
     DEVICE_DELIVERY("设备发货员", "系统角色"),
 
+    PROJECT_MANAGER("项目经理", "系统角色"),
+
     DEFINED("自定义", "自定义角色");
 
     RoleTypeEnum(String desc, String title) {