From 5f0956f6a5bf753d8e0c0e6a7c530c65af1edf82 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 20:16:57 +0800
Subject: [PATCH] 流程与程序关联表插入数据
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml | 11 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java | 2
doc/sql/mdm/mdm.mysql.all.create.sql | 12 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 12 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java | 12 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java | 10 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProcessProgRef.java | 23 +++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 11 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 9 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java | 97 ++++++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 9 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml | 6 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 8 --
14 files changed, 193 insertions(+), 33 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 582170f..9736baa 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -4,6 +4,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.TaskService;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -12,6 +13,7 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -30,7 +32,8 @@
private StartDispatcher dispatcher;
@Autowired
private TaskService taskService;
-
+ @Autowired
+ private ProcessProgRefService processProgRefService;
/**
* 鏂板
*/
@@ -43,7 +46,7 @@
@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
@PostMapping("completeTask")
- public R<Void> completeTask(String taskId, String processInstanceId, String comment, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+ public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(description = "瀵瑰簲鐨勭▼搴廼d,閫楀彿鍒嗛殧") String programIds, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
// 澧炲姞璇勮
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
@@ -52,6 +55,10 @@
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
+ if(StringUtils.isNotEmpty(programIds)) {
+ processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
+ }
+
//鍔犲叆瀹℃壒鐢ㄦ埛
variables.put("approveUserNickName",AuthUtil.getNickName());
if(variables.containsKey("assignee")){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 8074b5a..bd6f030 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -69,13 +69,13 @@
return R.data(list);
}
-
+ /*
@Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
@GetMapping("/programpickpage")
public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
IPage<NcNodeProgramVO> pages = ncNodeService.programPageQuery(query);
return R.data(pages);
}
-
+*/
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index c30b2db..04b25f5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.program.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -10,6 +11,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
import org.springframework.web.bind.annotation.*;
@@ -76,4 +78,11 @@
ncProgramService.upgradeProcessEdition(id,newProcessEdition);
return R.<Boolean>status(true);
}
+
+ @Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
+ @GetMapping("/programpickpage")
+ public R<IPage<NcProgramVO>> page(NcNodeProgramQueryVO query) {
+ IPage<NcProgramVO> pages = ncProgramService.pageQuery(query);
+ return R.data(pages);
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProcessProgRef.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProcessProgRef.java
new file mode 100644
index 0000000..6423fd8
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProcessProgRef.java
@@ -0,0 +1,23 @@
+package org.springblade.mdm.program.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.core.mp.base.BizEntity;
+
+import java.time.LocalDateTime;
+
+@Setter
+@Getter
+@TableName("mdm_process_prog_ref")
+public class ProcessProgRef extends BizEntity {
+ /**
+ * 鏂囦欢鍚�
+ */
+ private String processInstanceId;
+ /**
+ * 瀵硅薄瀛樺偍涓殑鍚嶇О
+ */
+ private Long programId;
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
index 9e25e5d..59b9a2f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
@@ -14,7 +14,7 @@
public interface NcNodeMapper extends BladeMapper<NcNode> {
List<NcNodeVO> lazyList(Long parentId);
- IPage<NcNodeProgramVO> programPageQuery(@Param("page")IPage<NcNodeProgramVO> page, @Param("query") NcNodeProgramQueryVO query);
+
/**
* 鏍规嵁鍚嶇О鑾峰彇鏈�鏂扮殑绋嬪簭鍖呰妭鐐�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index c4e601c..67157f3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -45,14 +45,7 @@
parent_id = n.id and is_deleted = 0
) AS "has_children" from mdm_nc_node n where is_deleted=0 and parent_id=#{parentId}
</select>
- <select id="programPageQuery" resultType="org.springblade.mdm.program.vo.NcNodeProgramVO">
- select id,parent_id,machine_code,drawing_no,drawing_no_edition,part_no,process_name,craft_edition from mdm_nc_node n
- <where>
- <if test="query.name!=null and query.name!=''">
- and n.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
- </if>
- </where>
- </select>
+
<!--鑾峰彇 鏈�鏂扮増鏈殑绋嬪簭锛堝嵆绋嬪簭鍖呭悕 鑺傜偣 node_type=60锛�-->
<select id="getLastProgramNode" resultType="org.springblade.mdm.program.entity.NcNode">
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
index 0d5fdfb..0233b9f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
@@ -8,6 +8,9 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcNodeProgramVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
import java.util.List;
@@ -21,10 +24,5 @@
*/
List<NcProgram> getCuredNcProgram( @Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
- /**
- * 鏍规嵁绋嬪簭鍚嶇О锛岃幏鍙栨渶鏂扮殑绋嬪簭瀹炰綋
- * @param name 绋嬪簭鍚嶇О
- * @return nc绋嬪簭
- */
- //NcProgram getLastNcProgram(String name);
+ IPage<NcProgramVO> pageQuery(@Param("page")IPage<NcNodeProgramVO> page, @Param("query") NcNodeProgramQueryVO query);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
index 6c82270..59b51b3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
@@ -42,6 +42,17 @@
and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
order by create_time desc
</select>
+
+ <select id="pageQuery" resultType="org.springblade.mdm.program.vo.NcProgramVO">
+ select id,nc_node_id,machine_code,part_no,part_no_edition,process_name,craft_edition from mdm_nc_program p
+ where is_deleted=0 and is_last_edition=1 and (category='program' or category='subprogram')
+ <where>
+
+ <if test="query.name!=null and query.name!=''">
+ and p.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
+ </if>
+ </where>
+ </select>
<!--
<select id="getLastNcProgram" resultType="org.springblade.mdm.program.entity.NcProgram">
select <include refid="all_columns"/> from mdm_nc_program
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
new file mode 100644
index 0000000..e02855e
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
@@ -0,0 +1,12 @@
+package org.springblade.mdm.program.mapper;
+
+import org.springblade.core.mp.mapper.BladeMapper;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.vo.NcNodeVO;
+
+import java.util.List;
+
+public interface ProcessProgRefMapper extends BladeMapper<ProcessProgRef> {
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
new file mode 100644
index 0000000..5f796a3
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
@@ -0,0 +1,6 @@
+<?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="org.springblade.mdm.program.mapper.ProcessProgRefMapper">
+
+
+</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index 4bf0921..7dbff0f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -82,14 +82,6 @@
return baseMapper.lazyList(parentId);
}
- /**
- * 绋嬪簭鑺傜偣
- * @param query
- * @return
- */
- public IPage<NcNodeProgramVO> programPageQuery(NcNodeProgramQueryVO query) {
- return this.getBaseMapper().programPageQuery(Condition.getPage(query),query);
- }
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 0429718..8250bc0 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -25,6 +25,7 @@
*/
package org.springblade.mdm.program.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
@@ -32,6 +33,7 @@
import org.apache.commons.io.IOUtils;
import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.basesetting.machine.MachineService;
@@ -42,6 +44,7 @@
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
import org.springblade.mdm.utils.FileContentUtil;
@@ -183,4 +186,13 @@
this.save(newVerProg);
}
+
+ /**
+ * 鍒嗛〉鏌ヨ锛岀敤浜庡鎵规椂閫夋嫨绋嬪簭
+ * @param query
+ * @return
+ */
+ public IPage<NcProgramVO> pageQuery(NcNodeProgramQueryVO query) {
+ return this.getBaseMapper().pageQuery(Condition.getPage(query),query);
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
new file mode 100644
index 0000000..8b29d29
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
@@ -0,0 +1,97 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.mdm.program.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.entity.ProgramSeq;
+import org.springblade.mdm.program.mapper.NcProgramMapper;
+import org.springblade.mdm.program.mapper.ProcessProgRefMapper;
+import org.springblade.mdm.program.mapper.ProgramSeqMapper;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcProgramUploadVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
+import org.springblade.mdm.utils.FileContentUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 宸ヤ綔娴佹湇鍔″疄鐜扮被
+ *
+ * @author Chill
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {
+
+ /**
+ * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param programIds 绋嬪簭id
+ * @return
+ */
+ @Transactional
+ public void addRelations(String processInstanceId, List<Long> programIds) {
+ if(programIds == null || programIds.isEmpty()) {
+ return;
+ }
+
+ this.lambdaUpdate().eq(ProcessProgRef::getProcessInstanceId, processInstanceId).remove();
+ List<ProcessProgRef> entities = new ArrayList<>();
+ for (Long programId : programIds) {
+ ProcessProgRef entity = new ProcessProgRef();
+ entity.setProcessInstanceId(processInstanceId);
+ entity.setProgramId(programId);
+
+ entities.add(entity);
+ }
+ this.saveBatch(entities);
+ }
+
+
+}
diff --git a/doc/sql/mdm/mdm.mysql.all.create.sql b/doc/sql/mdm/mdm.mysql.all.create.sql
index a5f3600..e8f4a07 100644
--- a/doc/sql/mdm/mdm.mysql.all.create.sql
+++ b/doc/sql/mdm/mdm.mysql.all.create.sql
@@ -87,12 +87,12 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='绋嬪簭鑺傜偣鐩綍';
/**娴佺▼瀹炰緥涓庤妭鐐瑰叧鑱旇〃锛岃褰曞垱寤烘椂鏈猴細鐢ㄦ埛鍦ㄧ▼搴忕紪鍒惰妭鐐规墜鍔ㄥ叧鑱�*/
-DROP TABLE IF EXISTS `mdm_process_node_ref`;
-CREATE TABLE `mdm_process_node_ref` (
+DROP TABLE IF EXISTS `mdm_process_prog_ref`;
+CREATE TABLE `mdm_process_prog_ref` (
`id` bigint NOT NULL,
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
- `nc_node_id` bigint DEFAULT NULL COMMENT '鑺傜偣id锛屽搴� 绋嬪簭鍖呭悕 鑺傜偣id',
- `process_instance_id` varchar(100) NOT NULL COMMENT '娴佺▼瀹炰緥id',
+ `process_instance_id` varchar(64) NOT NULL COMMENT '娴佺▼瀹炰緥id',
+ `nc_program_id` bigint DEFAULT NULL COMMENT '鏁版帶绋嬪簭id',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
@@ -101,14 +101,14 @@
`update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
`update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='娴佺▼瀹炰緥涓庤妭鐐瑰叧鑱旇〃';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='娴佺▼瀹炰緥涓庣▼搴忓叧鑱旇〃';
DROP TABLE IF EXISTS `mdm_nc_program`;
CREATE TABLE `mdm_nc_program` (
`id` bigint NOT NULL,
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
`nc_node_id` bigint DEFAULT NULL COMMENT '鎵�灞炶妭鐐筰d锛屽簲璇ュ睘浜庢煇涓暟鎺х▼搴忚妭鐐�',
- `code` varchar(100) NOT NULL COMMENT '绋嬪簭缂栧彿',
+ `code` varchar(100) NULL COMMENT '绋嬪簭缂栧彿',
`name` varchar(100) NOT NULL COMMENT '绋嬪簭鍚嶇О',
`oss_name` varchar(100) NULL COMMENT 'oss涓殑鏂囦欢鍚�',
`category` varchar(2) NULL COMMENT '鏂囦欢鍒嗙被',
--
Gitblit v1.9.3