sop信息表修改

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

@@ -436,7 +436,7 @@ public class ActivitiServiceImpl implements ActivitiService {
                         }
                     }
                     if (!CollectionUtils.isEmpty(tdFormWidgetMetadataSet)) {
-                        tdFormWidgetMetadataService.deleteAllData(tfCustomFlow.getType(), tfCustomFlow.getFlowDeploymentId(), tfCustomFlow.getVersion());
+                        tdFormWidgetMetadataService.deleteAllData(tfCustomFlow.getType());
                         tdFormWidgetMetadataService.saveBatch(tdFormWidgetMetadataSet);
                     }
                 }

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

@@ -3,7 +3,7 @@ package com.qmth.sop.business.entity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;
-import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.TFCustomTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -39,12 +39,9 @@ public class TBSopInfo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "学院名称")
     private String collegeName;
 
-    @ApiModelProperty(value = "项目名称")
-    private Long projectName;
-
     @ApiModelProperty(value = "产品id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long projectId;
+    private Long productId;
 
     @ApiModelProperty(value = "区域负责人id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -54,13 +51,21 @@ public class TBSopInfo extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long cloudMarkUserId;
 
-    @ApiModelProperty(value = "类型，OFFICE：教务处，CLOUD_MARK：研究生")
-    private ProductTypeEnum type;
+    @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP")
+    private TFCustomTypeEnum type;
 
     @ApiModelProperty(value = "提交人id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    public TBSopInfo() {
+
+    }
+
+    public TBSopInfo(String crmNo, Long serviceId, Long customId, String collegeName, Long projectName, Long projectId, Long regionUserId, Long cloudMarkUserId, TFCustomTypeEnum type, Long userId) {
+
+    }
+
     public String getCrmNo() {
         return crmNo;
     }
@@ -101,20 +106,12 @@ public class TBSopInfo extends BaseEntity implements Serializable {
         this.collegeName = collegeName;
     }
 
-    public Long getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(Long projectName) {
-        this.projectName = projectName;
-    }
-
-    public Long getProjectId() {
-        return projectId;
+    public Long getProductId() {
+        return productId;
     }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
+    public void setProductId(Long productId) {
+        this.productId = productId;
     }
 
     public Long getRegionUserId() {
@@ -133,11 +130,11 @@ public class TBSopInfo extends BaseEntity implements Serializable {
         this.cloudMarkUserId = cloudMarkUserId;
     }
 
-    public ProductTypeEnum getType() {
+    public TFCustomTypeEnum getType() {
         return type;
     }
 
-    public void setType(ProductTypeEnum type) {
+    public void setType(TFCustomTypeEnum type) {
         this.type = type;
     }
 

sop-business/src/main/java/com/qmth/sop/business/mapper/TDFormWidgetMetadataMapper.java

@@ -17,14 +17,12 @@ import org.apache.ibatis.annotations.Param;
 public interface TDFormWidgetMetadataMapper extends BaseMapper<TDFormWidgetMetadata> {
 
     /**
-     * 根据流程类型、部署id、版本号删除数据
+     * 根据流程类型删除数据
      *
      * @param type
-     * @param flowDeploymentId
-     * @param version
      * @return
      */
     @InterceptorIgnore(blockAttack = "true")
-    @Delete("delete t from t_d_form_widget_metadata t where t.type = '${type}' and t.flow_deployment_id = '${flowDeploymentId}' and t.version = ${version}")
-    Boolean deleteAllData(@Param("type") String type, @Param("flowDeploymentId") String flowDeploymentId, @Param("version") Integer version);
+    @Delete("delete t from t_d_form_widget_metadata t where t.type = '${type}'")
+    Boolean deleteAllData(@Param("type") String type);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TDFormWidgetMetadataService.java

@@ -15,12 +15,10 @@ import com.qmth.sop.common.enums.TFCustomTypeEnum;
 public interface TDFormWidgetMetadataService extends IService<TDFormWidgetMetadata> {
 
     /**
-     * 根据流程类型、部署id、版本号删除数据
+     * 根据流程类型删除数据
      *
      * @param type
-     * @param flowDeploymentId
-     * @param version
      * @return
      */
-    Boolean deleteAllData(TFCustomTypeEnum type, String flowDeploymentId, Integer version);
+    Boolean deleteAllData(TFCustomTypeEnum type);
 }

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

@@ -21,15 +21,13 @@ import java.util.Objects;
 public class TDFormWidgetMetadataServiceImpl extends ServiceImpl<TDFormWidgetMetadataMapper, TDFormWidgetMetadata> implements TDFormWidgetMetadataService {
 
     /**
-     * 根据流程类型、部署id、版本号删除数据
+     * 根据流程类型删除数据
      *
      * @param type
-     * @param flowDeploymentId
-     * @param version
      * @return
      */
     @Override
-    public Boolean deleteAllData(TFCustomTypeEnum type, String flowDeploymentId, Integer version) {
-        return this.baseMapper.deleteAllData(Objects.nonNull(type) ? type.name() : null, flowDeploymentId, version);
+    public Boolean deleteAllData(TFCustomTypeEnum type) {
+        return this.baseMapper.deleteAllData(Objects.nonNull(type) ? type.name() : null);
     }
 }

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

@@ -910,5 +910,11 @@ ALTER TABLE t_d_form_widget_metadata ADD field_value MEDIUMTEXT COMMENT '字段
 ALTER TABLE t_d_form_widget_metadata ADD setup INTEGER COMMENT '流程步骤' NOT NULL after field_value;
 ALTER TABLE t_d_form_widget_metadata ADD field_check TINYINT DEFAULT 0 COMMENT '是否勾选，0：未勾选，1：勾选' NOT NULL after setup;
 
-ALTER TABLE t_d_form_widget_metadata ADD code VARCHAR(20)
-    COMMENT '编码，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：设备出库表格' NOT NULL after version;
+ALTER TABLE t_d_form_widget_metadata ADD code VARCHAR(20) COMMENT '编码，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：设备出库表格' NOT NULL after version;
+
+ALTER TABLE t_b_sop_info CHANGE COLUMN type type VARCHAR(20) COMMENT '流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP' NOT NULL;
+
+ALTER TABLE t_b_sop_info DROP COLUMN project_name;
+
+ALTER TABLE t_b_sop_info CHANGE COLUMN project_id product_id BIGINT
+    COMMENT '产品id' NOT NULL;