hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重新推送修改

This commit is contained in:
lvleigang 2024-11-22 16:08:07 +08:00
parent 2a1da945fe
commit 614df64837
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml
View File

@ -10,7 +10,10 @@
COL_SUMMARY.STATE as status COL_SUMMARY.STATE as status
from formmain_0664 from formmain_0664
LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0664.id 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
<if test="id != null and id != ''"> id = #{id} </if>
<if test=" id == null or id == ''.toString() "> formmain_0664.field0074 is NULL </if>
and COL_SUMMARY.STATE in ( '1','3','0')
and formmain_0664.finishedflag = 1 and formmain_0664.finishedflag = 1
</select> </select>
@ -32,7 +35,10 @@
COL_SUMMARY.STATE as status COL_SUMMARY.STATE as status
from formmain_0673 from formmain_0673
LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0673.id 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
<if test="id != null and id != ''"> id = #{id} </if>
<if test=" id == null or id == ''.toString() "> formmain_0673.field0032 is NULL </if>
and COL_SUMMARY.STATE in ( '1','3','0')
and formmain_0673.finishedflag = 1 and formmain_0673.finishedflag = 1
</select> </select>

12
base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
View File

@ -76,7 +76,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
prepaymentEntity.setDataSourceCode(datasourceCode); prepaymentEntity.setDataSourceCode(datasourceCode);
if (StrUtil.isEmpty(taskId)) { if (StrUtil.isEmpty(taskId)) {
} else { } else {
prepaymentEntity.setId(taskId); IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
prepaymentEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
} }
List<PrepaymentEntity> prepaymentList = prepaymentService.queryList(prepaymentEntity); List<PrepaymentEntity> prepaymentList = prepaymentService.queryList(prepaymentEntity);
if (CollectionUtils.isNotEmpty(prepaymentList)) { if (CollectionUtils.isNotEmpty(prepaymentList)) {
@ -352,7 +353,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
//requisitionEntity.setStartTime(startTime); //requisitionEntity.setStartTime(startTime);
//requisitionEntity.setEndTime(endTime); //requisitionEntity.setEndTime(endTime);
} else { } else {
requisitionEntity.setId(taskId); IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
requisitionEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
} }
List<RequisitionEntity> requisitionList = requisitionService.queryList(requisitionEntity); List<RequisitionEntity> requisitionList = requisitionService.queryList(requisitionEntity);
if (CollectionUtils.isNotEmpty(requisitionList)) { if (CollectionUtils.isNotEmpty(requisitionList)) {
@ -679,7 +681,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
OaEntity oaEntity = new OaEntity(); OaEntity oaEntity = new OaEntity();
oaEntity.setDataSourceCode(datasourceCode); oaEntity.setDataSourceCode(datasourceCode);
if (!StrUtil.isEmpty(taskId)) { if (!StrUtil.isEmpty(taskId)) {
oaEntity.setId(taskId); IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
oaEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
} }
List<OaEntity> oaEntities = oaDao.queryQkdList(oaEntity); List<OaEntity> oaEntities = oaDao.queryQkdList(oaEntity);
//发送数据 //发送数据
@ -779,7 +782,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
OaEntity oaEntity = new OaEntity(); OaEntity oaEntity = new OaEntity();
oaEntity.setDataSourceCode(datasourceCode); oaEntity.setDataSourceCode(datasourceCode);
if (!StrUtil.isEmpty(taskId)) { if (!StrUtil.isEmpty(taskId)) {
oaEntity.setId(taskId); IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = taskLivingDetailsService.get(taskId);
oaEntity.setId(integrationTaskLivingDetailsEntity.getRootAppPk());
} }
List<OaEntity> oaEntities = oaDao.queryQgdList(oaEntity); List<OaEntity> oaEntities = oaDao.queryQgdList(oaEntity);