1. 合并 达梦数据库兼容改动
This commit is contained in:
@@ -36,9 +36,20 @@
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-capital-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
<version>${business.capital.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-product-api</artifactId>
|
||||
<version>${business.product.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- qms模块api-->
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-qms-api</artifactId>
|
||||
<version>${business.qms.version}</version>
|
||||
</dependency>
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.task.vo.instance;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 流程抄送 VO
|
||||
*
|
||||
* @author kr
|
||||
* @since 2025-12-31
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class BpmProcessInstanceCopyVO extends BaseDO {
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 发起人 Id
|
||||
*/
|
||||
@Schema(description ="发起人 Id")
|
||||
private Long startUserId;
|
||||
|
||||
/**
|
||||
* 发起人 姓名
|
||||
*/
|
||||
@Schema(description ="发起人 姓名")
|
||||
private String startUserName;
|
||||
/**
|
||||
* 流程名
|
||||
*/
|
||||
@Schema(description ="流程名")
|
||||
private String processInstanceName;
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@Schema(description ="流程实例的编号")
|
||||
private String processInstanceId;
|
||||
/**
|
||||
* 流程实例的流程定义编号
|
||||
*/
|
||||
@Schema(description ="流程实例的流程定义编号")
|
||||
private String processDefinitionId;
|
||||
/**
|
||||
* 流程分类
|
||||
*/
|
||||
@Schema(description ="流程分类")
|
||||
private String category;
|
||||
/**
|
||||
* 流程活动的编号
|
||||
*/
|
||||
@Schema(description ="流程活动的编号")
|
||||
private String activityId;
|
||||
/**
|
||||
* 流程活动的名字
|
||||
*/
|
||||
@Schema(description ="流程活动的名字")
|
||||
private String activityName;
|
||||
/**
|
||||
* 流程活动的编号
|
||||
*/
|
||||
@Schema(description ="流程活动的编号")
|
||||
private String taskId;
|
||||
|
||||
/**
|
||||
* 用户编号(被抄送的用户编号)
|
||||
*/
|
||||
@Schema(description ="用户编号(被抄送的用户编号)")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户姓名(被抄送的用户姓名)
|
||||
*/
|
||||
@Schema(description ="用户姓名(被抄送的用户姓名)")
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 抄送意见
|
||||
*/
|
||||
@Schema(description ="抄送意见")
|
||||
private String reason;
|
||||
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
package com.zt.plat.module.bpm.framework.rpc.config;
|
||||
|
||||
import com.zt.plat.module.capital.api.AmountCreditApplyApi;
|
||||
import com.zt.plat.module.capital.api.splyAmountRequest.AmountRequestApi;
|
||||
import com.zt.plat.module.capital.api.splyAmtCrdtAppl.AmountCreditApplyApi;
|
||||
import com.zt.plat.module.product.api.MesProcessRoutApi;
|
||||
import com.zt.plat.module.product.api.plan.MesCompanyPlanApi;
|
||||
import com.zt.plat.module.product.api.plan.MesFactoryPlanApi;
|
||||
import com.zt.plat.module.qms.api.task.QmsApi;
|
||||
import com.zt.plat.module.system.api.dept.DeptApi;
|
||||
import com.zt.plat.module.system.api.dept.PostApi;
|
||||
import com.zt.plat.module.system.api.dict.DictDataApi;
|
||||
@@ -13,6 +18,6 @@ import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration(value = "bpmRpcConfiguration", proxyBeanMethods = false)
|
||||
@EnableFeignClients(clients = {RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class,
|
||||
PermissionApi.class, AmountCreditApplyApi.class})
|
||||
PermissionApi.class, AmountCreditApplyApi.class, MesProcessRoutApi.class, MesFactoryPlanApi.class, MesCompanyPlanApi.class, AmountRequestApi.class, QmsApi.class})
|
||||
public class RpcConfiguration {
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.zt.plat.module.bpm.service.supply.capital.listener;
|
||||
import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
|
||||
import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
|
||||
import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
|
||||
import com.zt.plat.module.capital.api.AmountCreditApplyApi;
|
||||
import com.zt.plat.module.capital.api.splyAmtCrdtAppl.AmountCreditApplyApi;
|
||||
import com.zt.plat.module.capital.enums.AmountCreditApplyApiStatusEnum;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package liquibase.datatype.core;
|
||||
|
||||
import liquibase.database.Database;
|
||||
import liquibase.database.core.DmDatabase;
|
||||
import liquibase.datatype.DataTypeInfo;
|
||||
import liquibase.datatype.DatabaseDataType;
|
||||
|
||||
@DataTypeInfo(
|
||||
name = "boolean",
|
||||
aliases = {"java.sql.Types.BOOLEAN", "java.lang.Boolean", "bit", "bool"},
|
||||
minParameters = 0,
|
||||
maxParameters = 0,
|
||||
priority = 2
|
||||
)
|
||||
public class DmBooleanType extends BooleanType {
|
||||
|
||||
@Override
|
||||
public boolean supports(Database database) {
|
||||
if (database instanceof DmDatabase) {
|
||||
return true;
|
||||
}
|
||||
return super.supports(database);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DatabaseDataType toDatabaseDataType(Database database) {
|
||||
if (database instanceof DmDatabase) {
|
||||
return new DatabaseDataType("NUMBER", 1);
|
||||
}
|
||||
return super.toDatabaseDataType(database);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1 @@
|
||||
liquibase.datatype.core.DmBooleanType
|
||||
@@ -0,0 +1,41 @@
|
||||
create table FLW_RU_BATCH (
|
||||
ID_ VARCHAR2(64) not null,
|
||||
REV_ INTEGER,
|
||||
TYPE_ VARCHAR2(64) not null,
|
||||
SEARCH_KEY_ VARCHAR2(255),
|
||||
SEARCH_KEY2_ VARCHAR2(255),
|
||||
CREATE_TIME_ TIMESTAMP(6) not null,
|
||||
COMPLETE_TIME_ TIMESTAMP(6),
|
||||
STATUS_ VARCHAR2(255),
|
||||
BATCH_DOC_ID_ VARCHAR2(64),
|
||||
TENANT_ID_ VARCHAR2(255) default '',
|
||||
primary key (ID_)
|
||||
);
|
||||
|
||||
create table FLW_RU_BATCH_PART (
|
||||
ID_ VARCHAR2(64) not null,
|
||||
REV_ INTEGER,
|
||||
BATCH_ID_ VARCHAR2(64),
|
||||
TYPE_ VARCHAR2(64) not null,
|
||||
SCOPE_ID_ VARCHAR2(64),
|
||||
SUB_SCOPE_ID_ VARCHAR2(64),
|
||||
SCOPE_TYPE_ VARCHAR2(64),
|
||||
SEARCH_KEY_ VARCHAR2(255),
|
||||
SEARCH_KEY2_ VARCHAR2(255),
|
||||
CREATE_TIME_ TIMESTAMP(6) not null,
|
||||
COMPLETE_TIME_ TIMESTAMP(6),
|
||||
STATUS_ VARCHAR2(255),
|
||||
RESULT_DOC_ID_ VARCHAR2(64),
|
||||
TENANT_ID_ VARCHAR2(255) default '',
|
||||
primary key (ID_)
|
||||
);
|
||||
|
||||
create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
|
||||
|
||||
alter table FLW_RU_BATCH_PART
|
||||
add constraint FLW_FK_BATCH_PART_PARENT
|
||||
foreign key (BATCH_ID_)
|
||||
references FLW_RU_BATCH (ID_);
|
||||
|
||||
insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.0.1.1', 1);
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
drop index FLW_IDX_BATCH_PART;
|
||||
|
||||
drop table FLW_RU_BATCH_PART;
|
||||
drop table FLW_RU_BATCH;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user