|
@@ -330,8 +330,6 @@ public class ProductManageAction implements IMINAction {
|
|
|
* @param model 商品型号
|
|
|
* @param createUser 添加人
|
|
|
* @param dates 添加时间
|
|
|
- * @param page
|
|
|
- * @param limit
|
|
|
* @return
|
|
|
* @throws MINBusinessException
|
|
|
*/
|
|
@@ -344,8 +342,6 @@ public class ProductManageAction implements IMINAction {
|
|
|
@MINParam(key = "brandName") String brandName,
|
|
|
@MINParam(key = "categoryId") String categoryId,
|
|
|
@MINParam(key = "createUser") String createUser,
|
|
|
- @MINParam(key = "page", defaultValue = "1") int page,
|
|
|
- @MINParam(key = "limit", defaultValue = "3") int limit,
|
|
|
MINSession session) throws MINBusinessException {
|
|
|
|
|
|
MINActionResult res = new MINActionResult();
|
|
@@ -367,19 +363,16 @@ public class ProductManageAction implements IMINAction {
|
|
|
/* if("10000002".equals(user.getRoleId())){
|
|
|
map.put("userId",user.getId());
|
|
|
}*/
|
|
|
- //分页
|
|
|
- MINRowBounds rows = new MINRowBounds(page, limit);
|
|
|
//执行查询
|
|
|
List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
|
|
|
.getMybatisMapper(ProductManageMapper.class)
|
|
|
- .queryProductz(map, rows);
|
|
|
+ .queryProductz(map);
|
|
|
//格式化时间和状态
|
|
|
list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime","modifyTime");
|
|
|
list = new MINCopyFormat("{history:'historyDesc',state:'stateDesc',source:'sourceDesc'}").format(list);
|
|
|
list = Service.lookup(IFormatService.class).formatEnum(list,"{historyDesc:'PRODUCT_HISTORY',stateDesc:'PRODUCT_STATE',sourceDesc:'PRODUCT_SOURCE'}");
|
|
|
//返回数据
|
|
|
res.set(IMINBusinessConstant.F_PAGING_LAY, list);
|
|
|
- res.set(IMINBusinessConstant.F_PAGING_COUNT,rows.getMaxRows());
|
|
|
return res;
|
|
|
}
|
|
|
|