diff --git a/pom.xml b/pom.xml
index e4acf9535..41b18af82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -995,7 +995,7 @@
                     <libjars>wflow-server-1.0-SNAPSHOT.jar</libjars>
                     <code>
                         <!--鞍钢-->
-                        E41FF860D014DCAA9F4FB3020D4C9050D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
+                        A31D41A090AA235D29A0DB728D50AEDFD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
                         <!--中科安信-->
                         <!--A6F449ECD7E1024F703F37F2294AC8F2D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E-->
                     </code>
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
index c620bd17c..f66aff899 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
@@ -147,7 +147,11 @@ public class CarInfoController {
             carInfo.setCarModuleType(carModuleType);
             Integer entryAndExitPermit = "单次".equals(MapUtils.getString(map, "entryAndExitPermit")) ? 0 : 1;
             carInfo.setReserveStartTime(DateUtil.parse(map.get("reserveStartTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
-            carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            try {
+                carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            } catch (Exception e) {
+                carInfo.setReserveEndTime(DateUtil.offsetDay(carInfo.getReserveStartTime(), 3));
+            }
             carInfo.setEntryAndExitPermit(entryAndExitPermit);
             carInfo.setCarNumber(String.valueOf(map.get("carNumber")));
             Object carColor = map.get("carColor");
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java
index e27b3fe77..1ed76fc4e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java
@@ -15,9 +15,11 @@ import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService;
 import com.zhgd.xmgl.modules.project.service.IProjectService;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
+import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
 import com.zhgd.xmgl.modules.worker.entity.UserEnterprise;
 import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
 import com.zhgd.xmgl.modules.worker.mapper.UserEnterpriseMapper;
+import com.zhgd.xmgl.modules.worker.service.IProjectEnterpriseSupplierInfoService;
 import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
@@ -25,6 +27,7 @@ import com.zhgd.xmgl.util.MessageUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,6 +52,9 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
     private EnterpriseInfoMapper enterpriseInfoMapper;
     @Autowired
     private IProjectService projectService;
+    @Lazy
+    @Autowired
+    private IProjectEnterpriseSupplierInfoService projectEnterpriseSupplierInfoService;
 
     @Override
     public IPage<EnterpriseInfo> selectProjectEnterprisePage(Map<String, Object> map) {
@@ -70,6 +76,15 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
             map.put("enterpriseIds", enterpriseIds);
         }
         List<EnterpriseInfo> list = projectEnterpriseMapper.selectProjectEnterprisePage(page, map);
+        if (CollUtil.isNotEmpty(list)) {
+            List<ProjectEnterpriseSupplierInfo> supplierInfos = projectEnterpriseSupplierInfoService.list(new LambdaQueryWrapper<ProjectEnterpriseSupplierInfo>()
+                    .eq(ProjectEnterpriseSupplierInfo::getProjectSn, projectSn)
+                    .in(ProjectEnterpriseSupplierInfo::getEnterpriseId, list.stream().map(EnterpriseInfo::getId).collect(Collectors.toList()))
+            );
+            for (EnterpriseInfo info : list) {
+                info.setSupplierInfos(supplierInfos.stream().filter(o -> Objects.equals(info.getId(), o.getEnterpriseId())).collect(Collectors.toList()));
+            }
+        }
         return page.setRecords(list);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java
index 59c1a38e0..1321db169 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java
@@ -245,5 +245,7 @@ public class EnterpriseInfo implements Serializable {
 	private String ancestors;
 	@TableField(exist = false)
 	private java.lang.Long parentProjectEnterpriseId;
+	@TableField(exist = false)
+	private List<ProjectEnterpriseSupplierInfo> supplierInfos;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
index abe1b8320..c10376957 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
@@ -191,7 +191,11 @@ public class XzMaterialController {
                 xzMaterial.setNum(index);
             }
             xzMaterial.setEntryBeginTime(DateUtil.parse(obj.getString("startTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
-            xzMaterial.setEntryEndTime(DateUtil.parse(obj.getString("endTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            try {
+                xzMaterial.setEntryEndTime(DateUtil.parse(obj.getString("endTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            } catch (Exception e) {
+                xzMaterial.setEntryEndTime(DateUtil.offsetDay(xzMaterial.getEntryBeginTime(), 3));
+            }
             xzMaterial.setCarNumber(obj.getString("carNumber"));
             JSONArray detail = obj.getJSONArray("detail");
             if (detail != null) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
index 063d4eb71..5a2047f8d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
@@ -13,11 +13,12 @@
     <select id="countEnterpriseCbs" resultType="com.zhgd.xmgl.modules.xz.entity.vo.CountEnterpriseVo">
         select
         ei.enterprise_name,
-        pe.cbs_name,
+        si.cbs_name,
         x.change_after
         from enterprise_info ei
         join xz_task_progress_total x on x.enterprise_id = ei.id
         join project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn = x.project_sn
+        join project_enterprise_supplier_info si on si.enterprise_id=ei.id and si.project_sn = x.project_sn
         where x.project_sn = #{param.projectSn} and x.is_current=1 and x.type=2 and x.change_after != 0
         <if test="param.isCountMainEnterprise == '1'.toString() ">
             and pe.parent_project_enterprise_id = 0
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 68d12b97a..11576a45b 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -113,13 +113,36 @@
         </rollingPolicy>
     </appender>
 
+    <appender name="flow-all" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/zhgd-flow-all.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %highlight(%-5level) %method:%L
+                %cyan(%logger{50}) - %highlight(%msg) %n
+            </pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/all/flow-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>200MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>8</maxHistory>
+        </rollingPolicy>
+    </appender>
 
     <!-- 日志输出级别 -->
     <logger name="com.zhgd" level="info"/>
-    <logger name="com.zhgd.mybatis.DataScopeInterceptor" level="debug"/>
     <logger name="java.sql.Connection" level="info"/>
     <logger name="java.sql.Statement" level="info"/>
     <logger name="java.sql.PreparedStatement" level="info"/>
+    <logger name="com.wflow" level="info" additivity="true">
+        <appender-ref ref="flow-all"/>
+    </logger>
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>