diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java index 5b9585739a..51079194b4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -50,18 +50,18 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; -import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService; import com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService; +import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -72,7 +72,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -91,7 +90,8 @@ import java.util.stream.Collectors; */ @Service public class ScmCollectionrebateCheckapplyService extends MybatisBaseService { - + @Autowired + private ScmVehRebateWithApplyService scmVehRebateWithApplyService; @Autowired private FinKingDeeFeign finKingDeeFeign; @Autowired @@ -374,13 +374,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService { - + @Autowired + private ScmVehRebateWithApplyService scmVehRebateWithApplyService; @Autowired private FinKingDeeFeign finKingDeeFeign; @Autowired @@ -391,13 +392,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService { + @Autowired + private ScmVehRebateWithApplyService scmVehRebateWithApplyService; @Autowired private FinKingDeeFeign finKingDeeFeign; @Autowired @@ -443,13 +441,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService { - + @Autowired + private ScmVehRebateWithApplyService scmVehRebateWithApplyService; @Autowired private FinKingDeeFeign finKingDeeFeign; @Autowired @@ -436,13 +433,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService { + @Autowired + private ScmVehRebateWithApplyService scmVehRebateWithApplyService; @Autowired private CrmCustomerTempFeign crmCustomerTempFeign; @Autowired @@ -494,13 +492,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService