From a765d9b825c9fd213edf8e23cb0b0de50ae290a0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 6 Jun 2022 19:38:50 +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 --- .../basedistributor/BaseDistributorVo.java | 8 ++-- .../BaseVehicleCertificate.java | 3 ++ .../BaseVehicleCertificateDetailsVo.java | 3 ++ .../BaseVehicleCertificateDto.java | 3 ++ .../BaseVehicleModelFeign.java | 4 +- .../BaseVehicleModelFeignFallback.java | 2 +- .../basedistributor/BaseDistributorMapper.xml | 2 +- .../BaseDistributorService.java | 15 ------ .../BaseVehicleCertificateMapper.xml | 2 + .../BaseVehicleModelRest.java | 12 ++++- .../BaseVehicleModelService.java | 11 ----- .../sysorganization/SysOrganizationFeign.java | 5 ++ .../SysOrganizationFeignFallback.java | 6 +++ .../api/sysstaffinfo/SysStaffinfoFeign.java | 22 +++++++++ .../SysStaffinfoFeignFallback.java | 11 +++++ .../SysOrganizationMapper.java | 3 ++ .../sysorganization/SysOrganizationMapper.xml | 11 +++++ .../sysorganization/SysOrganizationRest.java | 7 +++ .../SysOrganizationService.java | 5 ++ .../biz/sysstaffinfo/SysStaffinfoMapper.java | 5 ++ .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 46 ++++++++++++------- .../biz/sysstaffinfo/SysStaffinfoRest.java | 15 ++++++ .../biz/sysstaffinfo/SysStaffinfoService.java | 28 +++++++++++ .../api/scmwarehouse/ScmWarehouseQuery.java | 4 +- .../biz/scmwarehouse/ScmWarehouseService.java | 4 +- 25 files changed, 181 insertions(+), 56 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java index 39bbd7f491..c539353c78 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java @@ -62,11 +62,11 @@ public class BaseDistributorVo implements Vo { @ApiModelProperty("创建组织（陕汽必须字段）") private String createOrg; -// @ApiModelProperty(value = "使用组织sid：string类型") -// private String useOrgSid; + @ApiModelProperty(value = "使用组织sid：string类型") + private String useOrgSid; - @ApiModelProperty(value = "使用组织sid:List类型") - private String[][] useOrg; + /*@ApiModelProperty(value = "使用组织sid:List类型") + private String[][] useOrg;*/ @ApiModelProperty(value = "使用组织名称") private String useOrgName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java index bf1c7c1f56..b04dfacafd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java @@ -141,6 +141,9 @@ public class BaseVehicleCertificate extends BaseEntity { @ApiModelProperty("合格证照片（陕汽必须字段）") private String certificatePhoto; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java index 3c8c4538e3..bd623d7576 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java @@ -134,6 +134,9 @@ public class BaseVehicleCertificateDetailsVo implements Vo { @ApiModelProperty("底盘型号（陕汽必须字段）") private String chassisModel; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java index f3bb53b549..e763cad1c3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java @@ -144,6 +144,9 @@ public class BaseVehicleCertificateDto implements Dto { @ApiModelProperty("底盘型号（陕汽必须字段）") private String chassisModel; + @ApiModelProperty("公告型号") + private String noticeModel; + @ApiModelProperty("备注（陕汽必须字段）") private String remarks; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index 35b41863b3..94ec2d9f32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -104,8 +104,8 @@ public interface BaseVehicleModelFeign { * @return */ @ApiOperation("修改回显") - @GetMapping("/getAll/{sid}") - public ResultBean getAll(@PathVariable("sid") String sid); + @GetMapping("/getAll/{sid}/{userSid}") + public ResultBean getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid); /** diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index af73de0e41..014b25e60f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -59,7 +59,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { @Override - public ResultBean getAll(String sid) { + public ResultBean getAll(String sid,String userSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 07d3350e8e..cbb0e02f16 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -94,7 +94,7 @@ bd.address, bd.zipCode, bd.createOrg, - + bd.useOrg useOrgSid, bd.useOrgName from base_distributor bd where sid = #{sid}; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 96bcfe0943..457ee11f56 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -206,21 +206,6 @@ public class BaseDistributorService extends MybatisBaseService list = Arrays.asList(baseDistributor.getUseOrg().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - baseDistributorVo.setUseOrg(s); - } return baseDistributorVo; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml index 63621df5a7..5fcd11dfd5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml @@ -134,6 +134,8 @@ bvc.power, bvc.chassisModel, + + bvc.noticeModel, bvc.remarks from base_vehicle_certificate bvc diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java index ef0582b2da..e7027a8639 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java @@ -163,12 +163,22 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean getAll(String sid) { + public ResultBean getAll(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid); if (vo == null) { return rb.setMsg("该车型信息不存在"); } + int i3 = baseVehmodelConfigService.checkByModelSid(sid); + if (i3 > 0){ + return rb.setMsg("该车型已有关联配置，无法修改"); + } + ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = useOrgByUserSid.getData().getSid(); + int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid); + if (i4 == 0){ + return rb.setMsg("该车型不属于当前分公司，无法修改"); + } return rb.success().setData(vo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index d2b1062cc9..0714bb3a32 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -544,17 +544,6 @@ public class BaseVehicleModelService extends MybatisBaseService 0){ - return rb.setMsg("该车型已有关联配置，无法修改"); - } - String userSid = dto.getUserSid(); - ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); - String sid1 = useOrgByUserSid.getData().getSid(); - int i4 = this.checkByCreateOrgAndModelSid(sid1, sid); - if (i4 == 0){ - return rb.setMsg("该车型不属于当前分公司，无法修改"); - } dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue()); dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue()); String modelName = dto.getModelName(); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 5d64a26996..97c104c763 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -105,6 +105,11 @@ public interface SysOrganizationFeign { @GetMapping("/selectBySid") ResultBean selectBySid(@RequestParam("sid") String sid); + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); + /** * 查询公司所有的部门 * diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index e1a470ef10..d7b1664ffe 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -112,6 +113,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { return null; } + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + return null; + } + @Override public ResultBean> selectListOne() { return null; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index c3ce6e78f7..12c66500f2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -83,6 +84,26 @@ public interface SysStaffinfoFeign { @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); + /** + * 获取集团内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffName") + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName); + + /** + * 获取部门内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffNameByDeptSid") + public ResultBean>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid); + @ApiOperation("获取App通讯录") @ResponseBody @@ -104,4 +125,5 @@ public interface SysStaffinfoFeign { @GetMapping("/selectStaffList") ResultBean> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 28328879d8..cfa7bf12a2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -50,6 +51,16 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean>> getStaffName(String staffName) { + return null; + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + return null; + } + @Override public ResultBean selectAppContactsList(String names) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfoselectAppContactsList无法访问"); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 1375fb0cd1..c2487e9076 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -99,4 +100,6 @@ public interface SysOrganizationMapper extends BaseMapper { @Select("select * from sys_organization WHERE staffSid=#{sid}") SysOrganizationVo getUseOrgByStaffSid(String sid); + + List> selectUseOrgSidBySid(String psid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 295251961c..57bd0b375d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -153,4 +153,15 @@ WHERE so.sid = #{sid} ORDER BY so.sort ASC + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index fef20725d8..8ab39112cf 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -216,6 +216,13 @@ public class SysOrganizationRest implements SysOrganizationFeign { return new ResultBean().success().setData(sysOrganization); } + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List> maps = sysOrganizationService.selectUseOrgSidBySid(sid); + return rb.success().setData(maps); + } + /** * 查询公司所有的部门 * diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 5c2be390c6..7185b9700a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -377,4 +377,9 @@ public class SysOrganizationService extends MybatisBaseService> selectUseOrgSidBySid(String sid) { + SysOrganization sysOrganization = fetchBySid(sid); + String psid = sysOrganization.getPsid(); + return baseMapper.selectUseOrgSidBySid(psid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index 83a5b9ae06..071f15e137 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -110,4 +111,8 @@ public interface SysStaffinfoMapper extends BaseMapper { * @return */ List selectStaffList(String orgSid); + + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); + + List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 38bf794811..978057c1e9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -8,22 +8,23 @@ resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsVo"> SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff - LEFT JOIN sys_user user ON staff.sid = user.staffSid + LEFT JOIN sys_user user + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -65,15 +67,15 @@ IFNULL(NULL, 0) AS staffNum FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid - LEFT JOIN sys_user user ON staff.sid = user.staffSid + LEFT JOIN sys_user user + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} - select sso.staffSid,si.name staffName from sys_staff_org sso - left join sys_staffinfo si on sso.staffSid = si.sid - where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',',')) + select sso.staffSid, si.name staffName + from sys_staff_org sso + left join sys_staffinfo si on sso.staffSid = si.sid + where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ',')) + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index bef147f7d2..2e52daf5ae 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.List; +import java.util.Map; /** * Project: anrui_portal(门户建设)
@@ -131,6 +132,20 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return rb.success().setData(sysStaffinfo); } + @Override + public ResultBean>> getStaffName(String staffName) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffName(staffName); + return rb.success().setData(staffNameList); + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName,deptSid); + return rb.success().setData(staffNameList); + } + @Override public ResultBean> selectAppContactsList(String names) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 6a3b28adbd..5e1f862597 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -192,6 +193,14 @@ public class SysStaffinfoService extends MybatisBaseService> getStaffName(String staffName) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("name", staffName); + } + qw.eq("isDelete",0); + return baseMapper.getStaffName(qw); + } + + public List> getStaffNameByDeptSid(String staffName, String deptSid) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("name", staffName); + } + //qw.eq("") + qw.eq("isDelete",0); + return baseMapper.getStaffNameByDeptSid(qw); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java index 71f6a60d52..b601a994ba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java @@ -60,8 +60,8 @@ public class ScmWarehouseQuery implements Query { @ApiModelProperty("名称") private String warehouseName; // 名称 - @ApiModelProperty("仓库属性") - private String warehouseAttribute; // 仓库属性 + @ApiModelProperty("详细地址") + private String warehouseAttribute; // 详细地址 @ApiModelProperty("仓库负责人") private String warehouseContract; // 仓库负责人 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 2942f58b3f..a8dc0fbc85 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -71,11 +71,11 @@ public class ScmWarehouseService extends MybatisBaseService