查看明细审批时，如果某些字符串为空，那么将会赋为空字符串

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,10 +8,10 @@ spring:
       master:
         #url: jdbc:mysql://124.70.179.5:3306/LinuxServer?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://124.70.179.5:3306/linshi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        #url: jdbc:mysql://124.70.179.5:3306/JinGang?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://124.70.179.5:3306/JinGang?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://119.3.74.195:3306/LianHuaShengYun?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://119.3.74.195:3306/jhy?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        url: jdbc:mysql://119.3.74.195:3306/had?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        #url: jdbc:mysql://119.3.74.195:3306/had?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://124.70.179.5:3306/sengneng?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: root
         password: daasan7ujm^YHN

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java

@@ -6,6 +6,7 @@ import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
 import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 import com.ruoyi.orderPlan.domain.VehicleLedgerExcel;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import static java.util.stream.Collectors.toList;
@@ -288,6 +289,26 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Override
     public AjaxResult projectEndQueryPendingVal(AuditItems auditItems) {
         List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
+        //判断特定字段是否为空，为空设置为空字符串，或设置为当前时间
+        for (int i = 0; i < mapList.size(); i++) {
+            Map<String, Object> objectMap = mapList.get(i);
+            if (objectMap.get("auditItem")==null){
+                objectMap.put("auditItem","");
+            }
+            if (objectMap.get("auditMsg")==null){
+                objectMap.put("auditMsg","");
+            }
+            if (objectMap.get("billTime")==null){
+                LocalDateTime now = LocalDateTime.now();
+                String time = now.toString();
+                objectMap.put("billTime",time);
+            }
+            if (objectMap.get("auditOpTime")==null){
+                LocalDateTime now = LocalDateTime.now();
+                String time = now.toString();
+                objectMap.put("auditItem",time);
+            }
+        }
         return AjaxResult.success(mapList);
     }