Commit 0871a41f authored by 黄毅's avatar 黄毅

1

parent 9e13d548
...@@ -60,11 +60,10 @@ public class BrandController { ...@@ -60,11 +60,10 @@ public class BrandController {
Page page = new Page(); Page page = new Page();
page.setIndex(Long.valueOf(index)); page.setIndex(Long.valueOf(index));
page.setLimit(Long.valueOf(limit)); page.setLimit(Long.valueOf(limit));
page.setLimitKey("BannerID desc"); page.setLimitKey("BannerID asc");
List<Map<String, Object>> detailList = brandService.listBanner(param, page); List<Map<String, Object>> detailList = brandService.listBanner(param, page);
// return Rjx.jsonOk().set("list", detailList).setPage(page).toString(); return Rjx.jsonOk().set("list", detailList).setPage(page).toString();
return Rjx.jsonOk().set("list", detailList).toString();
} }
@ApiOperation("品牌列表接口按首字母") @ApiOperation("品牌列表接口按首字母")
......
...@@ -52,8 +52,8 @@ public class GoodsController { ...@@ -52,8 +52,8 @@ public class GoodsController {
userNO = "nouserNO"; userNO = "nouserNO";
} }
String langId = request.getParameter("LangID"); String langId = request.getParameter("LangID");
String index = "20"; String index = "1";
String limit = "1"; String limit = "20";
if(!StringUtil.isNotEmpty(orgNO,compNO,limit,index)) { if(!StringUtil.isNotEmpty(orgNO,compNO,limit,index)) {
return Rjx.json().setCode(-1).setMessage("参数缺失").toJson(); return Rjx.json().setCode(-1).setMessage("参数缺失").toJson();
......
...@@ -15,6 +15,7 @@ import com.egolm.common.DateUtil; ...@@ -15,6 +15,7 @@ import com.egolm.common.DateUtil;
import com.egolm.common.StringUtil; import com.egolm.common.StringUtil;
import com.egolm.common.jdbc.JdbcTemplate; import com.egolm.common.jdbc.JdbcTemplate;
import com.egolm.common.jdbc.Page; import com.egolm.common.jdbc.Page;
import com.egolm.common.jdbc.dialect.SqlServerDialect;
import com.egolm.shop.service.GoodsService; import com.egolm.shop.service.GoodsService;
@Service @Service
public class GoodsServiceImpl implements GoodsService { public class GoodsServiceImpl implements GoodsService {
...@@ -45,6 +46,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -45,6 +46,7 @@ public class GoodsServiceImpl implements GoodsService {
sql += " where acg.sOrgNO = '" + orgNO + "' and a.dTradeDate >= '" + beginDate + "' and a.dTradeDate < '" + endDate +"'"; sql += " where acg.sOrgNO = '" + orgNO + "' and a.dTradeDate >= '" + beginDate + "' and a.dTradeDate < '" + endDate +"'";
} }
sql += " group by a.nGoodsID, g.sGoodsNO, g.sGoodsDesc, acg.nSalePrice, acg.sSpec, acg.sUnit, acg.nMinSaleQty, acg.nSaleUnits, acg.nMarketPrice, acg.sMarketUnit"; sql += " group by a.nGoodsID, g.sGoodsNO, g.sGoodsDesc, acg.nSalePrice, acg.sSpec, acg.sUnit, acg.nMinSaleQty, acg.nSaleUnits, acg.nMarketPrice, acg.sMarketUnit";
jdbcTemplate.setDialect(new SqlServerDialect());
return jdbcTemplate.limit(sql, page); return jdbcTemplate.limit(sql, page);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment