diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 0cc1194ce..49c5915fc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -20,6 +20,7 @@ import com.cool.store.service.DeskService;
 import com.cool.store.service.RegionService;
 import com.cool.store.service.SysRoleService;
 import com.cool.store.service.UserAuthMappingService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.poi.DateUtils;
 import com.cool.store.vo.BaseInfoVO;
@@ -37,6 +38,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
+import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START;
 import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS;
 
 /**
@@ -122,7 +124,7 @@ public class DeskServiceImpl implements DeskService {
             PayStagePendingVO payStagePendingVO = new PayStagePendingVO(baseInfoVO);
             LinePayDO linePayDO = payMap.get(x.getId());
             if (linePayDO != null && linePayDO.getPayTime() != null) {
-                payStagePendingVO.setPayTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime()));
+                payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime()));
             }
 
             list.add(payStagePendingVO);
@@ -149,7 +151,7 @@ public class DeskServiceImpl implements DeskService {
             SigningPendingVO signingPendingVO = new SigningPendingVO(baseInfoVO);
             Date date = dateMap.get(x.getId());
             if (date != null) {
-                signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
             }
             list.add(signingPendingVO);
         });
@@ -248,7 +250,7 @@ public class DeskServiceImpl implements DeskService {
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, LinePayDO> shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode());
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime()));
+            vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime()));
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -395,7 +397,9 @@ public class DeskServiceImpl implements DeskService {
         List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -412,32 +416,21 @@ public class DeskServiceImpl implements DeskService {
         }
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
-        List<DecorationDesignInfoDO> decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds);
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
         doThing(deskStageMap, subStageList);
-        for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) {
-            List<DeskStageDTO> deskStages = new ArrayList<>();
-            deskStages.addAll(deskStageMap.get(decorationDesignInfoDO.getShopId()));
-            if (CollectionUtils.isEmpty(deskStages)) {
-                DeskStageDTO dto = new DeskStageDTO();
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));
-                dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus());
-                deskStageMap.put(decorationDesignInfoDO.getShopId(), Collections.singletonList(dto));
-            } else {
-                DeskStageDTO dto = new DeskStageDTO();
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));
-                dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus());
-                deskStages.add(dto);
-                deskStageMap.put(decorationDesignInfoDO.getShopId(), deskStages);
-            }
+        //施工待提交阶段提交的表单用作施工中的提交时间
+        Map<Long, Date> constructionMap = new HashMap<>();
+        List<DecorationDesignInfoDO> byIds = decorationDesignInfoDAO.getByIds(shopIds);
+        if (byIds != null) {
+            constructionMap = byIds.stream().collect(Collectors.toMap(DecorationDesignInfoDO::getShopId, DecorationDesignInfoDO::getConstructionCreateTime));
         }
         for (PreparationCommonPendingVO vo : list) {
-            for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) {
-                if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) {
-                    vo.setSubmitTime(deskStageDTO.getActualCompleteTime());
-                    break;
-                }
+            if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) {
+                    vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()),SPECIAL_DATE_START));
             }
+
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -575,13 +568,13 @@ public class DeskServiceImpl implements DeskService {
             if (CollectionUtils.isEmpty(deskStageDTOS)) {
                 DeskStageDTO dto = new DeskStageDTO();
                 Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
                 dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
                 deskStageMap.put(shopStageInfoDO.getShopId(), Collections.singletonList(dto));
             } else {
                 DeskStageDTO dto = new DeskStageDTO();
                 Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
                 dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
                 deskStageDTOS.add(dto);
                 deskStageMap.put(shopStageInfoDO.getShopId(), deskStageDTOS);
@@ -631,7 +624,7 @@ public class DeskServiceImpl implements DeskService {
             preparationCommonPendingVO.setShopId(x.getShopId());
             preparationCommonPendingVO.setSubStage(x.getShopSubStage());
             preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus());
-            preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, x.getCreateTime()));
+            preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, x.getCreateTime()));
             preparationCommonPendingVO.setStoreName(shopInfoDO.getShopName());
             PlanLineDTO planLineDTO = lineMap.getOrDefault(shopInfoDO.getLineId(), new PlanLineDTO());
             preparationCommonPendingVO.setPartnerName(planLineDTO.getUsername());