手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下
This commit is contained in:
+4
-4
@@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
|
|||||||
|
|
||||||
queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
|
queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
|
||||||
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
|
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
|
||||||
|
//开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下
|
||||||
sarStandFileEOS.forEach(item->{
|
sarStandFileEOS.forEach(item->{
|
||||||
QueryWrapper<SarStandFileEO> wrapper = new QueryWrapper<>();
|
QueryWrapper<SarStandFileEO> wrapper = new QueryWrapper<>();
|
||||||
wrapper.eq("ORI_ATT_ID",item.getOriAttId())
|
wrapper.eq("ORI_ATT_ID",item.getOriAttId())
|
||||||
.eq("USE_MODEL","SOURCE_FILE");
|
.eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME");
|
||||||
SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper);
|
List<SarStandFileEO> sarStandFileEO = sarStandFileEODao.selectList(wrapper);
|
||||||
item.setFileOldName(sarStandFileEO.getFileName());
|
item.setFileOldName(sarStandFileEO.get(0).getFileOldName());
|
||||||
});
|
});
|
||||||
|
|
||||||
return sarStandFileEOS;
|
return sarStandFileEOS;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.adc.da.http.Result;
|
|||||||
import com.adc.da.sys.constant.ValidFlagEnum;
|
import com.adc.da.sys.constant.ValidFlagEnum;
|
||||||
import com.adc.da.sys.entity.RoleEO;
|
import com.adc.da.sys.entity.RoleEO;
|
||||||
import com.adc.da.sys.entity.UserEO;
|
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.page.UserEOPage;
|
||||||
import com.adc.da.sys.service.IOrgEOService;
|
import com.adc.da.sys.service.IOrgEOService;
|
||||||
import com.adc.da.sys.service.IRoleEOService;
|
import com.adc.da.sys.service.IRoleEOService;
|
||||||
@@ -66,6 +67,16 @@ public class UserEOController extends BaseController<UserEO> {
|
|||||||
return Result.success(userVO);
|
return Result.success(userVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation(value = "|UserEO|详情")
|
||||||
|
@GetMapping("/getUserByPhone")
|
||||||
|
// @RequiresPermissions("sys:user:get")
|
||||||
|
public ResponseMessage<List<UserPhoneDTO>> getUserByName(@RequestParam(required = false,value = "name")String name){
|
||||||
|
List<UserPhoneDTO> userPhoneDTOS=userEOService.getUserByName(name);
|
||||||
|
return Result.success(userPhoneDTOS);
|
||||||
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "|UserEO|详情接口")
|
@ApiOperation(value = "|UserEO|详情接口")
|
||||||
@GetMapping("/getById")
|
@GetMapping("/getById")
|
||||||
public ResponseMessage<UserVO> getByIdFeignClient(String id) throws Exception {
|
public ResponseMessage<UserVO> getByIdFeignClient(String id) throws Exception {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.adc.da.sys.dao;
|
|||||||
|
|
||||||
import com.adc.da.base.page.BasePage;
|
import com.adc.da.base.page.BasePage;
|
||||||
import com.adc.da.sys.entity.UserEO;
|
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.RoleUserEOPage;
|
||||||
import com.adc.da.sys.page.UserEOPage;
|
import com.adc.da.sys.page.UserEOPage;
|
||||||
import com.adc.da.sys.vo.RoleUserVO;
|
import com.adc.da.sys.vo.RoleUserVO;
|
||||||
@@ -171,5 +172,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
|
|||||||
|
|
||||||
public UserEO getUserEOByAccountNotDeleted(String account);
|
public UserEO getUserEOByAccountNotDeleted(String account);
|
||||||
|
|
||||||
|
//手机端接口 只查人
|
||||||
|
List<UserPhoneDTO> getUserByName(@Param("name") String name);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package com.adc.da.sys.entity;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class UserPhoneDTO {
|
||||||
|
|
||||||
|
private String usId;
|
||||||
|
|
||||||
|
private String userName;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ package com.adc.da.sys.service;
|
|||||||
import com.adc.da.base.page.BasePage;
|
import com.adc.da.base.page.BasePage;
|
||||||
import com.adc.da.http.ResponseMessage;
|
import com.adc.da.http.ResponseMessage;
|
||||||
import com.adc.da.sys.entity.UserEO;
|
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.RoleUserEOPage;
|
||||||
import com.adc.da.sys.page.UserEOPage;
|
import com.adc.da.sys.page.UserEOPage;
|
||||||
import com.adc.da.sys.vo.RoleUserVO;
|
import com.adc.da.sys.vo.RoleUserVO;
|
||||||
@@ -75,5 +76,8 @@ public interface IUserEOService extends IService<UserEO> {
|
|||||||
|
|
||||||
public UserEO getUserByLoginNameNotDeleted(String userName);
|
public UserEO getUserByLoginNameNotDeleted(String userName);
|
||||||
|
|
||||||
|
//手机端接口 只查人
|
||||||
|
List<UserPhoneDTO> getUserByName(String name);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,10 +8,7 @@ import com.adc.da.sys.constant.ValidFlagEnum;
|
|||||||
import com.adc.da.sys.dao.OrgEODao;
|
import com.adc.da.sys.dao.OrgEODao;
|
||||||
import com.adc.da.sys.dao.UserEODao;
|
import com.adc.da.sys.dao.UserEODao;
|
||||||
import com.adc.da.sys.dao.UserInfoEODao;
|
import com.adc.da.sys.dao.UserInfoEODao;
|
||||||
import com.adc.da.sys.entity.OrgEO;
|
import com.adc.da.sys.entity.*;
|
||||||
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.page.RoleUserEOPage;
|
import com.adc.da.sys.page.RoleUserEOPage;
|
||||||
import com.adc.da.sys.page.UserEOPage;
|
import com.adc.da.sys.page.UserEOPage;
|
||||||
import com.adc.da.sys.service.IOrgEOService;
|
import com.adc.da.sys.service.IOrgEOService;
|
||||||
@@ -514,4 +511,9 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
|
|||||||
return userEO;
|
return userEO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<UserPhoneDTO> getUserByName(String name) {
|
||||||
|
return this.baseMapper.getUserByName(name);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -793,4 +793,14 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getUserByName" resultType="com.adc.da.sys.entity.UserPhoneDTO">
|
||||||
|
select USID as usId ,concat( UNAME,concat(concat('(',ts_user.USID),')')) as userName from ts_user
|
||||||
|
where 1=1
|
||||||
|
<if test="name != null and name != '' ">
|
||||||
|
ts_user.UNAME like concat(concat('%',#{name}),'%') or
|
||||||
|
ts_user.USID like concat(concat('%',#{name}),'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user