From b6b5fea50e8f8773c0f266241fcd6b77d37e01fe Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Thu, 03 Jun 2021 15:04:51 +0800
Subject: [PATCH] 业绩规则1

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 57c2716..e57a138 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -879,6 +879,8 @@
         if (skipServiceOrderStep(Dictionary.SERVICE_OVER_BEGIN_END)) {
             projServices.setStartTime(new Date());
             projServices.setState(Dictionary.SERVICE_STATU_FWWC);
+        } else {
+            projServices.setState(Dictionary.SERVICE_STATU_PLWC);
         }
         // 释放床位资源
 //        SysBedState checkBedState = sysBedStateDao.selectBySerIdAndBedId(projServices.getBedId(), projServices.getId());
@@ -1021,7 +1023,8 @@
     /**
      * 跳过服务单某步骤
      */
-    private boolean skipServiceOrderStep(String step) {
+    @Override
+    public boolean skipServiceOrderStep(String step) {
         SysUsers users = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
         ParameterSettings ps = new ParameterSettings();
         ps.setCompanyId(users.getCompanyId());

--
Gitblit v1.9.1