FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准 发布搞

Browse Source
This commit is contained in:
yuezhihang
2021-07-08 21:04:18 +08:00
parent 0a5b8d8580
commit 4b8aac9bc4
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+4 -4
View File
@@ -37,18 +37,18 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
@ApiOperation(value = "分解单查询")
@GetMapping("/findAllItems")
public ResponseMessage findAllItems(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size,String type,String ids){
public ResponseMessage findAllItems( String type,String ids){
if (!StringUtils.isEmpty(ids) && ids.contains(",")){
String[] Sids=ids.split(",");
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,Sids);
return Result.success("200",ItemDto);
}else if (!StringUtils.isEmpty(ids)){
String[] Sids=new String[1];
Sids[0]=ids;
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,Sids);
return Result.success("200",ItemDto);
}else {
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,null);
List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,null);
return Result.success("200",ItemDto);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+1 -1
View File
@@ -53,5 +53,5 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SelectionResult> selectAllItemsSvpps(SarStandItems sarStandItemsEO);
List<SarStandItemsDto> selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids);
List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
return actitemsEOList;
}
public List<SarStandItemsDto> findAllItems(int Page,int Size,String type,String[] ids){
return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids);
public List<SarStandItemsDto> findAllItems(String type,String[] ids){
return dao.selectAllItemsByIds(type,ids);
}
}