Merge remote-tracking branch 'origin/master'

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

@@ -303,15 +303,18 @@ public class OperationTicketServiceImpl implements OperationTicketService {
         String taskId = response.getTaskId();
         log.info("StringUtils.isBlank(taskId) = " + StringUtils.isBlank(taskId));
         if (StringUtils.isBlank(taskId)) {
-            if (newStandardTicketInfoEntity.equals(TicketConstants.OPERATION_TICKET_APPROVED)) {
+            // verifyResult=="rejected"
+            JSONObject variable = JSONObject.parseObject(JSON.toJSONString(response.getVariables()));
+            if("rejected".equals(variable.getString("verifyResult"))) {
+                newStandardTicketInfoEntity.setFlowDescription("作废");
+                newStandardTicketInfoEntity.setFlowTaskName("作废");
+            }
+            else {
                 newStandardTicketInfoEntity.setFlowDescription("结束");
                 newStandardTicketInfoEntity.setFlowTaskId(" ");
                 newStandardTicketInfoEntity.setFlowTaskName("结束");
                 newStandardTicketInfoEntity.setNextStepOperator(" ");
                 newStandardTicketInfoEntity.setFlowStatus(999);
-            } else {
-                newStandardTicketInfoEntity.setFlowDescription("作废");
-                newStandardTicketInfoEntity.setFlowTaskName("作废");
             }
         } else {
             //如果response.getHandleType() 是0使用户