From 301ba42d65b3c31b6b35b1c7ec7339cbe44c65f4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 13 Dec 2021 16:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BB=A5=E5=8F=8A=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=88=B0=E5=BC=80=E8=80=80=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=8A=A0=E4=BA=86=E5=A4=87=E6=B3=A8=20=E6=88=91?= =?UTF-8?q?=E5=85=88=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B=20=E7=AD=89?= =?UTF-8?q?=E5=BC=80=E8=80=80=E5=9B=9E=E6=9D=A5=E7=9C=8B=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandFileEOServiceImpl.java | 8 ++++---- .../com/adc/da/sys/controller/UserEOController.java | 11 +++++++++++ .../src/main/java/com/adc/da/sys/dao/UserEODao.java | 3 +++ .../java/com/adc/da/sys/entity/UserPhoneDTO.java | 13 +++++++++++++ .../java/com/adc/da/sys/service/IUserEOService.java | 4 ++++ .../adc/da/sys/service/impl/UserEOServiceImpl.java | 10 ++++++---- .../resources/mybatis/mapper/sys/UserEOMapper.xml | 10 ++++++++++ 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 3713a30a..848d2eed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); - + //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("ORI_ATT_ID",item.getOriAttId()) - .eq("USE_MODEL","SOURCE_FILE"); - SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); - item.setFileOldName(sarStandFileEO.getFileName()); + .eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME"); + List sarStandFileEO = sarStandFileEODao.selectList(wrapper); + item.setFileOldName(sarStandFileEO.get(0).getFileOldName()); }); return sarStandFileEOS; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 9e48c42c..909c6720 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -9,6 +9,7 @@ import com.adc.da.http.Result; import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; import com.adc.da.sys.service.IRoleEOService; @@ -66,6 +67,16 @@ public class UserEOController extends BaseController { return Result.success(userVO); } + + + @ApiOperation(value = "|UserEO|详情") + @GetMapping("/getUserByPhone") +// @RequiresPermissions("sys:user:get") + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ + List userPhoneDTOS=userEOService.getUserByName(name); + return Result.success(userPhoneDTOS); + } + @ApiOperation(value = "|UserEO|详情接口") @GetMapping("/getById") public ResponseMessage getByIdFeignClient(String id) throws Exception { diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index 7350abc3..feb6b27f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -2,6 +2,7 @@ package com.adc.da.sys.dao; import com.adc.da.base.page.BasePage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -171,5 +172,7 @@ public interface UserEODao extends BaseMapper { public UserEO getUserEOByAccountNotDeleted(String account); + //手机端接口 只查人 + List getUserByName(@Param("name") String name); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java new file mode 100644 index 00000000..b7e6e3b4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.sys.entity; + +import lombok.Data; + +@Data +public class UserPhoneDTO { + + private String usId; + + private String userName; + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 3e3e70ec..2ac157e6 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -3,6 +3,7 @@ package com.adc.da.sys.service; import com.adc.da.base.page.BasePage; import com.adc.da.http.ResponseMessage; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserPhoneDTO; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.vo.RoleUserVO; @@ -75,5 +76,8 @@ public interface IUserEOService extends IService { public UserEO getUserByLoginNameNotDeleted(String userName); + //手机端接口 只查人 + List getUserByName(String name); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index b98902f4..2f8b0bec 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -8,10 +8,7 @@ import com.adc.da.sys.constant.ValidFlagEnum; import com.adc.da.sys.dao.OrgEODao; import com.adc.da.sys.dao.UserEODao; import com.adc.da.sys.dao.UserInfoEODao; -import com.adc.da.sys.entity.OrgEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserInfoEO; -import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.entity.*; import com.adc.da.sys.page.RoleUserEOPage; import com.adc.da.sys.page.UserEOPage; import com.adc.da.sys.service.IOrgEOService; @@ -514,4 +511,9 @@ public class UserEOServiceImpl extends ServiceImpl implements return userEO; } + @Override + public List getUserByName(String name) { + return this.baseMapper.getUserByName(name); + } + } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index c0bb3b8a..d3ccac97 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -793,4 +793,14 @@ + +