From 22fbb7507d6220e2e29cfd1419e702a74bf75a60 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 6 Sep 2024 09:24:25 +0800 Subject: [PATCH] 1 --- .../BusSolutionsChangeRest.java | 3 +- .../sysorganization/SysOrganizationFeign.java | 6 +- .../SysOrganizationFeignFallback.java | 2 +- .../SysOrganizationMapper.java | 2 +- .../sysorganization/SysOrganizationMapper.xml | 4 +- .../sysorganization/SysOrganizationRest.java | 4 +- .../SysOrganizationService.java | 4 +- .../api/scmvehrebate/ScmVehRebateVehDto.java | 2 +- .../ScmVehrebateCheckapplyService.java | 1 + .../AppBusclaimInvoiceBillDetailVo.java | 35 ++++ .../AppBusclaimInvoiceBillDetailsVo.java | 39 ++++ .../AppBusclaimInvoiceBillFeign.java | 59 ++++++ .../flowable/AppDelegateQuery.java | 25 +++ .../flowable/AppFlowDto.java | 37 ++++ .../flowable/AppFlowQuery.java | 28 +++ .../flowable/AppFlowTaskQuery.java | 47 +++++ .../anrui/terminal/TerminalApplication.java | 2 +- .../AppBusclaimInvoiceBillRest.java | 85 +++++++++ .../AppBusclaimInvoiceBillService.java | 180 ++++++++++++++++++ .../AsBusclaimInvoiceBillDetailVo.java | 36 ++++ .../AsBusclaimInvoiceBillDetailsVo.java | 61 ++++++ .../AsBusclaimInvoiceBillFegin.java | 59 ++++++ .../AsBusclaimInvoiceBillFile.java | 35 ++++ .../BusclaimInvoiceDelegateQuery.java | 23 +++ .../flowable/BusclaimInvoiceNodeQuery.java | 18 ++ .../flowable/BusclaimInvoiceNodeVo.java | 24 +++ .../flowable/BusclaimInvoiceTaskQuery.java | 43 +++++ .../CompleteBusclaimInvoiceBillDto.java | 35 ++++ .../AsBusclaimInvoiceBillRest.java | 1 - 29 files changed, 885 insertions(+), 15 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillDetailVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaiminvoicebill/AppBusclaimInvoiceBillRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaiminvoicebill/AppBusclaimInvoiceBillService.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillFegin.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceNodeQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceNodeVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/CompleteBusclaimInvoiceBillDto.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java index 86217e179b..9345410d89 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussolutionschange; - import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.buscenter.api.bussolutionschange.*; import com.yxt.anrui.buscenter.api.bussolutionschange.app.*; @@ -47,7 +46,7 @@ import java.util.List; * @since 1.0 */ @Api(tags = "金融方案变更") -@RestController("com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeRest") +@RestController @RequestMapping("v1/bussolutionschange") public class BusSolutionsChangeRest implements BusSolutionsChangeFeign { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 3b6dc92a7c..71becdff2f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -62,9 +62,9 @@ public interface SysOrganizationFeign { @GetMapping("/tranTwo/{sid}") public ResultBean> tranTwo(@PathVariable("sid") String sid); - @ApiOperation("调出一级站-本集团内调入所有一级站,不包含自身") - @GetMapping("/tranThree/{sid}") - public ResultBean> tranThree(@PathVariable("sid") String sid); + @ApiOperation("调出一级站-调入选择分公司内所有一级站,不包含自身") + @GetMapping("/tranThree/{sid}/{deptSid}") + public ResultBean> tranThree(@PathVariable("sid") String sid, @PathVariable("deptSid") String deptSid); @ApiOperation("调出二级站-调入上级一级站及站下所有二级站,不包含自身") @GetMapping("/tranfour/{sid}") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index e8c81b494f..d681e57885 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -65,7 +65,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { } @Override - public ResultBean> tranThree(String sid) { + public ResultBean> tranThree(String sid, String deptSid) { return null; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index a8a832aed0..99509143f1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -135,7 +135,7 @@ public interface SysOrganizationMapper extends BaseMapper { List tranTwo(String sid); - List tranThree(String sid); + List tranThree(@Param("sid") String sid,@Param("deptSid") String deptSid); List tranfour(String sid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 95938d9767..10764aa092 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -291,7 +291,9 @@ FROM sys_organization WHERE orgAttributeKey = 'fwz_001' - AND sid != #{sid} + AND sid != #{deptSid} + AND (psid = #{sid} + OR sid = #{sid})