修改工时

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtOrderHourServiceImpl.java

@@ -957,8 +957,12 @@ public class GxtOrderHourServiceImpl implements IGxtOrderHourService {
                     if (suspendTime.before(realStartTime)) {
                         beforeStartSuspensionTime += suspensionDuration;
                     } else {
-                        // 否则是开工后挂起
-                        afterStartSuspensionTime += suspensionDuration;
+                        if("auto_suspend".equals(flow.getActionType())){
+                            beforeStartSuspensionTime += suspensionDuration;
+                        }else{
+                            // 否则是开工后挂起
+                            afterStartSuspensionTime += suspensionDuration;
+                        }
                     }
                 } else {
                     // 如果没有开工时间，默认全部算作开工前挂起
@@ -1007,8 +1011,12 @@ public class GxtOrderHourServiceImpl implements IGxtOrderHourService {
                     if (suspendTime.before(realStartTime)) {
                         beforeStartSuspensionTime += suspensionDuration;
                     } else {
-                        // 否则是开工后挂起
-                        afterStartSuspensionTime += suspensionDuration;
+                        if("auto_suspend".equals(flow.getActionType())){
+                            beforeStartSuspensionTime += suspensionDuration;
+                        }else{
+                            // 否则是开工后挂起
+                            afterStartSuspensionTime += suspensionDuration;
+                        }
                     }
                 } else {
                     // 如果没有开工时间，默认全部算作开工前挂起