yumeng 1 年之前
父節點
當前提交
46beb1681d

+ 10 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -253,7 +253,10 @@ public class KuaishouItemListController extends BaseController {
             @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId,
             @ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) String itemTitle,
             @ApiParam("品类ID") @RequestParam(value = "categoryId", required = false) Long categoryId,
-            @ApiParam("品类ID") @RequestParam(value = "mediaId", required = false) Integer mediaId
+            @ApiParam("品类ID") @RequestParam(value = "mediaId", required = false) Integer mediaId,
+            @ApiParam("品类ID") @RequestParam(value = "startDate", required = false) String startDate,
+            @ApiParam("品类ID") @RequestParam(value = "endDate", required = false) String endDate
+
     ) {
         TableDataInfo dataInfo = new TableDataInfo();
         try {
@@ -286,7 +289,12 @@ public class KuaishouItemListController extends BaseController {
             if (!Check.isNull(mediaId)) {
                 requestMap.put("mediaId", mediaId);
             }
-
+            if (!Check.isNull(startDate)) {
+                requestMap.put("startDate", startDate);
+            }
+            if (!Check.isNull(endDate)) {
+                requestMap.put("endDate", endDate);
+            }
             startPage();
             List<KuaishouItemList> list = kuaishouItemListService.getItemList(requestMap);
             dataInfo = getDataTable(list);

+ 8 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml

@@ -120,6 +120,14 @@
         <if test="mediaId != null and mediaId != ''">
             and t1.media_id = #{mediaId}
         </if>
+        <if test="startDate != null and startDate != ''">
+            and t1.create_time &gt;= str_to_date(concat(#{startDate},' 00:00:01'),'%Y-%m-%d
+            %H:%i:%s')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and t1.create_time &lt;= str_to_date(concat(#{endDate},' 23:59:59'),'%Y-%m-%d
+            %H:%i:%s')
+        </if>
         order by t1.create_time desc
     </select>
     <select id="getItemInfoByItemId" resultType="com.ruixuan.isc.entity.KuaishouItemList"