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] =?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);