diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml
index c49a6e7c..569549b6 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml
@@ -10,7 +10,10 @@
COL_SUMMARY.STATE as status
from formmain_0664
LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0664.id
- WHERE formmain_0664.field0074 is NULL and COL_SUMMARY.STATE in ( '1','3','0')
+ WHERE
+ id = #{id}
+ formmain_0664.field0074 is NULL
+ and COL_SUMMARY.STATE in ( '1','3','0')
and formmain_0664.finishedflag = 1
@@ -32,7 +35,10 @@
COL_SUMMARY.STATE as status
from formmain_0673
LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0673.id
- WHERE formmain_0673.field0032 is NULL and COL_SUMMARY.STATE in ( '1','3','0')
+ WHERE
+ id = #{id}
+ formmain_0673.field0032 is NULL
+ and COL_SUMMARY.STATE in ( '1','3','0')
and formmain_0673.finishedflag = 1
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
index b6ef6642..bd6947c2 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
@@ -76,7 +76,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
prepaymentEntity.setDataSourceCode(datasourceCode);
if (StrUtil.isEmpty(taskId)) {
} else {
- prepaymentEntity.setId(taskId);
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
+ prepaymentEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
}
List prepaymentList = prepaymentService.queryList(prepaymentEntity);
if (CollectionUtils.isNotEmpty(prepaymentList)) {
@@ -352,7 +353,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
//requisitionEntity.setStartTime(startTime);
//requisitionEntity.setEndTime(endTime);
} else {
- requisitionEntity.setId(taskId);
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
+ requisitionEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
}
List requisitionList = requisitionService.queryList(requisitionEntity);
if (CollectionUtils.isNotEmpty(requisitionList)) {
@@ -679,7 +681,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
OaEntity oaEntity = new OaEntity();
oaEntity.setDataSourceCode(datasourceCode);
if (!StrUtil.isEmpty(taskId)) {
- oaEntity.setId(taskId);
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
+ oaEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
}
List oaEntities = oaDao.queryQkdList(oaEntity);
//发送数据
@@ -779,7 +782,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
OaEntity oaEntity = new OaEntity();
oaEntity.setDataSourceCode(datasourceCode);
if (!StrUtil.isEmpty(taskId)) {
- oaEntity.setId(taskId);
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
+ oaEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
}
List oaEntities = oaDao.queryQgdList(oaEntity);