Browse Source

增加筛选条件

yumeng 2 years ago
parent
commit
3994f7ceee

+ 7 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -80,7 +80,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
-                              String consignee
+                              String consignee, Long itemCreateId, Long collectSampleId
     ) {
         TableDataInfo tableDataInfo = new TableDataInfo();
         try {
@@ -122,6 +122,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (!Check.isNull(consignee)) {
                 requestMap.put("consignee", consignee);
             }
+            if (!Check.isNull(itemCreateId)) {
+                requestMap.put("itemCreateId", itemCreateId);
+            }
+            if (!Check.isNull(collectSampleId)) {
+                requestMap.put("collectSampleId", collectSampleId);
+            }
             startPage();
             List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
             return getDataTable(list);

+ 6 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -104,6 +104,12 @@
             <if test="consignee != null and consignee != ''">
                 and consignee like concat('%', #{consignee}, '%')
             </if>
+            <if test="itemCreateId != null and itemCreateId != ''">
+                and item_create_id = #{itemCreateId}
+            </if>
+            <if test="collectSampleId != null and collectSampleId != ''">
+                and collect_sample_id = #{collectSampleId}
+            </if>
         </where>
         order by create_time desc
     </select>