开始时间截止时间

center-order/app/base/service/impl/qcutils/regCenterOrderSve.js

@@ -1359,7 +1359,7 @@ class RegCenterOrderService {
         }
       }
       if (ab.productType && ab.productType == "YHKH" || ab.productType == "SWBD") {//银行开户、税务报道:有已接单,已完成状态
-        if (ab.ApplicationStatus == 705) {//服务中
+        if (ab.ApplicationStatus == 705) {//已完成
           if (deliveryContent[ab.productType] && deliveryContent[ab.productType].channelStatus && deliveryContent[ab.productType].channelStatus == "SUCCESS") {
             return system.getResultFail(-707, "该方案已完成，不可更改");
           }
@@ -1367,8 +1367,13 @@ class RegCenterOrderService {
       }
       if (ab.productType && ab.productType == "DLJZ") {//代理记账:有已接单,服务中,已完成状态
         if (ab.ApplicationStatus == 706) {//服务中
+          if (deliveryContent[ab.productType] && deliveryContent[ab.productType].channelStatus && deliveryContent[ab.productType].channelStatus == "ACTIVE") {
+            return system.getResultFail(-707, "该交付单已在服务中，不能重复提交");
+          }
+        }
+        if (ab.ApplicationStatus == 705) {//已完成
           if (deliveryContent[ab.productType] && deliveryContent[ab.productType].channelStatus && deliveryContent[ab.productType].channelStatus == "SUCCESS") {
-            return system.getResultFail(-707, "该方案已完成，不可更改");
+            return system.getResultFail(-707, "该交付单已在服务中，不能重复提交");
           }
         }
       }
@@ -1418,7 +1423,6 @@ class RegCenterOrderService {
         if (ab.consultType == "QYJYTC2") {
           bizTypeName = "企业经营套餐二"
         }
-
         switch (productType) {
           case "GSZZ":
             deliveryContent['GSZZ'] = {
@@ -1472,8 +1476,8 @@ class RegCenterOrderService {
               bizTypeName: bizTypeName,
               productType: productType,
               productTypeName: "代理记账",
-              startTime: (new Date(ab.startTime * 1000)).Format("yyyy-MM-dd hh:mm:ss"),
-              endTime: (new Date(ab.endTime * 1000)).Format("yyyy-MM-dd hh:mm:ss"),
+              startTime: ab.startTime || "",
+              endTime:  ab.endTime || "",
               status: ab.ApplicationStatus,
               statusName: this.regDeliveryStatusName[ab.ApplicationStatus],
               channelStatus: this.regDeliveryStatus[ab.ApplicationStatus],
@@ -1489,8 +1493,8 @@ class RegCenterOrderService {
               bizTypeName: bizTypeName,
               productType: productType,
               productTypeName: "地址服务",
-              startTime: (new Date(ab.startTime * 1000)).Format("yyyy-MM-dd hh:mm:ss"),
-              endTime: (new Date(ab.endTime * 1000)).Format("yyyy-MM-dd hh:mm:ss"),
+              startTime: ab.startTime || "",
+              endTime:  ab.endTime || "",
               status: ab.ApplicationStatus,
               statusName: this.regDeliveryStatusName[ab.ApplicationStatus],
               channelStatus: this.regDeliveryStatus[ab.ApplicationStatus],