提交 98db7ec1 authored 作者: 李秋林's avatar 李秋林

根据商品标签进行查询

上级 7e289807
...@@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @author : liqiulin * @author : liqiulin
...@@ -35,6 +37,9 @@ public class PrdTagQueryController { ...@@ -35,6 +37,9 @@ public class PrdTagQueryController {
@RequiresPermissions("bi:prdtag:list") @RequiresPermissions("bi:prdtag:list")
@GetMapping("/infos") @GetMapping("/infos")
public List queryInfo(PrdTagVo prdTagVo){ public List queryInfo(PrdTagVo prdTagVo){
if (Objects.isNull(prdTagVo.getPrdTagId())){
return new ArrayList<>();
}
return prdTagQueryService.selectTagInfos(prdTagVo); return prdTagQueryService.selectTagInfos(prdTagVo);
} }
} }
...@@ -29,6 +29,7 @@ public class SummaryMarketDailyDetailController { ...@@ -29,6 +29,7 @@ public class SummaryMarketDailyDetailController {
@GetMapping("/sum_d") @GetMapping("/sum_d")
public Map marketSummary(MarketSummaryVo summaryVo){ public Map marketSummary(MarketSummaryVo summaryVo){
summaryVo.setDate(); summaryVo.setDate();
summaryVo.checkPrdCodes();
return summaryService.marketSummary(summaryVo); return summaryService.marketSummary(summaryVo);
} }
......
...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; ...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author : liqiulin * @author : liqiulin
...@@ -55,4 +56,5 @@ public class MarketDetailWq { ...@@ -55,4 +56,5 @@ public class MarketDetailWq {
* |礼盒-2025小抓财手|、|虎皮凤爪-香辣400g|、|牛肉豆堡-卤香120g|…… * |礼盒-2025小抓财手|、|虎皮凤爪-香辣400g|、|牛肉豆堡-卤香120g|……
* */ * */
private String prdCode; private String prdCode;
private List<String> prdCodes;
} }
...@@ -37,7 +37,6 @@ public class MarketSummaryVo { ...@@ -37,7 +37,6 @@ public class MarketSummaryVo {
*/ */
private Date dateStart; private Date dateStart;
private Date dateEnd; private Date dateEnd;
private List<String> prdCodes; private List<String> prdCodes;
public boolean isOnlyPlatform() { public boolean isOnlyPlatform() {
...@@ -52,4 +51,11 @@ public class MarketSummaryVo { ...@@ -52,4 +51,11 @@ public class MarketSummaryVo {
this.dateEnd = date; this.dateEnd = date;
} }
} }
public void checkPrdCodes(){
if (this.prdCodes != null && this.prdCodes.size() > 0) {
this.seriesId = null;
this.prdCode = null;
}
}
} }
...@@ -97,6 +97,12 @@ ...@@ -97,6 +97,12 @@
<if test="qw.prdCode != null and qw.prdCode != '' "> <if test="qw.prdCode != null and qw.prdCode != '' ">
and prd_code = #{qw.prdCode} and prd_code = #{qw.prdCode}
</if> </if>
<if test="qw.prdCodes != null and qw.prdCodes.size() > 0 ">
and prd_code in
<foreach item="item" index="index" collection="qw.prdCodes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</sql> </sql>
<select id="summaryByPlatform" resultMap="SummaryByPlatformMap" > <select id="summaryByPlatform" resultMap="SummaryByPlatformMap" >
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论