Browse Source

fix:公众号项目列表筛选

wrj 11 months ago
parent
commit
17d17bfb33

+ 6 - 3
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TXiangmuController.java

@@ -47,10 +47,13 @@ public class TXiangmuController {
      */
     @RequestMapping(value = "wx/getAll", method = RequestMethod.POST)
     @ApiOperation("获取所有项目")
-    public R<List<TXiangmu>> geTXiangmu(TXiangmu tXiangmu) {
+    public R<List<TXiangmu>> geTXiangmu(@RequestBody TXiangmu tXiangmu) {
         LambdaQueryWrapper<TXiangmu> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(tXiangmu.getcId()), TXiangmu::getcId, tXiangmu.getcId()).
-                orderByDesc(TXiangmu::getDtCreateTime);
+        objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(tXiangmu.getcId()), TXiangmu::getcId, tXiangmu.getcId());
+        if(StringUtils.isNotBlank(tXiangmu.getcLdList())){
+            objectLambdaQueryWrapper.apply("FIND_IN_SET({0}, c_ld_list)", tXiangmu.getcLdList());
+        }
+        objectLambdaQueryWrapper.orderByDesc(TXiangmu::getDtCreateTime);
         List<TXiangmu> list = xiangmuService.list(objectLambdaQueryWrapper);
         return R.ok(list);
     }

+ 5 - 5
nightFragrance-massage/src/main/java/com/ylx/massage/domain/TXiangmu.java

@@ -70,9 +70,9 @@ public class TXiangmu implements Serializable {
     /**
      * 亮点list JsonArray
      */
-    @TableField(value = "c_ld_list",typeHandler = FastjsonTypeHandler.class)
-    @ApiModelProperty("亮点list JsonArray")
-    private JSONArray cLdList;
+    @TableField(value = "c_ld_list")
+    @ApiModelProperty("亮点")
+    private String cLdList;
 
     /**
      * 性别限制	0不限制	1男	2女
@@ -164,11 +164,11 @@ public class TXiangmu implements Serializable {
         this.nMinute = nMinute;
     }
 
-    public JSONArray getcLdList() {
+    public String getcLdList() {
         return cLdList;
     }
 
-    public void setcLdList(JSONArray cLdList) {
+    public void setcLdList(String cLdList) {
         this.cLdList = cLdList;
     }
 

+ 1 - 1
nightFragrance-massage/src/main/resources/mapper/massage/TXiangmuMapper.xml

@@ -10,7 +10,7 @@
         <result column="d_yuan_price" property="dYuanPrice" />
         <result column="d_price" property="dPrice" />
         <result column="n_minute" property="nMinute" />
-        <result column="c_ld_list" property="cLdList" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result column="c_ld_list" property="cLdList" />
         <result column="n_sex_limit" property="nSexLimit" />
         <result column="c_syrq" property="cSyrq" />
         <result column="c_detail" property="cDetail" />