From 3106ef70eadb6626cd33b65048df9350e506ef09 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 11 Oct 2022 10:06:27 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=87=BA=E7=BA=B3=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=B4=A2=E5=8A=A1=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finpaymentrecord/FinPaymentrecordService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index a555e06047..e21a756c27 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -228,10 +228,12 @@ public class FinPaymentrecordService extends MybatisBaseService Date: Tue, 11 Oct 2022 10:34:51 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/kingdee/FinKingDeeFeign.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index ba709426c1..335aa821d3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -25,7 +25,7 @@ import javax.validation.Valid; import java.util.List; /** - * 财务模块调用金蝶暂存业务单据的接口 + * 财务模块调用金蝶暂存业务单据的接口 @RequestBody */ @Api(tags = "财务模块调用金蝶暂存业务单据的接口") @FeignClient( @@ -42,7 +42,7 @@ public interface FinKingDeeFeign { @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @ResponseBody - ResultBean draftEntryBill(@RequestBody APPayable APPayable); + ResultBean draftEntryBill(@RequestBody @Valid APPayable APPayable); /** * 生成的应付单的数据，推送到金蝶的平台中 * @return @@ -50,23 +50,23 @@ public interface FinKingDeeFeign { @ApiOperation("入账暂存应收单的接口") @PostMapping("/draftReceivableBill") @ResponseBody - ResultBean draftReceivableBill(@RequestBody ARReceivable aRReceivable); + ResultBean draftReceivableBill(@RequestBody @Valid ARReceivable aRReceivable); @ApiOperation("暂存付款单的接口") @PostMapping("/draftApPayBill") @ResponseBody - public ResultBean draftApPayBill(@RequestBody ApPayBill apPayBill) ; + public ResultBean draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) ; @ApiOperation("暂存采购入库单的接口") @PostMapping("/draftStkInStock") @ResponseBody - public ResultBean draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception; + public ResultBean draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception; @ApiOperation("暂存采购退料单的接口") @PostMapping("/draftPurMrb") @ResponseBody - public ResultBean draftPurMrb(@RequestBody PurMrb purMrb) ; + public ResultBean draftPurMrb(@RequestBody @Valid PurMrb purMrb) ; @ApiOperation("暂存采购出库单的接口") @PostMapping("/draftSalOutStock") @ResponseBody - public ResultBean draftSalOutStock(@RequestBody SalOutStock salOutStock) ; + public ResultBean draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) ; @ApiOperation("暂存物料的接口") @PostMapping("/draftBdMaterialList") @ResponseBody @@ -78,19 +78,19 @@ public interface FinKingDeeFeign { @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftStkTransferDirect") @ResponseBody - public ResultBean draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ; + public ResultBean draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect) ; @ApiOperation("暂存直接调拨单的接口") @PostMapping("/draftOrgOrganizations") @ResponseBody - public ResultBean draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) ; + public ResultBean draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) ; @ApiOperation("暂存供应商的接口") @PostMapping("/draftBdSupplier") @ResponseBody - ResultBean draftBdSupplier(@RequestBody BdSupplier bdSupplier); + ResultBean draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier); @ApiOperation("暂存客户信息的接口") @PostMapping("/draftBdCustomer") @ResponseBody - ResultBean draftBdCustomer(@RequestBody BdCustomer bdCustomer); + ResultBean draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer); @ApiOperation("使用number查看数据表单") @GetMapping("/getKingDataInfoByNumber/{formId}/{number}") @ResponseBody @@ -102,7 +102,7 @@ public interface FinKingDeeFeign { @ApiOperation("下推") @PostMapping("/draftStkInStockPushPurMrb") @ResponseBody - public ResultBean draftStkInStockPushPurMrb(@RequestBody STKInStockPushPurmrb push) throws Exception; + public ResultBean draftStkInStockPushPurMrb(@RequestBody @Valid STKInStockPushPurmrb push) throws Exception; @ApiOperation("暂存仓库信息的接口") @PostMapping("/drafBDStock") @ResponseBody From a437ca7846f8c5ef11cab04eba890dc7b13d3690 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 11 Oct 2022 10:35:25 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 97c1ad42b3..e126fd4362 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -241,7 +241,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @PostMapping("/drafBDBank") @ResponseBody @Override - public ResultBean drafBDBank(BDBank bdBank) { + public ResultBean drafBDBank(@RequestBody @Valid BDBank bdBank) { return bdBankService.draftBDBank(bdBank);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } @@ -249,7 +249,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @PostMapping("/drafCNBankacnt") @ResponseBody @Override - public ResultBean drafCNBankacnt(CNBankacnt cNBankacnt) { + public ResultBean drafCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) { return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } From 52c67bf0106388da40d08a30e3adfa41674a51c5 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 11 Oct 2022 11:01:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=87=BA=E7=BA=B3=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=B4=A2=E5=8A=A1=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finpaymentrecord/FinPaymentrecordService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e21a756c27..ed7a017021 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -194,7 +194,7 @@ public class FinPaymentrecordService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()); - if (!resultBean.getSuccess()) { + if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { apPayBill.setFPURCHASEORGID(vo.getOrgCode()); @@ -211,9 +211,9 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null From 5cfda23b7f10cce706a455366f2cb3b202d14566 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 11 Oct 2022 14:10:18 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/finaccountnum/finaccountnum.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue index bd8c0b5982..4594735d0d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue @@ -1,7 +1,7 @@ - + - - + +
From 605b19c37fe30b52ef4a3338de3ba1bbeb531217 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 11 Oct 2022 14:28:45 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=95=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/changshang/changshangguanli/changshangguanliAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue index 4849e5e400..9658f64161 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue @@ -50,7 +50,7 @@ - + From 24e2ed95fdd184b850d7fd150d375c252abcf390 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 11 Oct 2022 14:36:14 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD--=E5=8E=82=E5=AE=B6=E9=94=80=E5=94=AE?= =?UTF-8?q?=E9=80=9A=E8=B7=AF=E6=94=B9=E4=B8=BA=E5=8E=82=E5=AE=B6=E5=9B=9E?= =?UTF-8?q?=E6=AC=BE=E9=80=9A=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 2 +- .../views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue | 2 +- .../paichanguanli/cheliangpaichanDaiBanInfo.vue | 2 +- .../paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue | 2 +- .../paichanguanli/cheliangpaichanYiBanInfo.vue | 2 +- .../paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index 6c3f1d6b43..7791c2076e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -127,7 +127,7 @@ {{ scope.row.saleGuPrice }} - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue index 746a8742bf..57491df198 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue @@ -102,7 +102,7 @@ {{ scope.row.saleGuPrice }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index 5bfb502019..a5d3fe6e51 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -126,7 +126,7 @@ {{ scope.row.saleGuPrice }} - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue index dbc7bc950d..e2e370e2b2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue @@ -30,7 +30,7 @@ - + From 6963a969ce45aec9080b6e992f597465c4ffa7b9 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 11 Oct 2022 15:29:41 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=B7=A1=E6=A3=80,=E7=9B=98=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleInventoryService.java | 3 +++ .../ScmVehiclePatrolinspectionMapper.java | 2 +- .../ScmVehiclePatrolinspectionsheetService.java | 14 +------------- .../ScmVehPatrolinspectionmonthService.java | 6 +++++- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index ceeb54fa51..a048449366 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -367,6 +367,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ") + @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )") List selectListVo(@Param("useOrgSid") String useOrgSid); /** diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index 7d877dc382..958fb24fe5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -229,18 +229,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = new ArrayList<>(); -// List splitName = Arrays.asList(vo.getLiableName().split(",")); -// List splitSid = Arrays.asList(vo.getLiableSid().split(",")); -// for (int i = 0; i < splitName.size(); i++) { -// AppLiableListVo v = new AppLiableListVo(); -// v.setLiableName(splitName.get(i)); -// v.setLiableSid(splitSid.get(i)); -// list.add(v); -// } -// vo.setLiableList(list); -// } List images = new ArrayList<>(); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { @@ -534,7 +522,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService vinNoList = new ArrayList<>(); List mainList = new ArrayList<>(); + //所有巡检记录 List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid); List list = new ArrayList<>(); if (patrolinspectionVos.size() > 0) { @@ -198,11 +199,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService Date: Tue, 11 Oct 2022 16:40:56 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=8E=82=E5=95=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=88=86=E5=85=AC=E5=8F=B8=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemanufacturer/BaseManufaQuery.java | 16 ++++++ .../basemanufacturer/BaseManufacturerDto.java | 4 +- .../basemanufacturer/BaseManufacturerVo.java | 6 ++ .../BaseManufacturerMapper.xml | 3 +- .../BaseManufacturerRest.java | 20 ++++++- .../BaseManufacturerService.java | 55 ++++++++++++++++--- .../sysorganization/SysOrganizationFeign.java | 5 ++ .../SysOrganizationFeignFallback.java | 5 ++ .../SysOrganizationMapper.java | 2 + .../sysorganization/SysOrganizationMapper.xml | 9 ++- .../sysorganization/SysOrganizationRest.java | 7 +++ .../SysOrganizationService.java | 4 ++ 12 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java new file mode 100644 index 0000000000..154fe2dd94 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.base.api.basemanufacturer; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/11 15:48 + * @Description + */ +@Data +public class BaseManufaQuery implements Query { + private static final long serialVersionUID = 4223191922440246912L; + + private String orgSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java index 81723e045c..c42c6fbe18 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java @@ -121,6 +121,6 @@ public class BaseManufacturerDto implements Dto { @ApiModelProperty(value = "使用组织名称") private String useOrgName; - @ApiModelProperty(value = "厂商开户行sid") - private String manBankSid; +/* @ApiModelProperty(value = "厂商开户行sid") + private String manBankSid;*/ } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java index 71e5611e3c..9b235db69a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basemanufacturer; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,4 +39,9 @@ public class BaseManufacturerVo implements Vo { private String contactMobile; @ApiModelProperty(value = "供应商分类Value") private String supplierTypeValue; + @JsonIgnore + @ApiModelProperty("供应商编码") + private String manufacturerCode; + @ApiModelProperty("是否允许编辑：true允许，false不允许") + private Boolean isShow; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index f372488a85..4f066aa9de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -16,7 +16,8 @@ bm.contactName, bm.supplierTypeValue, - bm.createOrgName + bm.createOrgName, + bm.manufacturerCode FROM base_manufacturer bm ${ew.customSqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 67e1dfbf9e..554e1e15b4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -6,6 +6,7 @@ import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -18,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -63,6 +65,20 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { ResultBean> rb = ResultBean.fireFail(); IPage page = baseManufacturerService.gysPagerList(pagerQuery); PagerVo pv = new PagerVo<>(); + List records = page.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (BaseManufacturerVo baseManufacturerVo : records) { + String code = baseManufacturerVo.getManufacturerCode(); + if (StringUtils.isNotBlank(code)) { + baseManufacturerVo.setIsShow(false); + } else { + baseManufacturerVo.setIsShow(true); + } + + } + + } PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); } @@ -79,7 +95,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { @Override public ResultBean update(BaseManufacturerAllDto dto, String sid) { - return baseManufacturerService.updateAll(dto,sid); + return baseManufacturerService.updateAll(dto, sid); } @Override @@ -107,7 +123,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { } @Override - public ResultBean>> wcgysNamesDown(String orgSid) { + public ResultBean>> wcgysNamesDown(String orgSid) { return baseManufacturerService.wcgysNamesDown(orgSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 57c978d5ad..7ccd323bd9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basemanufacturer; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basemanufacturer.*; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto; @@ -16,12 +17,14 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.*; /** * Project: anrui-base(安瑞基础信息模块)
@@ -93,7 +97,6 @@ public class BaseManufacturerService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + String finalSid = sid; + Future future1 = pool.submit(() -> { + //查询所有分公司，并向所有分公司中插入供应商信息 + ResultBean> orgList = sysOrganizationFeign.selectOrgSidList(); + List list = orgList.getData(); + if (!list.isEmpty()) { + for (SysOrganizationVo s : list) { + BaseManufacturer baseManufacturer = new BaseManufacturer(); + BeanUtil.copyProperties(baseManufacturerDto, baseManufacturer, "sid", "manufacturerCode"); + baseManufacturer.setManBankSid(finalSid); + baseManufacturer.setCreateOrg(s.getSid()); + baseManufacturer.setUseOrg(s.getSid()); + baseManufacturer.setCreateOrgName(s.getName()); + baseManufacturer.setUseOrgName(s.getName()); + insert(baseManufacturer); + } + } + }); + Future future2 = pool.submit(() -> { + //金蝶推送 + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName()); + bdSupplier.setFLocMobile(dto.getBaseManufacturerDto().getContactMobile()); + bdSupplier.setFUseOrgId("101"); // bdSupplier.setTOrgIds("101"); - bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode()); - ResultBean stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier); + bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode()); + ResultBean stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setMsg("操作成功"); } @@ -361,13 +395,16 @@ public class BaseManufacturerService extends MybatisBaseService baseManufacturerBankVo = baseManufacturerBankService.selectDetails(sid); BaseManufacturerFinanceVo baseManufacturerFinanceVo = baseManufacturerFinanceService.selectDetails(sid); - baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo); baseManufacturerAllVo.setBaseManufacturerBankDto(baseManufacturerBankVo); baseManufacturerAllVo.setBaseManufacturerFinanceDto(baseManufacturerFinanceVo); return rb.success().setData(baseManufacturerAllVo); 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 1ba697296e..4d0fc5be2f 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 @@ -149,4 +149,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("查询分公司下的销售支持部") ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name); + + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList(); } \ No newline at end of file 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 8d4a8a4a4c..ab53e337c2 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 @@ -152,4 +152,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean selectByPSid(String sid, String name) { return null; } + + @Override + public ResultBean> selectOrgSidList() { + return null; + } } \ No newline at end of file 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 42ab950f2b..5998db7eec 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 @@ -111,4 +111,6 @@ public interface SysOrganizationMapper extends BaseMapper { List selectByOrgDeptSid(String orgDeptSid); SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name); + + List selectOrgSidList(); } \ No newline at end of file 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 69d5a18ec4..1ea5f9e06b 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 @@ -195,6 +195,13 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 420af12785..d340fe09b9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -371,4 +371,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean selectByPSid(String sid, String name) { return sysOrganizationService.selectByPSid(sid,name); } + + @Override + public ResultBean> selectOrgSidList() { + ResultBean> rb = ResultBean.fireFail(); + List stringList = sysOrganizationService.selectOrgSidList(); + return rb.success().setData(stringList); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ee71c6df3a..dce889491b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -513,4 +513,8 @@ public class SysOrganizationService extends MybatisBaseService selectOrgSidList() { + return baseMapper.selectOrgSidList(); + } } \ No newline at end of file From ef7bfeb1ac185fb4a3b93bdbd84a85062517c02f Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 11 Oct 2022 19:27:39 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java index ab89dbc3ae..2ced168092 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java @@ -8,11 +8,15 @@ public class KingDeeConfig { /** * 登录金蝶的账户信息 */ - public static String acctID = "61dce6601125a0"; + public static String acctID = "61654d8e138fe6"; /** * 登录金蝶的账户信息 */ - public static String userName = "信息部2"; + // public static String acctID = "61dce6601125a0"; + /** + * 登录金蝶的账户信息 + */ + public static String userName = "信息部"; /** * 登录金蝶的账户信息 */ From e72a22f1ac06c7b778f9eafc725ad8405d64231b Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 11 Oct 2022 19:33:44 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java index 2ced168092..3ff3837c20 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java @@ -6,11 +6,11 @@ public class KingDeeConfig { public static String sessionValue = ""; public static String aspnetsessionValue = ""; /** - * 登录金蝶的账户信息 + * 登录金蝶的账户信息 20211011 */ public static String acctID = "61654d8e138fe6"; /** - * 登录金蝶的账户信息 + * 登录金蝶的账户信息 2022010测试 */ // public static String acctID = "61dce6601125a0"; /** From bac467ecd88e4e652227fa8aa911891b30f4ca7b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 11 Oct 2022 21:23:16 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemanufacturer/BaseManufaQuery.java | 3 +- .../BaseManufacturerFeign.java | 5 ++ .../BaseManufacturerFeignFallback.java | 5 ++ .../BaseManufacturerMapper.java | 2 + .../BaseManufacturerMapper.xml | 34 ++++++++----- .../BaseManufacturerRest.java | 15 ++++-- .../BaseManufacturerService.java | 50 +++++++++++++++++-- .../BaseVehicleBrandMapper.java | 2 + .../BaseVehicleBrandMapper.xml | 28 +++++++---- .../BaseVehicleBrandService.java | 10 ++-- .../FinPaymentrecordService.java | 3 +- 11 files changed, 123 insertions(+), 34 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java index 154fe2dd94..23a072666b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufaQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basemanufacturer; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,6 +12,6 @@ import lombok.Data; @Data public class BaseManufaQuery implements Query { private static final long serialVersionUID = 4223191922440246912L; - + @ApiModelProperty("分公司sid") private String orgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index 7a451b4e77..b3b9543d81 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -176,4 +176,9 @@ public interface BaseManufacturerFeign { @ResponseBody ResultBean> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query); + @ApiOperation("获取分公司按钮新增供应商信息") + @GetMapping("/saveAllByOrgSid") + @ResponseBody + ResultBean saveAllByOrgSid(@SpringQueryMap BaseManufaQuery query); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index ad4777202e..7170e6f8e0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java @@ -100,4 +100,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { return null; } + + @Override + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index 07e20bff99..a07f2db8df 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java @@ -121,4 +121,6 @@ public interface BaseManufacturerMapper extends BaseMapper { List selectNameByOrg(@Param("modelSid") String modelSid); BaseManufacturer fetchByManBankSid(String s); + + List selectOrgList(String type); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index 4f066aa9de..cb90de67b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -19,7 +19,7 @@ bm.createOrgName, bm.manufacturerCode FROM base_manufacturer bm - ${ew.customSqlSegment} + ${ew.customSqlSegment} - UPDATE base_manufacturer SET isDelete = 1 WHERE sid IN + UPDATE base_manufacturer + SET isDelete = 1 WHERE sid IN #{item} @@ -154,7 +155,7 @@ manufacturerName FROM base_manufacturer WHERE supplierType = "0004" - AND isDelete=0 + AND isDelete = 0 AND createOrg = #{orgSid} @@ -164,21 +165,30 @@ bankAccount FROM base_manufacturer_bank WHERE manufacturerSid = #{manufacturerSid} - AND isDelete = 0 + AND isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 554e1e15b4..d679d039cc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.*; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -18,10 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-base(安瑞基础信息模块)
@@ -49,6 +49,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { private BaseManufacturerFinanceService baseManufacturerFinanceService;//供应厂商财务信息 @Autowired private HttpServletResponse response; + @Autowired + private BaseVehicleBrandService baseVehicleBrandService; @Override @@ -188,4 +190,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { return baseManufacturerService.selectNameByOrg(query); } + + @Override + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + return baseManufacturerService.saveAllByOrgSid(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 7ccd323bd9..f0e8afba31 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -30,10 +30,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.*; +import java.util.stream.Collectors; /** * Project: anrui-base(安瑞基础信息模块)
@@ -504,4 +503,49 @@ public class BaseManufacturerService extends MybatisBaseService selectOrgList(String type) { + return baseMapper.selectOrgList(type); + } + + public ResultBean saveAllByOrgSid(BaseManufaQuery query) { + ResultBean rb = ResultBean.fireFail(); + String orgSid = query.getOrgSid(); + //根据分公司查询该分公司授权的品牌 + List brandSidList = baseVehicleBrandService.selectOrgSidBySid(orgSid); + List stringList = new ArrayList<>(); + for (String s : brandSidList) { + List list = Arrays.asList(s.split(",")); + for (String ss : list) { + stringList.add(ss); + } + } + //去重 + stringList = stringList.stream().distinct().collect(Collectors.toList()); + //查询类别为分公司的 + String type = "分公司"; + List orgList2 = selectOrgList(type); + HashSet h1 = new HashSet(stringList); + HashSet h2 = new HashSet(orgList2); + h1.removeAll(h2); + stringList.clear(); + stringList.addAll(h1); + for (String s : stringList) { + ResultBean resultBean = sysOrganizationFeign.fetchBySid(s); + SysOrganizationVo sysOrganizationVo = resultBean.getData(); + if (sysOrganizationVo != null) { + BaseManufacturer baseManufacturer = new BaseManufacturer(); + baseManufacturer.setSupplierType("0005"); + baseManufacturer.setSupplierTypeValue("分公司"); + baseManufacturer.setManufacturerName(sysOrganizationVo.getName()); + baseManufacturer.setManufacturerCode(sysOrganizationVo.getOrgCode()); + baseManufacturer.setCreateOrg(s); + baseManufacturer.setCreateOrgName(sysOrganizationVo.getName()); + baseManufacturer.setUseOrg(s); + baseManufacturer.setUseOrgName(sysOrganizationVo.getName()); + insert(baseManufacturer); + } + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index 9c5ccaac15..ff46277814 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -129,4 +129,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { List selectManSidByOrgSid(String orgSid); String selectShortName(String modelSid); + + List selectOrgSidBySid(String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index 717dec7041..c656201191 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -15,7 +15,7 @@ WHERE brandCode = #{brandCode} AND isDelete = 0 AND sid - <> + <> #{sid} @@ -35,8 +35,8 @@ bm.manufacturerName, DATE_FORMAT(bvb.modifyTime, '%Y-%m-%d') AS modifyTime FROM base_vehicle_brand bvb - LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid - ${ew.customSqlSegment} + LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid + ${ew.customSqlSegment} @@ -67,8 +67,8 @@ bvb.modifyTime, bm.manufacturerName FROM base_vehicle_brand bvb - LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid - ${ew.customSqlSegment} + LEFT JOIN base_manufacturer bm on bm.sid = bvb.manufacturerSid + ${ew.customSqlSegment} SELECT bvb.brandName, bvb.sid FROM base_vehicle_brand bvb - ${ew.customSqlSegment} + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index af9732c674..3ea7f22f93 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -155,7 +155,7 @@ public class BaseVehicleBrandService extends MybatisBaseService selectOrgSidBySid(String orgSid) { + return baseMapper.selectOrgSidBySid(orgSid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index ed7a017021..a2154d861f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -225,7 +225,8 @@ public class FinPaymentrecordService extends MybatisBaseService Date: Tue, 11 Oct 2022 22:01:37 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE=E9=80=9A=E8=B7=AF=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rgDeptDto.java => ActualAndOrgDeptVo.java} | 4 ++- .../busvehicleorder/BusVehicleOrderFeign.java | 5 ++- .../BusVehicleOrderFeignFallback.java | 3 +- .../BaseManufactorSubscriptionService.java | 5 +-- .../BusVehicleApplyMapper.java | 3 ++ .../busvehicleapply/BusVehicleApplyMapper.xml | 9 +++++ .../BusVehicleApplyService.java | 9 +++-- .../busvehicleorder/BusVehicleOrderRest.java | 34 +++++++++---------- .../BusVehicleOrderService.java | 3 +- .../ScmApplyInboundService.java | 24 ++++++------- 10 files changed, 59 insertions(+), 40 deletions(-) rename anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/{ActualAndOrgDeptDto.java => ActualAndOrgDeptVo.java} (74%) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java similarity index 74% rename from anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java rename to anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java index aa837a9d2d..af6359e675 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/ActualAndOrgDeptVo.java @@ -1,12 +1,14 @@ package com.yxt.anrui.base.api.busvehicleorder; +import com.yxt.common.core.vo.Vo; import lombok.Data; /** * 采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路 */ @Data -public class ActualAndOrgDeptDto { +public class ActualAndOrgDeptVo implements Vo { + private static final long serialVersionUID = -8041909902044531946L; //厂家销售通路sid private String actualSid; //厂家销售通路 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index f97312ab19..883c84ef06 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * Project: anrui-base(车型信息)
@@ -116,6 +115,6 @@ public interface BusVehicleOrderFeign { @GetMapping("/getAppReadyCar/{modelSid}/{configSid}") public ResultBean> getAppReadyCar(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路") - @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}") - public ResultBean getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid); + @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}/{modelSid}/{configSid}") + public ResultBean getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid, @PathVariable("modelSid")String modelSid, @PathVariable("configSid")String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index 48ac50e9da..c7302c2636 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -32,7 +32,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; -import java.util.Map; /** * Project: anrui-base(车型信息)
@@ -109,7 +108,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { } @Override - public ResultBean getActualAndOrgDept(String vehicleOrderSid) { + public ResultBean getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index f10f6e4375..9e069743d0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -280,8 +280,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService { int selectByNodeState(String join); int selectCountBySids(String join); + + ActualAndOrgDeptVo getActualAndOrgDept(@Param("sid") String vehicleOrderSid, @Param("modelSid") String modelSid, @Param("configSid") String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index c9a901295a..86f78e4250 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -103,4 +103,13 @@ where bs.state = 1 and find_in_set(ba.sid, #{join}) + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 6b3f2657e8..23cf0e9b3d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -19,6 +19,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz; +import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; @@ -517,7 +518,7 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); + List busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); //根据车型sid查询账户名称和银行账号 List busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); @@ -791,7 +792,7 @@ public class BusVehicleApplyService extends MybatisBaseService0){ + if (counts > 0) { return rb.setMsg("选择作废的数据中包含已认款的数据，不允许作废"); } List sidsList = Arrays.asList(sids); @@ -802,4 +803,8 @@ public class BusVehicleApplyService extends MybatisBaseService @@ -202,20 +201,21 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { } @Override - public ResultBean getActualAndOrgDept(String vehicleOrderSid) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(vehicleOrderSid); - if (vo == null) { - return rb; - } - BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.fetchAllBySid(vo.getPurchaseRequisitionSid()); - BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(vo.getPurchaseApplyMediumModelSid()); - ActualAndOrgDeptDto actualAndOrgDeptDto = new ActualAndOrgDeptDto(); - actualAndOrgDeptDto.setOrgDeptSid(busVehicleApplyDetailsVo.getOrgDeptSid()); - actualAndOrgDeptDto.setOrgDeptName(busVehicleApplyDetailsVo.getOrgDeptName()); - actualAndOrgDeptDto.setActualPay(busVehicleApplyDetail.getActualPay()); - actualAndOrgDeptDto.setActualSid(busVehicleApplyDetail.getActualSid()); - return rb.success().setData(actualAndOrgDeptDto); + public ResultBean getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) { + ResultBean rb = ResultBean.fireFail(); + ActualAndOrgDeptVo vo = busVehicleApplyService.getActualAndOrgDept(vehicleOrderSid,modelSid,configSid); +// BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(vehicleOrderSid); +// if (vo == null) { +// return rb; +// } +// BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.fetchAllBySid(vo.getPurchaseRequisitionSid()); +// BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(vo.getPurchaseApplyMediumModelSid()); +// ActualAndOrgDeptVo actualAndOrgDeptDto = new ActualAndOrgDeptVo(); +// actualAndOrgDeptDto.setOrgDeptSid(busVehicleApplyDetailsVo.getOrgDeptSid()); +// actualAndOrgDeptDto.setOrgDeptName(busVehicleApplyDetailsVo.getOrgDeptName()); +// actualAndOrgDeptDto.setActualPay(busVehicleApplyDetail.getActualPay()); +// actualAndOrgDeptDto.setActualSid(busVehicleApplyDetail.getActualSid()); + return rb.success().setData(vo); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 5c426c93fb..d0536e2345 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -249,7 +249,8 @@ public class BusVehicleOrderService extends MybatisBaseService scmApplyInboundVehicleDtos) { List baseVehicleDtos=new ArrayList<>(); //获取车辆对应的采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路 - ResultBean actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid()); - ActualAndOrgDeptDto aaodd = actualAndOrgDept.getData(); + ResultBean actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid(),booad.getModelSid(),booad.getConfigSid()); + ActualAndOrgDeptVo aaodd = actualAndOrgDept.getData(); if(!actualAndOrgDept.getSuccess()||aaodd==null){ return; } + + for(ScmApplyInboundVehicleDto s:scmApplyInboundVehicleDtos){ //车辆台账推送数据 BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); - /* BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderFeign.fetchBySid(booad.getVehicleOrderSid()).getData(); - //排产/采购申请sid - String purchaseRequisitionSid = busVehicleOrderVo.getPurchaseRequisitionSid();*/ + // //采购系统（部门）sid baseVehicleDto.setPurchaseSystemSid(aaodd.getOrgDeptSid()); //采购系统（部门） From d0eea9edac26e3b5be89a383d94e9334a286fc0e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 11 Oct 2022 22:07:04 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemanufacturer/BaseManufacturerService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index f0e8afba31..1ecfc43f9e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -538,7 +538,6 @@ public class BaseManufacturerService extends MybatisBaseService Date: Tue, 11 Oct 2022 22:24:33 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=99=BB=E9=99=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/api/sysuser/SysUserFeign.java | 3 +++ .../api/sysuser/SysUserFeignFallback.java | 5 +++++ .../anrui/portal/biz/sysuser/SysUserRest.java | 5 +++++ .../portal/biz/sysuser/SysUserService.java | 20 ++++++++++++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index ba2219a2c1..0edc2c4fd5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -224,4 +224,7 @@ public interface SysUserFeign { @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户") @GetMapping(value = "selectSysUserList") ResultBean> selectSysUserList(@RequestParam("userSid") String userSid); + @ApiOperation(value = "查询是否需要更换密码") + @GetMapping(value = "/selectPasswordByUserSid/{userSid}") + ResultBean selectPasswordByUserSid(@PathVariable("userSid")String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index b7d69e96ce..4702c693e7 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -204,4 +204,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean> selectSysUserList(String userSid) { return null; } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 952604d6b1..93c2d5eda1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -618,4 +618,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean> selectSysUserList(String userSid) { return sysUserService.selectSysUserList(userSid); } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return sysUserService.selectPasswordByUserSid(userSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 692a819b4b..e80617c187 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -373,7 +373,7 @@ public class SysUserService extends MybatisBaseService { orgList1.setOrgName(sysOrganization.getName()); // orgList1.setOrgPath(vv.getOrgSidPath()); orgList1.setOrgPath(sysOrganization.getSid()); - }else{ + } else { continue; } orgList.add(orgList1); @@ -1054,4 +1054,22 @@ public class SysUserService extends MybatisBaseService { } return rb.success().setData(voList); } + + public ResultBean selectPasswordByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + boolean isTrue = false; + //查询手机号 + SysUser sysUser = fetchBySid(userSid); + if (sysUser != null) { + String mobile = sysUser.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (sysUser.getPassword().equals(md5)) { + isTrue = true; + } + } + } + return rb.success().setData(isTrue); + } } \ No newline at end of file