Prechádzať zdrojové kódy

[bug-263] 平台流程跑数据审批节点结束后,不会生成快照与更改流程状态

szjbdgzl 2 rokov pred
rodič
commit
05855e0b9b

+ 1 - 1
ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/bpmn/provider/BpmInstProvider.java

@@ -766,7 +766,7 @@ public class BpmInstProvider extends GenericProvider implements IBpmInstService,
 			attributes.put("nodeId", BeanUtils.isNotEmpty(nodeDefs)?nodeDefs.get(0).getNodeId():"");
 			attributes.put("nodeId", BeanUtils.isNotEmpty(nodeDefs)?nodeDefs.get(0).getNodeId():"");
 			map.put("attributes", attributes);
 			map.put("attributes", attributes);
 		} catch(DataException de){
 		} catch(DataException de){
-			setExceptionResult(result, StateEnum.ERROR_BPMN_NO_INSTANCE.getCode(), I18nUtil.getMessage(StateEnum.ERROR_BPMN_NO_INSTANCE.getCode()+""), de);
+			setExceptionResult(result, StateEnum.ERROR_BPMN_NO_INSTANCE.getCode(), StateEnum.ERROR_BPMN_NO_INSTANCE.getText(), de);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_BPMN.getCode(), I18nUtil.getMessage(StateEnum.ERROR_BPMN.getCode()+""), e);
 			setExceptionResult(result, StateEnum.ERROR_BPMN.getCode(), I18nUtil.getMessage(StateEnum.ERROR_BPMN.getCode()+""), e);
 		}
 		}

+ 2 - 2
ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/mq/consumer/rabbit/RabbitSnapshotMessageQueueConsumer.java

@@ -60,7 +60,6 @@ public class RabbitSnapshotMessageQueueConsumer   {
     public void popup(Message<String> message) throws Exception {
     public void popup(Message<String> message) throws Exception {
         String instId = message.getVariables().get("instId").toString();
         String instId = message.getVariables().get("instId").toString();
         String userId = message.getVariables().get("userId").toString();
         String userId = message.getVariables().get("userId").toString();
-        LOGGER.warn("processing snapshot with instId= " + instId);
         Thread.sleep(10000);
         Thread.sleep(10000);
 
 
         /*
         /*
@@ -90,11 +89,12 @@ public class RabbitSnapshotMessageQueueConsumer   {
         if (BeanUtils.isNotEmpty(hisMap)){
         if (BeanUtils.isNotEmpty(hisMap)){
 
 
             Map<String, Object> kzMap = commonDao.queryOne(" SELECT ti_jiao_kuai_zhao,bao_biao_lu_jing_,tablekey_ FROM t_lcidglbdbb " +
             Map<String, Object> kzMap = commonDao.queryOne(" SELECT ti_jiao_kuai_zhao,bao_biao_lu_jing_,tablekey_ FROM t_lcidglbdbb " +
-                "where liu_cheng_xuan_ze = '" + hisMap.get("PROC_DEF_KEY_") + "' AND gui_dang_lei_xing = 'process'");
+                "where liu_cheng_xuan_ze = '" + hisMap.get("PROC_DEF_KEY_") + "' AND gui_dang_lei_xing = 'process' limit 1");
             APIResult<AttachmentPo> result = new APIResult<>();
             APIResult<AttachmentPo> result = new APIResult<>();
 
 
             if (BeanUtils.isNotEmpty(kzMap) && kzMap.containsKey("ti_jiao_kuai_zhao") &&
             if (BeanUtils.isNotEmpty(kzMap) && kzMap.containsKey("ti_jiao_kuai_zhao") &&
                     BeanUtils.isNotEmpty(kzMap.get("ti_jiao_kuai_zhao")) && "是".equals(kzMap.get("ti_jiao_kuai_zhao")) ) {
                     BeanUtils.isNotEmpty(kzMap.get("ti_jiao_kuai_zhao")) && "是".equals(kzMap.get("ti_jiao_kuai_zhao")) ) {
+                LOGGER.warn("processing snapshot with instId= " + instId);
                 PartyEmployeePo employeePo = partyEmployeeRepository.get(userId);
                 PartyEmployeePo employeePo = partyEmployeeRepository.get(userId);
                 String position = employeePo.getPositions().split(",")[0];
                 String position = employeePo.getPositions().split(",")[0];
                 PartyEntityPo entityPo = partyEntityRepository.get(position);
                 PartyEntityPo entityPo = partyEntityRepository.get(position);