From 6ea05ce32f250f21788ebdfbc4960214fe76dc9b Mon Sep 17 00:00:00 2001 From: xyiege Date: Sat, 16 Jul 2022 14:32:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=A9=E5=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szwh/service/impl/GoodsServiceImpl.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java index 62d29bf..bd00ead 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -16,6 +16,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -132,9 +133,31 @@ public class GoodsServiceImpl implements GoodsService { @Override public Map getGoodsByMap(Map gmap, int limit) { Map retmap =new HashMap(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + List nglist= new ArrayList(); // 符合条件的记录总数 List glist = goodsMapper.getGoodsListByMap(gmap,limit); - retmap.put("data",glist); + for(Goods g:glist){ + Map gtmap =new HashMap(); + GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(g.getGoodsDetailId()); + gtmap.put("goods_name",goodsDetail.getGoodsName()); + gtmap.put("goods_type",goodsDetail.getGoodsType()); + + gtmap.put("createtime",sdf.format(g.getCreateTime())); + gtmap.put("entrust_status",g.getEntrustStatus()); + gtmap.put("goods_detail_id",g.getGoodsDetailId()); + gtmap.put("goods_islicode",g.getGoodsDetailId()); + gtmap.put("goods_status",g.getGoodsStatus()); + gtmap.put("id",g.getId()); + gtmap.put("is_recommend",g.getIsRecommend()); + gtmap.put("key",g.getGoodsIslicode()); + gtmap.put("user_islicode",g.getUserIslicode()); + gtmap.put("username",g.getUsername()); + nglist.add(gtmap); + } + //对日期格式化 + retmap.put("data",nglist); // 总的记录 int total = goodsMapper.goodsCount(gmap); @@ -143,6 +166,7 @@ public class GoodsServiceImpl implements GoodsService { // 总的页 int totalpage = (int)Math.ceil(total/limit); retmap.put("last_page",totalpage); + retmap.put("per_page",limit); return retmap; }