fix:改字段

ruoyi-common/src/main/java/com/ruoyi/common/config/bpm/BpmProperties.java

@@ -112,4 +112,8 @@ public class BpmProperties {
     public void setGetNodeScriptsIp(String getNodeScriptsIp) {
         this.getNodeScriptsIp = getNodeScriptsIp;
     }
-}
+
+
+
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,7 +5,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -88,7 +87,7 @@ public class BaseEntity implements Serializable {
     }
 
     public String getCreateBy() {
-        return createBy == null ? SecurityUtils.getUsername() : createBy;
+        return createBy == null||createBy=="" ? SecurityUtils.getUsername() : createBy;
     }
 
     public void setCreateBy(String createBy) {
@@ -112,7 +111,7 @@ public class BaseEntity implements Serializable {
     }
 
     public String getUpdateBy() {
-        return updateBy == null ? SecurityUtils.getUsername() : updateBy;
+        return updateBy == null||createBy=="" ? SecurityUtils.getUsername() : updateBy;
     }
 
     public void setUpdateBy(String updateBy) {

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmRunController.java

@@ -56,3 +56,43 @@ public class BpmRunController {
     }
 
 }
+/**
+ * 15:39:45.028 [http-nio-8055-exec-3] WARN  o.s.w.s.m.m.a.ExceptionHandlerExceptionResolver - [logException,208] -
+ * Resolved [org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException:
+ * <EOL>### Error updating database.
+ * Cause: java.lang.NullPointerException<EOL>
+ * ### The error may exist in file [/Users/zrwj/Desktop/ZKQY_LJJ/Intelligent_manufacturing/drag_process/ruoyi-process-execution/target/classes/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml]
+ * <EOL>### The error may involve com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteProcessMapper.insertBpmExecuteProcess<EOL>
+ * ### The error occurred while executing an update<EOL>### Cause: java.lang.NullPointerException]
+ * <p>
+ * <p>
+ * <p>
+ * <p>
+ * insert into `tenant1116`.bpm_execute_node
+ * (
+ * task_process_key
+ * task_node_key
+ * task_node_name
+ * task_node_form_key
+ * task_node_type
+ * task_node_before
+ * task_node_after
+ * task_node_role_permission
+ * task_remark
+ * task_node_number
+ * task_node_weight
+ * task_node_state
+ * task_priority
+ * task1
+ * task2
+ * task3
+ * task4
+ * task5
+ * del_flag
+ * create_by_id
+ * create_by
+ * create_time )values
+ * (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) 22
+ * (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ * (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ */

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNode.java

@@ -103,6 +103,12 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
     @Excel(name = "节点状态(0:未执行 1：已执行)")
     private String taskNodeState;
 
+    /**
+     * 节点其他状态记录（1，2，3具体对应字典，当前节点工序状态）
+     */
+    @Excel(name = "节点状态(0:未执行 1：已执行)")
+    private String taskNodeOtherState;
+
     /**
      * 流程发起的时添设置该任务的优先级
      */
@@ -265,6 +271,10 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
         return taskNodeState;
     }
 
+    public String getTaskNodeOtherState() {return taskNodeOtherState;}
+
+    public void setTaskNodeOtherState(String taskNodeOtherState) {this.taskNodeOtherState = taskNodeOtherState;}
+
     public void setTaskPriority(String taskPriority) {
         this.taskPriority = taskPriority;
     }
@@ -340,6 +350,7 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
                 .append("taskNodeNumber", getTaskNodeNumber())
                 .append("taskNodeWeight", getTaskNodeWeight())
                 .append("taskNodeState", getTaskNodeState())
+                .append("taskNodeOtherState",getTaskNodeOtherState())
                 .append("taskPriority", getTaskPriority())
                 .append("task1", getTask1())
                 .append("task2", getTask2())

ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMapper.xml

@@ -20,6 +20,7 @@
         <result property="taskNodeNumber" column="task_node_number"/>
         <result property="taskNodeWeight" column="task_node_weight"/>
         <result property="taskNodeState" column="task_node_state"/>
+        <result property="taskNodeOtherState" column="task_node_other_state"/>
         <result property="taskPriority" column="task_priority"/>
         <result property="task1" column="task1"/>
         <result property="task2" column="task2"/>
@@ -48,6 +49,7 @@
                task_node_number,
                task_node_weight,
                task_node_state,
+               task_node_other_state,
                task_priority,
                task1,
                task2,

ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -135,11 +135,11 @@
     <select id="queryExecuteProcess" resultMap="retMap">
         select
         bep.id as bep_id,
-        bep.task_key as bep_task_key,
+        bep.task_key as bpm_execute_process_task_key,
         plan.${planName} as bep_task_name,
-        bep.task_plan_key as bep_task_plan_key,
+        bep.task_plan_key as bpm_execute_process_task_plan_key,
         bep.task_node_key as bep_task_node_key,
-        bep.task_node_next_key as bep_task_node_next_key,
+        bep.task_node_next_key as bpm_execute_process_task_node_next_key,
         bep.task_process_type as bep_task_process_type,
         bep.task_process_key as bep_task_process_key,
         bep.task_process_xml_content as bep_task_process_xml_content,

ruoyi-system/src/main/resources/mapper/bpm/BpmProcessConfigurationMapper.xml

@@ -119,7 +119,6 @@
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
-
     </update>
 
     <delete id="deleteBpmProcessConfigurationById" parameterType="Long">