商品列表基本搜索

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java

@@ -56,7 +56,7 @@ public class AdminGoodsController extends BaseController {
         // 委托编码
         String islicode=request.getString("islicode");
         if(!StringUtils.isBlank(islicode)){
-            qmap.put("islicode",islicode);
+            qmap.put("g.islicode",islicode);
         }
         // 商品名称
         String gname=request.getString("goods_name");
@@ -72,17 +72,18 @@ public class AdminGoodsController extends BaseController {
         //
         String goods_entrust = request.getString("goods_entrust");
         if(StringUtils.isNotBlank(goods_entrust)){
-            qmap.put("goods_entrust",goods_entrust);
+            qmap.put("g.goods_entrust",goods_entrust);
         }
         //
         String goods_type= request.getString("goods_type");
         if(StringUtils.isNotBlank(goods_type)){
-            qmap.put("goods_type",goods_type);
+            qmap.put("gd.goods_type",goods_type);
         }
         //
         String data_type= request.getString("data_type");
         if (StringUtils.isNotBlank(data_type)) {
-            qmap.put("data_type",data_type);
+            //qmap.put("data_type",data_type);
+            qmap.put("g.goods_status",data_type);
         }
         // 创建时间
 //        String createtime=request.getParameter("createtime");
@@ -94,12 +95,13 @@ public class AdminGoodsController extends BaseController {
         // 委托状态
         String entrust_status = request.getString("entrust_status");
         if(StringUtils.isNotBlank(entrust_status)){
-            qmap.put("entrust_status",entrust_status);
+            qmap.put("gd.entrust_status",entrust_status);
         }
         // 交易
         String transaction = request.getString("transaction");
         if(StringUtils.isNotBlank(transaction)){
-            qmap.put("transaction",transaction);
+//            qmap.put("transaction",transaction);
+            qmap.put("gd.goods_entrust",transaction);
         }
         // 查询返回的结果
         Map retmap = goodsService.getGoodsByMap(qmap,ipage,ilimit);

src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java

@@ -1,7 +1,7 @@
 package cn.chjyj.szwh.mapper;
 
 import cn.chjyj.szwh.bean.Goods;
-import org.apache.ibatis.annotations.Mapper;
+import cn.chjyj.szwh.vo.GoodsListVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
@@ -69,4 +69,26 @@ public interface GoodsMapper {
      * @return
      */
     List<Goods> getGoodsListByMap(@Param("map")Map gmap,@Param("limit") int limit);
+
+    /**
+     * 筛选产品列表
+     * @param listmap
+     * @param orderkey 排序字段
+     * @Param orderval ASC|DESC
+     * @param limit
+     * @param startrs
+     * @return
+     */
+    List<GoodsListVo> getGoodsVoList(@Param("map") Map listmap,
+                                   @Param("orderkey") String orderkey,
+                                   @Param("orderval") String oderval,
+                                   @Param("limit") int limit,
+                                   @Param("startrs") int startrs);
+
+    /**
+     * 统计联合查询的结果数量
+     * @param map
+     * @return
+     */
+    int countGoodsListVo(@Param("map") Map map);
 }

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -13,6 +13,7 @@ import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
 import cn.chjyj.szwh.vo.GoodsDetailVo;
+import cn.chjyj.szwh.vo.GoodsListVo;
 import cn.chjyj.szwh.vo.OrderDetailVo;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -142,40 +143,22 @@ public class GoodsServiceImpl implements GoodsService {
         Map retmap =new HashMap();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        List nglist= new ArrayList();
-        // 符合条件的记录总数
-        List<Goods> glist = goodsMapper.getGoodsListByMap(gmap,limit);
-        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.getGoodsIslicode());
-            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 start = page>1?(page-1)*limit:0;
+        int end =page*limit;
 
+        List nglist= new ArrayList();
+        List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(gmap,null,"DESC",limit,start);
+        retmap.put("data",goodsListVoList);
         // 总的记录
-        int total = goodsMapper.countAllGoods();
+        //int total = goodsMapper.countAllGoods();
+        int total = goodsMapper.countGoodsListVo(gmap);
         retmap.put("total",total);
 
-        int start = page>1?(page-1)*limit:0;
-        int end =page*limit;
+
 
         // 总的页
-        int totalpage = (int)Math.ceil(total/limit);
-        retmap.put("last_page",totalpage);
+//        int totalpage = (int)Math.ceil(total/limit);
+//        retmap.put("last_page",totalpage);
         retmap.put("per_page",limit);
         retmap.put("start",start+1); // start 默认为0
         retmap.put("end",end);

src/main/resources/mapper/szwh/GoodsMapper.xml

@@ -67,7 +67,24 @@
             ORDER BY #{orderkey} #{orderval}
         </if>
         limit #{startrs},#{limit}
-
+    </select>
+    
+    <!-- 统计联合查询的结果-->
+    <select id="countGoodsListVo" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT COUNT(id) FROM (
+            SELECT g.id,gd.id as deid
+            FROM goods g
+            INNER JOIN goods_detail gd ON g.goods_detail_id=gd.id
+            <where>
+                <if test="map!=null">
+                    <foreach collection="map" item="v" index="k" separator="and">
+                        <if test="v != null and v != '' and k!='id'">
+                            ${k} = #{v}
+                        </if>
+                    </foreach>
+                </if>
+            </where>
+        ) as uq
     </select>
 
     <!--查询记录列表-->