Merge pull request 'yanyang' (#26) from yanyang into master
Reviewed-on: #26
This commit is contained in:
commit
d62c7bf447
@ -48,7 +48,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
|
||||
@Override
|
||||
public PageData<WoCompensationPowerDTO> page (Map<String, Object> params){
|
||||
IPage<WoCompensationPower> page = baseDao.selectPage(
|
||||
getPage(params, WoCompensationPower.ID, true),
|
||||
getPage(params, WoCompensationPower.CREATE_TIME, false),
|
||||
getWrapper(params)
|
||||
);
|
||||
return getPageData(page, WoCompensationPowerDTO.class);
|
||||
|
@ -142,6 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
|
||||
WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
|
||||
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
|
||||
wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME);
|
||||
List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
|
||||
dto.setSubstrateList(woPackagingBoxSubstrateList);
|
||||
return dto;
|
||||
|
@ -58,7 +58,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
|
||||
@Override
|
||||
public PageData<WoPackagingBoxSubstrateDTO> page (Map<String, Object> params){
|
||||
IPage<WoPackagingBoxSubstrate> page = baseDao.selectPage(
|
||||
getPage(params, WoPackagingBoxSubstrate.SLOT, true),
|
||||
getPage(params, WoPackagingBoxSubstrate.CREATE_TIME, false),
|
||||
getWrapper(params)
|
||||
);
|
||||
return getPageData(page, WoPackagingBoxSubstrateDTO.class);
|
||||
|
@ -48,7 +48,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
|
||||
@Override
|
||||
public PageData<WoPowerLevelDTO> page (Map<String, Object> params){
|
||||
IPage<WoPowerLevel> page = baseDao.selectPage(
|
||||
getPage(params, WoPowerLevel.ID, true),
|
||||
getPage(params, WoPowerLevel.CREATE_TIME, false),
|
||||
getWrapper(params)
|
||||
);
|
||||
return getPageData(page, WoPowerLevelDTO.class);
|
||||
|
Loading…
Reference in New Issue
Block a user