1107需要变更

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseAnswerSignController.java

@@ -201,7 +201,10 @@ public class PurchaseAnswerSignController {
         Purchase purchase = new Purchase();
         purchase.setId(model.getPurchaseId());
         purchase = jdbcClient.getJdbcModelById(purchase, connection);
-        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_ANSWER_SIGN.getValue().equals(purchase.getStep())) {
+        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_ANSWER_SIGN.getValue().equals(purchase.getStep())
+                &&
+                (ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue().equals(purchase.getStatus())
+                        || ChengfaEnum.PURCHASE_STATUS_DONE.getValue().equals(purchase.getStatus()))) {
             throw new BizException("此采购申请已经发起答疑会签审批，请勿操作");
         }
 

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidNoticeController.java

@@ -188,7 +188,10 @@ public class PurchaseBidNoticeController {
         Purchase purchase = new Purchase();
         purchase.setId(model.getPurchaseId());
         purchase = jdbcClient.getJdbcModelById(purchase, connection);
-        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_NOTICE.getValue().equals(purchase.getStep())) {
+        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_NOTICE.getValue().equals(purchase.getStep())
+                &&
+                (ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue().equals(purchase.getStatus())
+                        || ChengfaEnum.PURCHASE_STATUS_DONE.getValue().equals(purchase.getStatus()))) {
             throw new BizException("此采购申请已经发起招标结果通知审批，请勿操作");
         }
 

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidSignController.java

@@ -200,7 +200,10 @@ public class PurchaseBidSignController {
         Purchase purchase = new Purchase();
         purchase.setId(model.getPurchaseId());
         purchase = jdbcClient.getJdbcModelById(purchase, connection);
-        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_SIGN.getValue().equals(purchase.getStep())) {
+        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_SIGN.getValue().equals(purchase.getStep())
+                &&
+                (ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue().equals(purchase.getStatus())
+                        || ChengfaEnum.PURCHASE_STATUS_DONE.getValue().equals(purchase.getStatus()))) {
             throw new BizException("此采购申请已经发起招标会签审批，请勿操作");
         }
 

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseMatterController.java

@@ -184,7 +184,10 @@ public class PurchaseMatterController {
         Purchase purchase = new Purchase();
         purchase.setId(model.getPurchaseId());
         purchase = jdbcClient.getJdbcModelById(purchase, connection);
-        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_MATTER.getValue().equals(purchase.getStep())) {
+        if (ChengfaEnum.PURCHASE_STEP_PURCHASE_MATTER.getValue().equals(purchase.getStep())
+                &&
+                (ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue().equals(purchase.getStatus())
+                        || ChengfaEnum.PURCHASE_STATUS_DONE.getValue().equals(purchase.getStatus()))) {
             throw new BizException("此事项已经发起事项审批，请勿操作");
         }