1.

assistMg/src/main/java/com/hotent/util/CostDataUtil.java

@@ -1,5 +1,7 @@
 package com.hotent.util;
 
+import com.hotent.base.util.StringUtil;
+
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
@@ -367,6 +369,9 @@ public class CostDataUtil {
 
 
     public static String convertToChineseDate(String dateStr) {
+        if(StringUtil.isEmpty(dateStr)){
+            return dateStr;
+        }
         // 定义多种可能的日期格式
         List<String> patterns = Arrays.asList(
                 "yyyy-MM-dd",

assistMg/src/main/resources/mapper/CostProjectProccessNodeMapper.xml

@@ -19,11 +19,16 @@
         <result column="create_by" property="createBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_by" property="updateBy"/>
+
+        <result column="act_start_time" property="actStartTime"/>
+        <result column="act_end_time" property="actEndTime"/>
+        <result column="act_user_names" property="actUserNames"/>
+        <result column="act_remarks" property="actRemarks"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, process_id, process_node_value,user_id,main_user_id,process_node_key, node_type, order_num, start_time, end_time, status, create_time, create_by, update_time, update_by
+        id, process_id,act_start_time,act_end_time, act_user_names,act_remarks,process_node_value,user_id,main_user_id,process_node_key, node_type, order_num, start_time, end_time, status, create_time, create_by, update_time, update_by
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">