修正：工作流补偿bug修改

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/vo/TicketInfoStatisticVO.java

@@ -26,6 +26,10 @@ public class TicketInfoStatisticVO implements Serializable {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double ticketInfoProportion;
 
+	@ApiModelProperty("本月票据合格率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private String  ticketInfoProportionName;
+
 	@ApiModelProperty("票据种类")
 	private String ticketInfoType;
 

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java

@@ -137,7 +137,7 @@ public class AlarmHandleServiceImpl extends ServiceImpl<AlarmHandleMapper, Alarm
 //				throw new ServiceException("修改告警状态异常，请稍后重试！");
 				}
 			}
-			return JSONObject.toJSONString(alarmHandleEntity);
+			return JSONObject.toJSONString(param);
 		});
 	        return res;
 	}

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

@@ -265,8 +265,14 @@ public class OperationTicketServiceImpl implements OperationTicketService , Star
         }
 
         //1.查询操作票信息
-        Long id = NumberUtils.toLong(response.getBusinessKey());
+//        Long id = NumberUtils.toLong(response.getBusinessKey());
-        StandardTicketInfoEntity standardTicketInfoEntity = standardTicketInfoService.getById(id);
+        String businessKey = response.getBusinessKey();
+        String[] split =businessKey.split(":");
+        if (StringUtils.isBlank(split[1])){
+            log.error("异常消息转换失败,未找到BusinessKey："+ businessKey);
+            return;
+        }
+        StandardTicketInfoEntity standardTicketInfoEntity = standardTicketInfoService.getById(split[1]);
         if (ObjectUtils.isEmpty(standardTicketInfoEntity)) {
             log.error("获取操作票不存在");
             return;
@@ -276,7 +282,7 @@ public class OperationTicketServiceImpl implements OperationTicketService , Star
         StandardTicketInfoEntity newStandardTicketInfoEntity = new StandardTicketInfoEntity();
         // BeanUtils.copyProperties(standardTicketInfoVo, newStandardTicketInfoEntity);
         BeanUtil.copy(standardTicketInfoVo, newStandardTicketInfoEntity);
-        newStandardTicketInfoEntity.setId(id);
+        newStandardTicketInfoEntity.setId(Long.valueOf(split[1]));
         newStandardTicketInfoEntity.setCreateUser(standardTicketInfoEntity.getCreateUser());
         //填充操作票信息
         saveStandardTicketInfoEntity(newStandardTicketInfoEntity, response);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -367,7 +367,12 @@ public class TicketProcessServiceImpl implements TicketProcessService, StartProc
             workTicket.setIsNormal(true);
             //2.流程处理
             String businessKey = response.getBusinessKey();
-            WorkTicketInfoEntity workTicketInfo = ticketInfoService.getById(businessKey);
+            String[] split =businessKey.split(":");
+            if (StringUtils.isBlank(split[1])){
+                log.error("异常消息转换失败,未找到BusinessKey："+ businessKey);
+                return;
+            }
+            WorkTicketInfoEntity workTicketInfo = ticketInfoService.getById(split[1]);
             if (ObjectUtils.isEmpty(workTicketInfo)) {
                 log.error("获取工作票的数据为不存在");
                 return;