新增sop信息明细表

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

@@ -6,6 +6,7 @@ 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.FlowApprovePassEnum;
 import com.qmth.sop.common.enums.ProjectExchangeApproveEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -86,6 +87,19 @@ public class TBProjectExchange implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private List<String> approveUserIds;
 
+    @ApiModelProperty(value = "流程审批")
+    @TableField(exist = false)
+    @NotNull(message = "流程审批不能为空")
+    private FlowApprovePassEnum flowApprove;
+
+    public FlowApprovePassEnum getFlowApprove() {
+        return flowApprove;
+    }
+
+    public void setFlowApprove(FlowApprovePassEnum flowApprove) {
+        this.flowApprove = flowApprove;
+    }
+
     public ProjectExchangeApproveEnum getResult() {
         return result;
     }

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

@@ -36,21 +36,10 @@ public class TBSopInfo extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long customId;
 
-    @ApiModelProperty(value = "学院名称")
-    private String collegeName;
-
     @ApiModelProperty(value = "产品id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long productId;
 
-    @ApiModelProperty(value = "区域负责人id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long regionUserId;
-
-    @ApiModelProperty(value = "阅卷负责人id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long cloudMarkUserId;
-
     @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP")
     private TFCustomTypeEnum type;
 
@@ -58,14 +47,11 @@ public class TBSopInfo extends BaseEntity implements Serializable {
 
     }
 
-    public TBSopInfo(String crmNo, Long serviceId, Long customId, String collegeName, Long productId, Long regionUserId, Long cloudMarkUserId, TFCustomTypeEnum type, Long userId) {
+    public TBSopInfo(String crmNo, Long serviceId, Long customId, Long productId, TFCustomTypeEnum type, Long userId) {
         this.crmNo = crmNo;
         this.serviceId = serviceId;
         this.customId = customId;
-        this.collegeName = collegeName;
         this.productId = productId;
-        this.regionUserId = regionUserId;
-        this.cloudMarkUserId = cloudMarkUserId;
         this.type = type;
         setCreateId(userId);
         setCreateTime(System.currentTimeMillis());
@@ -103,14 +89,6 @@ public class TBSopInfo extends BaseEntity implements Serializable {
         this.customId = customId;
     }
 
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
     public Long getProductId() {
         return productId;
     }
@@ -119,22 +97,6 @@ public class TBSopInfo extends BaseEntity implements Serializable {
         this.productId = productId;
     }
 
-    public Long getRegionUserId() {
-        return regionUserId;
-    }
-
-    public void setRegionUserId(Long regionUserId) {
-        this.regionUserId = regionUserId;
-    }
-
-    public Long getCloudMarkUserId() {
-        return cloudMarkUserId;
-    }
-
-    public void setCloudMarkUserId(Long cloudMarkUserId) {
-        this.cloudMarkUserId = cloudMarkUserId;
-    }
-
     public TFCustomTypeEnum getType() {
         return type;
     }

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

@@ -0,0 +1,81 @@
+package com.qmth.sop.business.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * sop明细表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-31
+ */
+@ApiModel(value = "TBSopInfoDetail对象", description = "sop明细表")
+public class TBSopInfoDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "sop信息id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sopInfoId;
+
+    @ApiModelProperty(value = "区域负责人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long regionUserId;
+
+    @ApiModelProperty(value = "实施工程师id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long engineerUserId;
+
+    @ApiModelProperty(value = "助理实施工程师id数组")
+    private String assistantEngineerUserIds;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSopInfoId() {
+        return sopInfoId;
+    }
+
+    public void setSopInfoId(Long sopInfoId) {
+        this.sopInfoId = sopInfoId;
+    }
+
+    public Long getRegionUserId() {
+        return regionUserId;
+    }
+
+    public void setRegionUserId(Long regionUserId) {
+        this.regionUserId = regionUserId;
+    }
+
+    public Long getEngineerUserId() {
+        return engineerUserId;
+    }
+
+    public void setEngineerUserId(Long engineerUserId) {
+        this.engineerUserId = engineerUserId;
+    }
+
+    public String getAssistantEngineerUserIds() {
+        return assistantEngineerUserIds;
+    }
+
+    public void setAssistantEngineerUserIds(String assistantEngineerUserIds) {
+        this.assistantEngineerUserIds = assistantEngineerUserIds;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.sop.business.entity.TBSopInfoDetail;
+
+/**
+ * <p>
+ * sop明细表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-31
+ */
+public interface TBSopInfoDetailMapper extends BaseMapper<TBSopInfoDetail> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.entity.TBSopInfoDetail;
+
+/**
+ * <p>
+ * sop明细表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-31
+ */
+public interface TBSopInfoDetailService extends IService<TBSopInfoDetail> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.entity.TBSopInfoDetail;
+import com.qmth.sop.business.mapper.TBSopInfoDetailMapper;
+import com.qmth.sop.business.service.TBSopInfoDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * sop明细表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-31
+ */
+@Service
+public class TBSopInfoDetailServiceImpl extends ServiceImpl<TBSopInfoDetailMapper, TBSopInfoDetail> implements TBSopInfoDetailService {
+
+}

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

@@ -923,4 +923,23 @@ ALTER TABLE t_b_sop_info DROP COLUMN user_id;
 ALTER TABLE t_d_form_widget CHANGE COLUMN code code VARCHAR(20) COMMENT '编码，TEXT：文本，TEXTAREA：文本域，SINGLE_SELECT：单选下拉框，MULTIPLE_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：设备出库表格' NULL;
 
 ALTER TABLE t_d_form_widget_metadata CHANGE COLUMN code code VARCHAR(20)
-    COMMENT '编码，TEXT：文本，TEXTAREA：文本域，编码，TEXT：文本，TEXTAREA：文本域，SINGLE_SELECT：单选下拉框，MULTIPLE_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：设备出库表格，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;
+    COMMENT '编码，TEXT：文本，TEXTAREA：文本域，编码，TEXT：文本，TEXTAREA：文本域，SINGLE_SELECT：单选下拉框，MULTIPLE_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：设备出库表格，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;
+
+ALTER TABLE t_b_sop_info DROP COLUMN college_name;
+ALTER TABLE t_b_sop_info DROP COLUMN region_user_id;
+ALTER TABLE t_b_sop_info DROP COLUMN cloud_mark_user_id;
+
+CREATE TABLE t_b_sop_info_detail
+(
+    id BIGINT
+        COMMENT '主键' NOT NULL,
+    sop_info_id BIGINT
+        COMMENT 'sop信息id' NOT NULL,
+    region_user_id BIGINT
+        COMMENT '区域负责人id' NOT NULL,
+    engineer_user_id BIGINT
+        COMMENT '实施工程师id' NOT NULL,
+    assistant_engineer_user_ids VARCHAR(500)
+        COMMENT '助理实施工程师id数组' NULL,
+    PRIMARY KEY (id);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='sop明细表';

sop-business/src/main/resources/mapper/TBSopInfoDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TBSopInfoDetailMapper">
+
+</mapper>