流程调试

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

@@ -8,10 +8,7 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.bean.FormPropertyBean;
 import com.qmth.sop.business.bean.result.*;
-import com.qmth.sop.business.entity.TFCustomFlow;
-import com.qmth.sop.business.entity.TFCustomFlowEntity;
-import com.qmth.sop.business.entity.TFFlowApprove;
-import com.qmth.sop.business.entity.TFFlowLog;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.SysUserMapper;
 import com.qmth.sop.business.service.*;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -20,6 +17,7 @@ import com.qmth.sop.common.lock.MemoryLock;
 import com.qmth.sop.common.util.GsonUtil;
 import com.qmth.sop.common.util.JacksonUtil;
 import com.qmth.sop.common.util.ResultUtil;
+import com.qmth.sop.common.util.ServletUtil;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.FlowNode;
 import org.activiti.bpmn.model.UserTask;
@@ -169,7 +167,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                                            Map<String, Object> map) {
         if (CollectionUtils.isEmpty(approveUserIds) && (approve == FlowApprovePassEnum.START || approve == FlowApprovePassEnum.DRAFT || approve == FlowApprovePassEnum.PASS)) {
             approveUserIds = new ArrayList<>();
-            approveUserIds.add("123");//否则是当前登录用户
+            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+            approveUserIds.add(String.valueOf(sysUser.getId()));//否则是当前登录用户
         }
         String processFlowId = null;
         TFCustomFlowEntity tfCustomFlowEntity = null;

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

@@ -89,9 +89,20 @@ public class FlowFormWidgetResult implements Serializable {
     @ApiModelProperty(value = "占宽符")
     private Integer span;
 
+    @ApiModelProperty(value = "子标题")
+    private String subTitle;
+
     @ApiModelProperty(value = "表格信息")
     private List<FlowTablePropResult> tablePropList;
 
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public String getFormat() {
         return format;
     }
@@ -108,6 +119,14 @@ public class FlowFormWidgetResult implements Serializable {
         this.binding = binding;
     }
 
+    public Integer getSpan() {
+        return span;
+    }
+
+    public void setSpan(Integer span) {
+        this.span = span;
+    }
+
     public String getName() {
         if (Objects.nonNull(this.code)) {
             return this.code.getTitle();

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

@@ -73,6 +73,17 @@ public class FlowTablePropResult implements Serializable {
     @ApiModelProperty(value = "列控件")
     private FlowTdFormWidgetResult tdFormWidget;
 
+    @ApiModelProperty(value = "子标题")
+    private String subTitle;
+
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public FlowTdFormWidgetResult getTdFormWidget() {
         return tdFormWidget;
     }

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

@@ -38,6 +38,17 @@ public class FlowTdFormWidgetResult implements Serializable {
     @ApiModelProperty(value = "格式化")
     private String format;
 
+    @ApiModelProperty(value = "子标题")
+    private String subTitle;
+
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public String getFormat() {
         return format;
     }

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

@@ -86,6 +86,17 @@ public class TDFormWidget extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "占宽符")
     private Integer span;
 
+    @ApiModelProperty(value = "子标题")
+    private String subTitle;
+
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public Integer getSpan() {
         return span;
     }

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

@@ -68,6 +68,17 @@ public class TDTableProp extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "实体内容")
     private String obj;
 
+    @ApiModelProperty(value = "子标题")
+    private String subTitle;
+
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public Long getWidgetId() {
         return widgetId;
     }

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

@@ -144,5 +144,5 @@ CREATE TABLE `sys_custom_role` (
                                    `role_id` bigint NOT NULL COMMENT '角色id',
                                    `quota` bigint NOT NULL COMMENT '配额',
                                    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户角色配置表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户角色配置表';
 -------------------------------

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

@@ -286,4 +286,11 @@ WHERE id=18;
 
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3000, '修改密码', '/api/admin/common/update_password', 'URL', 64, 13, 'SYS', NULL, 1, 1, 0);
+VALUES(3000, '修改密码', '/api/admin/common/update_password', 'URL', 64, 13, 'SYS', NULL, 1, 1, 0);
+
+--2023.8.10update
+ALTER TABLE t_d_form_widget ADD sub_title varchar(1000) NULL COMMENT '子标题';
+ALTER TABLE t_d_form_widget CHANGE sub_title sub_title varchar(1000) NULL COMMENT '子标题' AFTER span;
+
+ALTER TABLE t_d_table_prop ADD sub_title varchar(1000) NULL COMMENT '子标题';
+ALTER TABLE t_d_table_prop CHANGE sub_title sub_title varchar(1000) NULL COMMENT '子标题' AFTER colspan;