diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 3d9e6c8a..63ffcf21 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -131,9 +131,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ * @param targetId * @return */ - default boolean checkSyFormIdIsNotNull(String targetId){ - return false; - } + boolean checkSyFormIdIsNotNull(String targetId); /** * 审批列表(用于详情页) diff --git a/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java b/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java index e5acfd9d..0491a52a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java @@ -59,8 +59,8 @@ public class CostSort2WrapperUtil { } sortProductAndTime(sortOfNoCondition); sortProductAndTime(sortOfCondition); - listResult.addAll(sortOfNoCondition); listResult.addAll(sortOfCondition); + listResult.addAll(sortOfNoCondition); return listResult; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java index 6bdf9886..23dcf8cb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java @@ -25,6 +25,12 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic private TbsBudgetMapper budgetMapper; + @Override + public boolean checkSyFormIdIsNotNull(String targetId) { + TbsBudget tbsBudget = budgetMapper.selectById(targetId); + return tbsBudget.getSyFormId()!=null; + } + @Override public void doCommitBacked(String targetId) { AsyncManager.me().execute(AsyncFactory.submitBudgetApply(targetId)); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java index ccd25d79..e672bca9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java @@ -47,6 +47,12 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi private TbsScheduleItemBudgetService tbsScheduleItemBudgetService; + @Override + public boolean checkSyFormIdIsNotNull(String targetId) { + TbsBudgetChange budgetChange = budgetChangeMapper.selectById(targetId); + return budgetChange.getSyFormId()!=null; + } + @Override public void doCommitBacked(String targetId) { AsyncManager.me().execute(AsyncFactory.submitBudgetChange(targetId)); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index 7fa81f69..69b38dd4 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -42,6 +42,12 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi private TbsActivityPayConditionService activityPayConditionService; private TbsActivityService tbsActivityService; + @Override + public boolean checkSyFormIdIsNotNull(String targetId) { + VtbVerification verification = vtbVerificationMapper.selectById(targetId); + return verification.getSyFormId()!=null; + } + @Override public String getTemplateCode() { return TbsSeeYonConst.CostCheckConf.Code();