Ver Fonte

教务处sop流程修改

wangliang há 1 ano atrás
pai
commit
c3de52ac85

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

@@ -1,6 +1,9 @@
 package com.qmth.sop.business.entity;
 
-import com.qmth.sop.common.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.enums.TFCustomTypeEnum;
 import com.qmth.sop.common.enums.WidgetCodeEnum;
 import com.qmth.sop.common.enums.WidgetInputTypeEnum;
@@ -19,10 +22,14 @@ import java.io.Serializable;
  * @since 2023-07-17
  */
 @ApiModel(value = "TDFormWidget对象", description = "动态表单控件表")
-public class TDFormWidget extends BaseEntity implements Serializable {
+public class TDFormWidget implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "编码,TEXT:文本,TEXTAREA:文本域,SELECT:下拉框,RADIO:单选框,CHECKBOX:复选框,DATE:日期,BUTTON:按钮,IMG:图片,VIDEO:视频,AUDIO:音频,FILE:文件,POP_SELECT:弹出选择框,LABEL:标签,TABLE:表格,SIGN:签名,CASCADE_ADDRESS:城市选择控件,OTHER:其它,FORM_GROUP_TITLE:带虚线分割线的标题,ONLE_TITLE:普通标题,独占一行,RADIO_WITH_INPUT:带1个输入框的单选框,DEVICE_IN_TABLE:设备入库表格,DEVICE_OUT_TABLE:设备出库表格")
     private WidgetCodeEnum code;
 
@@ -92,6 +99,38 @@ public class TDFormWidget extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "处理时限,0:不处理,1:可处理")
     private Boolean handleTime;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "创建人")
+    private Long createId;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
     public TFCustomTypeEnum getFlowType() {
         return flowType;
     }

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

@@ -862,6 +862,8 @@ ALTER TABLE t_d_form_widget CHANGE COLUMN code code VARCHAR(20)
 --2023.8.29update
 ALTER TABLE t_d_form_widget DROP COLUMN parent_id;
 ALTER TABLE t_d_form_widget DROP COLUMN fit;
+ALTER TABLE t_d_form_widget DROP COLUMN update_id;
+ALTER TABLE t_d_form_widget DROP COLUMN update_time;
 
 ALTER TABLE t_d_form_widget CHANGE COLUMN input_type input_type VARCHAR(20)
     COMMENT '输入类型,STRING:字符串,INT:整型,LONG:长整型,DOUBLE:浮点型,ENUM:枚举,DATE:日期,BOOL:布尔,BIGDECIMAL:精确浮点,FILE:文件,ARRAY:数组' NULL;