Browse Source

广药子流程update 优化

wangliang 3 năm trước cách đây
mục cha
commit
32a1b808f6

+ 2 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/DirectorApproveByJxzyyListener.java

@@ -69,10 +69,8 @@ public class DirectorApproveByJxzyyListener implements TaskListener {
         if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
                 && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-        }
-
-        // 驳回短信(驳回给主任)
-        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
+        }// 驳回短信(驳回给主任)
+        else if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
                 && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
         }

+ 2 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/DirectorApproveListener.java

@@ -96,10 +96,8 @@ public class DirectorApproveListener implements TaskListener {
         if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
                 && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-        }
-
-        // 驳回短信(驳回给主任)
-        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
+        }// 驳回短信(驳回给主任)
+        else if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
                 && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
         }