From bd4fe57291288ad59c760eb31c53429f20c255b8 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 18 Jan 2023 13:35:18 +0800 Subject: [PATCH 1/5] =?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 --- .../BaseOutsourcingApplicationService.java | 3 ++- .../base/biz/busvehicleapply/BusVehicleApplyService.java | 2 ++ .../yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java | 5 ++++- .../fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java | 5 ++++- .../anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java | 5 +++++ .../fin/biz/finpaymentrecord/FinPaymentrecordService.java | 5 ++--- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 8b083de20c..ff795ce744 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -576,7 +576,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap); - if ("Event_end".equals(taskDefKey)) { BigDecimal deposit = booad.getDeposit(); if ("1".equals(booad.getIsBeforePayment())) { @@ -698,6 +697,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService 0) { FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setPurchaseSystemSid(busVehicleApply.getOrgDeptSid()); + finPaymentrecordDto.setPurchaseSystemName(busVehicleApply.getOrgDeptName()); finPaymentrecordDto.setApplySid(busVehicleApply.getSid()); finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid()); finPaymentrecordDto.setPayType(1); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index 0f66f3efda..0d91bbb815 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -102,5 +102,8 @@ public class FinPaymentrecord extends BaseEntity { @ApiModelProperty("供应商编码") private String payCode; - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java index 04a28ac5ab..846ace5332 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java @@ -81,5 +81,8 @@ public class FinPaymentrecordDetailsVo implements Vo { private String createOrgSid; @ApiModelProperty("使用组织sid") private String useOrgSid; - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 397708ccd1..c3c58cfa78 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -89,4 +89,9 @@ public class FinPaymentrecordDto implements Dto { private String updateBySid; @ApiModelProperty("备注信息") private String remarks; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } \ 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 c5ed429ae5..dba3f54738 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 @@ -255,16 +255,15 @@ public class FinPaymentrecordService extends MybatisBaseService resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部"); if (resultBean1.getSuccess()) { - vo = resultBean1.getData(); + SysOrganizationVo vo = resultBean1.getData(); if (vo != null) { apPayBill.setFPURCHASEDEPTID(vo.getOrgCode()); } } //采购组织 - BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(vo.getSid()).getData(); + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(finPaymentrecord.getPurchaseSystemSid()).getData(); if (data != null) { apPayBill.setFPURCHASEORGID(data.getOrgCode()); } else { From ba4e14768f02f8a823b978af3f5cbc202b62009b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 18 Jan 2023 13:46:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=8A=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageDto.java | 2 + .../BaseDiscountpackageQuery.java | 3 + .../BaseManufUpdateDto.java | 2 + .../basemiddleman/BaseMiddleListQuery.java | 2 + .../BaseModelModpriceDto.java | 3 + .../api/basevehicle/BaseVehicleFeign.java | 5 ++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++ .../busvehicleorder/BusVehicleOrderFeign.java | 5 ++ .../BusVehicleOrderFeignFallback.java | 5 ++ .../BaseDiscountpackageService.java | 79 +++++++++---------- .../BaseManufactorSubscriptionMapper.java | 2 +- .../BaseManufactorSubscriptionMapper.xml | 2 +- .../BaseManufactorSubscriptionService.java | 3 +- .../basemiddleman/BaseMiddlemanMapper.java | 2 +- .../biz/basemiddleman/BaseMiddlemanMapper.xml | 5 +- .../basemiddleman/BaseMiddlemanService.java | 6 +- .../BaseModelModpriceService.java | 47 +++++++---- .../base/biz/basevehicle/BaseVehicleRest.java | 5 ++ .../biz/basevehicle/BaseVehicleService.java | 9 +++ .../busvehicleorder/BusVehicleOrderRest.java | 5 ++ .../BusVehicleOrderService.java | 9 +++ .../commoncontract/CommonContractService.java | 23 +++++- .../BusSalesOrderVehicleService.java | 2 +- .../BusSalesVehicleOrderService.java | 2 +- .../CrmCustomerTempListQuery.java | 3 + .../CrmCustomerTempService.java | 25 ++++-- .../FinManufacturerBankQuery.java | 3 + .../FinManufacturerBankService.java | 18 +++-- .../FinPaymentrecordService.java | 3 +- .../SysOrganizationListQuery.java | 3 + .../SysOrganizationService.java | 12 ++- .../ScmVehicleEnterlibraryService.java | 3 +- .../saleOrders/model/NowCarVo.java | 1 + .../saleOrders/model/ReadyCarVo.java | 1 + 34 files changed, 214 insertions(+), 91 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java index dcc536842a..43d16e09c9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java @@ -88,4 +88,6 @@ public class BaseDiscountpackageDto implements Dto { @ApiModelProperty("销售车辆列表") private List baseDiscountpackageVehs; + + private String orgPath; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageQuery.java index 5aa917ba0c..5a30dee25f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageQuery.java @@ -46,4 +46,7 @@ public class BaseDiscountpackageQuery implements Query { @ApiModelProperty("结束有效期") private String getEffectiveEndDate; + + @ApiModelProperty("组织机构全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java index 52b3929812..c66bf32396 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java @@ -14,4 +14,6 @@ public class BaseManufUpdateDto implements Dto { private static final long serialVersionUID = -2909465832730619504L; @ApiModelProperty(value = "厂家认款sid") private String sid; + @ApiModelProperty("打款状态（0未打款，1已打款，2无需打款）") + private String state; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java index eb8f4197e4..acf24cdd93 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java @@ -14,4 +14,6 @@ public class BaseMiddleListQuery implements Query { private static final long serialVersionUID = 235157485806433620L; @ApiModelProperty("销售专员sid") private String staffSid; + @ApiModelProperty("组织机构sid全路径") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java index 9c5815cf28..fd071fde12 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java @@ -70,4 +70,7 @@ public class BaseModelModpriceDto implements Dto { @ApiModelProperty("调价申请车型列表") private List baseModelModpriceModels; // 调价申请车型列表 + + @ApiModelProperty("组织机构全路径sid") + private String orgPath; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 0bf2e7d208..1b7d01007d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -480,4 +480,9 @@ public interface BaseVehicleFeign { @GetMapping("/getSystem") @ResponseBody ResultBean getSystem(@RequestParam("sid")String sid); + + @ApiOperation("根据车辆sid获取采购系统信息：采购系统取自车辆表中") + @GetMapping("/getSystemVehicle") + @ResponseBody + ResultBean getSystemVehicle(@RequestParam("sid")String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 9238c87ad2..51c4cf3dd8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -387,6 +387,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getSystemVehicle(String sid) { + return null; + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid,List list) { return null; 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 d841ecc690..4de1a34a3e 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 @@ -128,4 +128,9 @@ public interface BusVehicleOrderFeign { @ResponseBody ResultBean getDetails(@RequestParam("sid")String sid); + @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段:采购系统sid取自表中") + @GetMapping("/getDetailsOrder") + @ResponseBody + ResultBean getDetailsOrder(@RequestParam("sid")String sid); + } \ 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 e122fdecfe..127e2cd39d 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 @@ -123,5 +123,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { return null; } + @Override + public ResultBean getDetailsOrder(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 355a30e57c..9ffe667daa 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -130,6 +130,10 @@ public class BaseDiscountpackageService extends MybatisBaseService= date_format('" + effectiveStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(effectiveEndDate), "date_format (effectiveDate,'%Y-%m-%d') <= date_format('" + effectiveEndDate + "','%Y-%m-%d')" ); + if(StringUtils.isNotBlank(pagerQuery.getOrgPath())){ + String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData(); + qw.eq("useOrg",orgSid); + } } return qw; @@ -143,75 +147,61 @@ public class BaseDiscountpackageService extends MybatisBaseService orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); + String orgPath = dto.getOrgPath(); + String orgSid = "";//分公司sid + String orgSidPath = "";//申请人组织机构全路径sid + if(StringUtils.isNotBlank(orgPath)){ + orgSidPath = orgPath; + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + }else{ + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); BaseDiscountpackage entity = new BaseDiscountpackage(); - String orgSid = ""; - ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid()); - if (stringResultBean.getSuccess()) { - orgSid = stringResultBean.getData(); - } - dto.setSid(UUID.randomUUID().toString()); - BeanUtil.copyProperties(dto, entity); + BeanUtil.copyProperties(dto, entity,"sid"); entity.setUseOrg(orgSid); entity.setNodeState("待提交"); entity.setOrgSidPath(orgSidPath); - save(entity); + baseMapper.insert(entity); List baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) { BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh(); - String sid = baseDiscountpackageVeh.getSid(); - BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh); - baseDiscountpackageVeh.setSid(sid); + BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid"); baseDiscountpackageVeh.setMainSid(entity.getSid()); baseDiscountpackageVehService.save(baseDiscountpackageVeh); } return rb.success().setData(entity.getSid()); } - /** - * 修改欠款提车信息 - * - * @param dto - * @param sid - * @return - */ @Transactional(rollbackFor = Exception.class) public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); + BaseDiscountpackage baseDiscountpackage = fetchBySid(sid); + if(baseDiscountpackage == null){ + return rb.setMsg("该申请不存在"); } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); - dto.setOrgSidPath(orgSidPath); - this.updateBySid(dto.toMap(), sid); + BeanUtil.copyProperties(dto,baseDiscountpackage, "sid","orgSidPath"); + baseMapper.updateById(baseDiscountpackage); baseDiscountpackageVehService.deleteByMainSid(sid); List baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) { BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh(); - String sid1 = baseDiscountpackageVeh.getSid(); - BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh); - baseDiscountpackageVeh.setSid(sid1); + BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid"); baseDiscountpackageVeh.setMainSid(sid); baseDiscountpackageVehService.save(baseDiscountpackageVeh); } return rb.success(); } - /** - * 根据sid批量删除欠款提车单 - * - * @param sids - * @return - */ @Transactional(rollbackFor = Exception.class) public ResultBean deleteBySids(String[] sids) { ResultBean rb = ResultBean.fireFail(); @@ -442,7 +432,10 @@ public class BaseDiscountpackageService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java index 344bc22253..9b7e7b9c24 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java @@ -72,5 +72,5 @@ public interface BaseManufactorSubscriptionMapper extends BaseMapper update base_manufactor_subscription - set paymentState = 1 + set paymentState = #{state} where sid = #{sid} \ No newline at end of file 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 7f4d08df60..c315e7b3f2 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 @@ -321,7 +321,8 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService { */ IPage getMiddleList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); - List selectMiddleList(String staffSid); + List selectMiddleList(@Param("userSid") String userSid,@Param("orgSid")String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml index ccc1d6345a..65df1e81f3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml @@ -74,6 +74,9 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java index 2e11c2a370..8188b2a57e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java @@ -154,8 +154,12 @@ public class BaseMiddlemanService extends MybatisBaseService list = new ArrayList<>(); //查询用户sid ResultBean sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid); + String orgSid = ""; + if(StringUtils.isNotBlank(query.getOrgPath())){ + orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + } if (sysUserVoResultBean.getSuccess()) { - list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid()); + list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid(),orgSid); for (BaseMiddleListVo baseMiddleListVo : list) { baseMiddleListVo.setMiddleNameAndCompany(baseMiddleListVo.getMiddleName().concat("-").concat(baseMiddleListVo.getCompany())); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index ac89843dc9..ab46a38cef 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -126,24 +126,31 @@ public class BaseModelModpriceService extends MybatisBaseService saveOrUpdateAll(BaseModelModpriceDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); + String orgPath = dto.getOrgPath(); + String orgSid = ""; + String orgSidPath = ""; + if(StringUtils.isNotBlank(orgPath)){ + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + orgSidPath = orgPath; + }else{ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + orgSidPath = orgByStaffSid.getData().getOrgSidPath(); } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + List baseModelModpriceModels = dto.getBaseModelModpriceModels(); if (StringUtils.isBlank(sid)) {//新增 BaseModelModprice baseModelModprice = new BaseModelModprice(); - String sid1 = baseModelModprice.getSid(); - BeanUtil.copyProperties(dto, baseModelModprice); - baseModelModprice.setSid(sid1); + BeanUtil.copyProperties(dto, baseModelModprice,"sid"); baseModelModprice.setCreateBySid(dto.getCreateBySid()); baseModelModprice.setNodeState("待提交"); baseModelModprice.setOrgSidPath(orgSidPath); @@ -151,7 +158,7 @@ public class BaseModelModpriceService extends MybatisBaseService resultBean = saveOrUpdateAll(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 67930d9778..d26a251e70 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -1318,6 +1318,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.getSystem(sid); } + @Override + public ResultBean getSystemVehicle(String sid) { + return baseVehicleService.getSystemVehicle(sid); + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid, List list) { return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 48ff57a380..07f2a88cd1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3571,4 +3571,13 @@ public class BaseVehicleService extends MybatisBaseService getSystemVehicle(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicle baseVehicle = fetchBySid(sid); + BasePurchSystemVo basePurchSystemVo = new BasePurchSystemVo(); + basePurchSystemVo.setSid(baseVehicle.getPurchaseSystemSid()); + basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + return rb.success().setData(basePurchSystemVo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java index 6dff08ad7c..5fd58afb9f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java @@ -227,4 +227,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { return busVehicleOrderService.getDetails(sid); } + @Override + public ResultBean getDetailsOrder(String sid) { + return busVehicleOrderService.getDetailsOrder(sid); + } + } 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 56138d2424..b8b6a1ff21 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 @@ -550,4 +550,13 @@ public class BusVehicleOrderService extends MybatisBaseService getDetailsOrder(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleApply busVehicleApply = baseMapper.selectApply(sid); + BasePurchSystemVo vo = new BasePurchSystemVo(); + vo.setSid(busVehicleApply.getOrgDeptSid()); + vo.setPurchaseSystemName(busVehicleApply.getOrgDeptName()); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 8c49065ace..ca8726df2a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerFileDDto; @@ -160,6 +161,9 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -1663,7 +1667,8 @@ public class CommonContractService extends MybatisBaseService future2 = pool.submit(() -> { + /* Future future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); }); Future future2_2 = pool.submit(() -> { @@ -2028,8 +2033,18 @@ public class CommonContractService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); + //更新销售订单的临时号 + if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 + for(int i = 0; i < vinList.size(); i++){ + //销售订单中车辆表的sid + String salesOrderVinSid = vinList.get(i).getSid(); + String temporaryNum = String.format("%02d", i + 1); + String temporaryNo = commonContract.getContractNo()+temporaryNum; + //更新临时号 + ResultBean busSalesOrderResultBean = busSalesOrderVehicleFeign.updateTemporaryNo(salesOrderVinSid,temporaryNo); + } + } //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金 String key = depositInfo.getDepositTypeKey(); BigDecimal bigDecimalKeyAll = new BigDecimal("0"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 6708dd9d76..ff0cd8edb6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -124,7 +124,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService 0) { String linkSid = nowCarList.get(0).getLinkSid(); //根据车辆sid查询采购系统sid和采购系统名称 - ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystem(linkSid); + ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid); if (vehicleSelectVoResultBean.getData() != null) { BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); //采购系统sid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java index 5a0485312f..fda59d9e47 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java @@ -131,7 +131,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService 0) { String linkSid = readyCarList.get(0).getLinkSid(); //根据采购订单查询采购系统的sid和采购系统的名称 - ResultBean getDetails = busVehicleOrderFeign.getDetails(linkSid); + ResultBean getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid); if(getDetails.getData() != null){ BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); //采购系统sid diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java index 97255c2000..e4851d32df 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.crm.api.crmcustomertemp; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -14,4 +15,6 @@ public class CrmCustomerTempListQuery implements Query { private String userSid; private String staffSid; + @ApiModelProperty("组织机构全路径sid") + private String orgPath; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 737ed9b14f..01f4c8f56a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -177,19 +177,24 @@ public class CrmCustomerTempService extends MybatisBaseService qw = new QueryWrapper<>(); String userSid = query.getUserSid(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData(); - String sid = ""; - if (sysOrganizationVo != null) { - sid = sysOrganizationVo.getSid(); - } + //根据用户的组织机构查询分公司 String orgSidPath = query.getOrgSidPath(); + String orgSid = "";//分公司sid + if(StringUtils.isNotBlank(orgSidPath)){ + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData(); + }else{ + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData(); + if (sysOrganizationVo != null) { + orgSid = sysOrganizationVo.getSid(); + } + } SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); String orgLevelKey = data.getOrgLevelKey(); if ("2".equals(orgLevelKey)) { orgSidPath = orgSidPath.substring(0, 73); qw.like("so.orgSidPath", orgSidPath); } else if ("3".equals(orgLevelKey)) { - qw.eq("cct.createOrgSid", sid); + qw.eq("cct.createOrgSid", orgSid); } if (StringUtils.isNotBlank(query.getCustomerTypeKey())) { qw.eq("cct.customerTypeKey", query.getCustomerTypeKey()); @@ -1139,7 +1144,13 @@ public class CrmCustomerTempService extends MybatisBaseService> rb = ResultBean.fireFail(); String staffSid = query.getStaffSid(); //根据用户sid查询分公司sid - String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); +// String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + String orgSid = ""; + if(StringUtils.isNotBlank(query.getOrgPath())){ + orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + }else{ + orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + } List list = baseMapper.selectCustomerList(orgSid, staffSid); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java index fb14abf5a9..c145715afd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java @@ -57,4 +57,7 @@ public class FinManufacturerBankQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("组织机构全路径sid") + private String orgPath; + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java index 89d433766c..18c028b8a6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java @@ -31,11 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery; -import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo; import com.yxt.anrui.fin.api.finmanufacturerbank.*; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; -import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.cnbankcnt.CNBankcntService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -50,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -84,11 +80,17 @@ public class FinManufacturerBankService extends MybatisBaseService qw = new QueryWrapper<>(); FinManufacturerBankQuery params = pq.getParams(); if (params != null) { - String userSid = params.getUserSid(); - if (StringUtils.isNotBlank(userSid)) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - qw.eq("useOrgSid", resultBean.getData()); + if(StringUtils.isNotBlank(params.getOrgPath())){ + String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("useOrgSid", orgSid); + }else{ + String userSid = params.getUserSid(); + if (StringUtils.isNotBlank(userSid)) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + qw.eq("useOrgSid", resultBean.getData()); + } } + if (StringUtils.isNotBlank(params.getDueBankKey())) { qw.eq("dueBankKey", params.getDueBankKey()); } 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 dba3f54738..a558a2c7df 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 @@ -56,7 +56,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -227,6 +226,7 @@ public class FinPaymentrecordService extends MybatisBaseService> selectOrgList(SysOrganizationListQuery query) { ResultBean> rb = ResultBean.fireFail(); //根据用户sid查询分公司sid - String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); - String orgSid = getOrgSid(orgDeptSid); + /*String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); + String orgSid = getOrgSid(orgDeptSid);*/ + String orgSid = ""; + String orgDeptSid = ""; + if(StringUtils.isNotBlank(query.getOrgPath())){ + orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData(); + }else{ + orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); + orgSid = getOrgSid(orgDeptSid); + } //根据分公司名称查询销售部门的部门 List sysOrganizationListVos = baseMapper.selectOrgList(orgSid); sysOrganizationListVos.removeAll(Collections.singleton(null)); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index d81a0e8c50..1b04caab2d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -44,7 +44,6 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.base.common.enums.ManPurOrderType; @@ -193,7 +192,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); ScmVehicleEnterlibraryPageQuery params = pq.getParams(); if(StringUtils.isNotBlank(params.getOrgPath())){ - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(pq.getParams().getUserSid()).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); params.setUseOrgSid(useOrgSid); }else{ String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java index a716a7b90c..16cc4d6ea5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java @@ -32,6 +32,7 @@ public class NowCarVo implements Vo { private String topSid; @ApiModelProperty("采购系统sid") + @JsonProperty("paySystemId") private String purchaseSystemSid; @ApiModelProperty("采购系统名称") @JsonProperty("paySystem") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java index 5522482d30..9dbd38c75d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java @@ -38,6 +38,7 @@ public class ReadyCarVo implements Vo { private String topSid; @ApiModelProperty("采购系统sid") + @JsonProperty("paySystemId") private String purchaseSystemSid; @ApiModelProperty("采购系统名称") @JsonProperty("paySystem") From 9205fb097ce96f8e70e081c6ca520308c6df477b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 18 Jan 2023 13:53:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=8A=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/busvehicleapply/BusVehicleApplyService.java | 6 ------ 1 file changed, 6 deletions(-) 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 f1117c090d..902d72ab39 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 @@ -155,12 +155,6 @@ public class BusVehicleApplyService extends MybatisBaseService Date: Wed, 18 Jan 2023 15:27:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/autoservice/saleOrders/AppBusSalesOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 0a4f5358d2..553124383c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -565,7 +565,7 @@ public class AppBusSalesOrderService { BeanUtil.copyProperties(insuranceDto, printConfirmDto); ResultBean> resultBean = commonContractFeign.printConfirm(printConfirmDto); if(!resultBean.getSuccess()){ - return rb.setMsg(resultBean.getMsg()); + return rb.setMsg(resultBean.getMsg()).setCode(resultBean.getCode()).setMessage(resultBean.getMessage()); } List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); From 0d685e0aa9d3dc929bc7fc1935059638a321dc50 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 18 Jan 2023 15:53:31 +0800 Subject: [PATCH 5/5] =?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 --- .../baseaccadjapply/BaseAccadjApplyQuery.java | 6 ++- .../BaseInternalPurchaseQuery.java | 6 ++- .../BaseManufacturerRetwareQuery.java | 6 ++- .../BaseOutsourcingApplicationQuery.java | 2 + .../BaseShuntingInvoicingApplyQuery.java | 6 ++- .../BaseVehinstallModprice.java | 2 + .../BaseVehinstallModpriceDetailsVo.java | 2 + .../BaseVehinstallModpriceDto.java | 2 + .../BaseVehinstallModpriceQuery.java | 4 +- .../BaseAccadjApplyService.java | 39 ++++++++------ .../BaseInternalPurchaseService.java | 39 ++++++++------ .../BaseManufacturerRetwareService.java | 6 ++- .../BaseOutsourcingApplicationService.java | 41 +++++---------- .../BaseShuntingInvoicingApplyService.java | 15 +++++- .../base/biz/basevehicle/BaseVehicleRest.java | 3 +- .../BaseVehinstallModpriceService.java | 51 ++++++++++++++----- .../BusVehicleApplyService.java | 1 - .../scmapplyinbound/ScmApplyInboundQuery.java | 6 ++- .../ScmVehicleReturnQuery.java | 2 + .../ScmApplyInboundService.java | 50 +++++++----------- .../ScmVehicleReturnService.java | 21 +++++--- 21 files changed, 183 insertions(+), 127 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java index 5b8f4f7f24..5a06595271 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyQuery.java @@ -61,6 +61,8 @@ public class BaseAccadjApplyQuery implements Query { private String callOutOrgSid; // 调出分公司sid @ApiModelProperty("调入分公司sid") private String callInOrgSid; // 调入分公司sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + /*@ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid*/ + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java index 86c77cd67c..4e304e65e4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java @@ -61,8 +61,10 @@ public class BaseInternalPurchaseQuery implements Query { private String sellerOrgSid; // 调出分公司sid @ApiModelProperty("调车类型key") private String shuntingTypeKey; // 调车类型key - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + /*@ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid*/ + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareQuery.java index 031891f1da..aca18663ef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareQuery.java @@ -53,8 +53,10 @@ public class BaseManufacturerRetwareQuery implements Query { private String appluStartDate; // 申请开始日期 @ApiModelProperty("申请结束日期") private String appluEndDate; // 申请结束日期 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + /*@ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid*/ + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; @ApiModelProperty("状态") private String state; // 状态 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java index 7e520eab44..ab95843d0f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java @@ -61,4 +61,6 @@ public class BaseOutsourcingApplicationQuery implements Query { private String userSid; // userSid @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java index 37bfb5e764..7d450ff62d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java @@ -57,6 +57,8 @@ public class BaseShuntingInvoicingApplyQuery implements Query { private String applyEndDate; // 申请结束日期 @ApiModelProperty("调出分公司sid") private String callOutOrgSid; // 调出分公司sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + /*@ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid*/ + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModprice.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModprice.java index 7aafba9e0d..02b2f85b83 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModprice.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModprice.java @@ -62,6 +62,8 @@ public class BaseVehinstallModprice extends BaseEntity { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @ApiModelProperty("当前组织机构全路径sid") + private String orgSidPath; @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id @ApiModelProperty("环节定义的sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDetailsVo.java index cad1d85761..65cabd0c46 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDetailsVo.java @@ -87,6 +87,8 @@ public class BaseVehinstallModpriceDetailsVo implements Vo { private String applyTitle; // 申请标题 @ApiModelProperty("申请人sid") private String createBySid; // 申请人sid + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; @ApiModelProperty("上装调教车辆表") private List baseVehinstallModpricedetails; // 上装调教车辆表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDto.java index 04f852b156..067af2d4c4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceDto.java @@ -72,6 +72,8 @@ public class BaseVehinstallModpriceDto implements Dto { private String applyTitle; // 申请标题 @ApiModelProperty("申请人sid") private String createBySid; // 申请人sid + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; @ApiModelProperty("上装调教车辆表") private List baseVehinstallModpricedetails; // 上装调教车辆表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceQuery.java index 909b6841db..20b17c44e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceQuery.java @@ -56,8 +56,8 @@ public class BaseVehinstallModpriceQuery implements Query { private String createStartTime; // 申请开始日期 @ApiModelProperty("申请结束日期") private String createEndTime; // 申请结束日期 - //@ApiModelProperty("申请人sid") - //private String createBySid; // 申请人sid + @ApiModelProperty("申请人sid") + private String createBySid; // 申请人sid @ApiModelProperty("流程状态") private String nodeState; // 流程状态 @ApiModelProperty("当前组织机构的全路径sid") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index b5ba963dcf..d7738f2794 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -152,7 +152,11 @@ public class BaseAccadjApplyService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" ); - qw.eq("createOrgSid", query.getCreateOrgSid()); + //qw.eq("createOrgSid", query.getCreateOrgSid()); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("createOrgSid",orgPath); + } if (StringUtils.isNotBlank(query.getAccadjTypeKey())) { qw.eq("accadjTypeKey", query.getAccadjTypeKey()); } @@ -173,23 +177,28 @@ public class BaseAccadjApplyService extends MybatisBaseService saveOrUpdateDto(BaseAccadjApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgSidPath())){ + orgPath = dto.getOrgSidPath(); + }else { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + orgPath = staffOrgResultBean.getData().getOrgSidPath(); + } List accSids = dto.getAccSids(); if (StringUtils.isBlank(dtoSid)) {//新增 dto.setApplyDate(DateUtil.today()); dto.setNodeState("待提交"); - dto.setOrgSidPath(orgSidPath); + dto.setOrgSidPath(orgPath); ResultBean resultBean = this.insertByDto(dto); String sid = (String) resultBean.getData(); for (String accSid : accSids) { @@ -204,7 +213,7 @@ public class BaseAccadjApplyService extends MybatisBaseService qw = new QueryWrapper<>(); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); - qw.eq("bip.createOrgSid", query.getCreateOrgSid()); + //qw.eq("bip.createOrgSid", query.getCreateOrgSid()); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("bip.createOrgSid",orgPath); + } qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bip.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (bip.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); @@ -204,18 +208,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService saveAll(BaseInternalPurchaseDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); - } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgSidPath())){ + orgPath = dto.getOrgSidPath(); + }else { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + orgPath = orgByStaffSid.getData().getOrgSidPath(); + } List baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); if (baseInternalPurchaseVehicles.size() < 1) { return rb.setMsg("请选择调车申请车辆"); @@ -239,7 +248,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService listPageVo(PagerQuery pq) { BaseManufacturerRetwareQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid", query.getCreateOrgSid()); + //qw.eq("createOrgSid", query.getCreateOrgSid()); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("createOrgSid",orgPath); + } if (StringUtils.isNotBlank(query.getState())) { qw.eq("state", query.getState()); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index ff795ce744..90b9de4533 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -157,34 +157,16 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService listPageVo(PagerQuery pq) { BaseOutsourcingApplicationQuery query = pq.getParams(); - String staffSid = query.getStaffSid(); - ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); - List data = sysStaffOrgListByStaffSid.getData(); - String orgSidPath = ""; - for (SysStaffOrgVo datum : data) { - orgSidPath = datum.getOrgSidPath(); - String[] split = orgSidPath.split("/"); - for (String s : split) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); - SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); - Integer isDept = data1.getIsDept(); - String psid = data1.getPsid(); - if (isDept != null) { - if (isDept == 0 && !psid.equals(0)) { - orgSidPath = s; - break; - } - } - } - } - query.setUseOrgSid(orgSidPath); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -194,9 +176,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos(); CommonAppendix contract = dto.getContract(); @@ -253,7 +240,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" ); - qw.eq("createOrgSid", query.getCreateOrgSid()); + //qw.eq("createOrgSid", query.getCreateOrgSid()); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("createOrgSid",orgPath); + } if (StringUtils.isNotBlank(query.getCallOutOrgSid())) { qw.eq("callOutOrgSid", query.getCallOutOrgSid()); } @@ -132,6 +136,12 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) { ResultBean rb = ResultBean.fireFail(); + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgSidPath())){ + orgPath = dto.getOrgSidPath(); + }else { + + } //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); if (!userVoResultBean.getSuccess()) { @@ -271,7 +281,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - //qw.eq("createBySid", query.getCreateBySid()); + qw.eq("createBySid", query.getCreateBySid()); if(StringUtils.isNotBlank(query.getOrgPath())){ String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); qw.eq("createOrgSid",orgPath); @@ -127,6 +127,24 @@ public class BaseVehinstallModpriceService extends MybatisBaseService saveOrUpdateDto(BaseVehinstallModpriceDto dto) { ResultBean rb = ResultBean.fireFail(); + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())){ + orgPath = dto.getOrgPath(); + }else { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + orgPath = orgByStaffSid.getData().getOrgSidPath(); + } + dto.setOrgPath(orgPath); String dtoSid = dto.getSid(); List baseVehinstallModpricedetails = dto.getBaseVehinstallModpricedetails(); if (StringUtils.isBlank(dtoSid)) {//新增 @@ -156,6 +174,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())){ + orgPath = dto.getOrgPath(); + }else { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + orgPath = orgByStaffSid.getData().getOrgSidPath(); } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); BaseVehinstallModprice baseVehinstallModprice = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseVehinstallModprice); if (r == 3) { @@ -217,6 +241,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -229,7 +254,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService page = PagerUtil.queryToPage(pq); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java index 4f9155a2fd..b4def33bca 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java @@ -30,6 +30,8 @@ public class ScmApplyInboundQuery implements Query { private String modelName; @ApiModelProperty("排产申请编号") private String applicationCode; - @ApiModelProperty("创建组织sid") - private String createOrgSid; + /*@ApiModelProperty("创建组织sid") + private String createOrgSid;*/ + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java index cbe2c70ccb..f1942060d7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java @@ -20,4 +20,6 @@ public class ScmVehicleReturnQuery implements Query { private String nodeState; @ApiModelProperty(value = "用户sid") private String userSid; + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index d268b43117..bd1c103079 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -154,7 +154,11 @@ public class ScmApplyInboundService extends MybatisBaseService saveOrUpdateApplyInBound(ScmApplyInboundDto dto) { - ResultBean rb = ResultBean.fireFail(); List scmFiles = dto.getScmFiles(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); - // 验证车架号：不能为空、不能重复 - /*List vehicleList1 = dto.getVehicleList(); - List vinNoList1 = vehicleList1.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); - if (vehicleList.size() != vinNoList.size()) { - return new ResultBean().fail().setMsg("车架号不能为空"); - }*/ - // 去重 - /*long disCount = vinNoList1.stream().distinct().count(); - if (vinNoList1.size() != disCount) { - return new ResultBean().fail().setMsg("车架号不能重复"); - }*/ + String orgPath = ""; + if (StringUtils.isNotBlank(dto.getOrgSidPath())){ + orgPath = dto.getOrgSidPath(); + }else { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + //用户的组织全路径 + orgPath = orgByStaffSid.getData().getOrgSidPath(); + } if (StringUtils.isBlank(dto.getSid())) { // 新增 - // 验证数据库是否重复 - /* for (int i = 0; i < vinNoList.size(); i++) { - int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), ""); - if (count != 0) { - return new ResultBean().setMsg("车架号已经存在"); - } - }*/ ScmApplyInbound inboundVehicle = new ScmApplyInbound(); BeanUtil.copyProperties(dto, inboundVehicle); inboundVehicle.setSid(UUID.randomUUID().toString()); - /*String userSid = dto.getUserSid(); - ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); - String createOrgSid = pathSidByUserSid.getData(); - inboundVehicle.setUseOrgSid(createOrgSid);*/ - inboundVehicle.setOrgSidPath(orgSidPath); + inboundVehicle.setOrgSidPath(orgPath); save(inboundVehicle); - // 保存车辆列表 - //scmApplyInboundVehicleService.saveApplyInboundVehicleList(vehicleList, inboundVehicle.getSid(), inboundVehicle.getModelSid()); String num = dto.getNum(); if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) { int i = Integer.parseInt(num); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 228320bd87..033d166e52 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -97,10 +97,15 @@ public class ScmVehicleReturnService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid()); - //取组织架构的全路径sid - SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData(); - String orgSidPath = sysStaffOrg.getOrgSidPath(); + String orgPath = ""; + if (StringUtils.isNotBlank(scmVehicleReturnDto.getOrgSidPath())){ + orgPath = scmVehicleReturnDto.getOrgSidPath(); + }else { + ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid()); + //取组织架构的全路径sid + SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData(); + orgPath = sysStaffOrg.getOrgSidPath(); + } String sid = scmVehicleReturnDto.getSid(); if (StringUtils.isBlank(sid)) { //新增 @@ -116,7 +121,7 @@ public class ScmVehicleReturnService extends MybatisBaseService scmVehicleReturnDetailsList = scmVehicleReturnDetailsService.selectByReturnSid(sid); @@ -192,6 +197,10 @@ public class ScmVehicleReturnService extends MybatisBaseService pagging = baseMapper.pagerList(page, qw);