CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'yanyang' (#26) from yanyang into master

Browse Source 
Reviewed-on: #26
This commit is contained in:
闫阳 2023-03-22 14:10:49 +08:00
commit d62c7bf447
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
View File

@ -48,7 +48,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Override @Override
public PageData<WoCompensationPowerDTO> page (Map<String, Object> params){ public PageData<WoCompensationPowerDTO> page (Map<String, Object> params){
IPage<WoCompensationPower> page = baseDao.selectPage( IPage<WoCompensationPower> page = baseDao.selectPage(
getPage(params, WoCompensationPower.ID, true), getPage(params, WoCompensationPower.CREATE_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, WoCompensationPowerDTO.class); return getPageData(page, WoCompensationPowerDTO.class);

1
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@ -142,6 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class); WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>(); QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo()); wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME);
List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper); List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
dto.setSubstrateList(woPackagingBoxSubstrateList); dto.setSubstrateList(woPackagingBoxSubstrateList);
return dto; return dto;

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@ -58,7 +58,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Override @Override
public PageData<WoPackagingBoxSubstrateDTO> page (Map<String, Object> params){ public PageData<WoPackagingBoxSubstrateDTO> page (Map<String, Object> params){
IPage<WoPackagingBoxSubstrate> page = baseDao.selectPage( IPage<WoPackagingBoxSubstrate> page = baseDao.selectPage(
getPage(params, WoPackagingBoxSubstrate.SLOT, true), getPage(params, WoPackagingBoxSubstrate.CREATE_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, WoPackagingBoxSubstrateDTO.class); return getPageData(page, WoPackagingBoxSubstrateDTO.class);

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java
View File

@ -48,7 +48,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Override @Override
public PageData<WoPowerLevelDTO> page (Map<String, Object> params){ public PageData<WoPowerLevelDTO> page (Map<String, Object> params){
IPage<WoPowerLevel> page = baseDao.selectPage( IPage<WoPowerLevel> page = baseDao.selectPage(
getPage(params, WoPowerLevel.ID, true), getPage(params, WoPowerLevel.CREATE_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, WoPowerLevelDTO.class); return getPageData(page, WoPowerLevelDTO.class);