增加检索条件

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

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.lang.model.element.NestingKind;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
@@ -69,6 +70,13 @@ public class AdminGoodsController extends BaseController {
         if(StringUtils.isNotBlank(gname)){
             qmap.put("gd.goods_name",gname);
         }
+
+        // 标的名称
+        String ngname = request.getString("goods");
+        if(StringUtils.isNotBlank(ngname)){
+            qmap.put("gd.goods_name",ngname);
+        }
+
         //
         String entrust_name =request.getString("entrust_name");
         if(StringUtils.isNotBlank(entrust_name)){
@@ -88,7 +96,6 @@ public class AdminGoodsController extends BaseController {
         //
         String data_type= request.getString("data_type");
         if (StringUtils.isNotBlank(data_type)) {
-            //qmap.put("data_type",data_type);
             qmap.put("g.goods_status",data_type);
         }
         // 创建时间
@@ -108,9 +115,9 @@ public class AdminGoodsController extends BaseController {
         // 交易
         String transaction = request.getString("transaction");
         if(StringUtils.isNotBlank(transaction)){
-//            qmap.put("transaction",transaction);
             qmap.put("gd.goods_entrust",transaction);
         }
+
         // 是否展示
         String show = request.getString("show");
         if(StringUtils.isNotBlank(show)){