From fc33d842be6a464d6791228f0d3aa726de567bd0 Mon Sep 17 00:00:00 2001 From: zhengyunfei <zhengyunfei@jianghuxx,com> Date: Tue, 16 May 2023 15:43:22 +0800 Subject: [PATCH] init --- src/main/java/com/yunniu/farming/webadmin/model/GroupArea.java | 7 +++++++ src/main/java/com/yunniu/farming/webadmin/service/impl/GroupAreaServiceimpl.java | 11 ++++++++++- src/main/resources/mappings/GroupAreaMapper.xml | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yunniu/farming/webadmin/model/GroupArea.java b/src/main/java/com/yunniu/farming/webadmin/model/GroupArea.java index f809854..561954a 100644 --- a/src/main/java/com/yunniu/farming/webadmin/model/GroupArea.java +++ b/src/main/java/com/yunniu/farming/webadmin/model/GroupArea.java @@ -6,6 +6,7 @@ import com.yunniu.farming.common.plugin.PageInfo; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author zyf @@ -60,4 +61,10 @@ public class GroupArea { @JsonInclude(JsonInclude.Include.NON_NULL) private Integer pagesize; + @TableField(exist = false) + private Long groupBuyId; + + @TableField(exist = false) + private List<Integer> areaIds; + } diff --git a/src/main/java/com/yunniu/farming/webadmin/service/impl/GroupAreaServiceimpl.java b/src/main/java/com/yunniu/farming/webadmin/service/impl/GroupAreaServiceimpl.java index 5430e0b..c2db327 100644 --- a/src/main/java/com/yunniu/farming/webadmin/service/impl/GroupAreaServiceimpl.java +++ b/src/main/java/com/yunniu/farming/webadmin/service/impl/GroupAreaServiceimpl.java @@ -1,11 +1,14 @@ package com.yunniu.farming.webadmin.service.impl; +import com.alibaba.fastjson.JSON; import com.yunniu.farming.result.Result; import com.yunniu.farming.webadmin.dao.GroupAreaDao; +import com.yunniu.farming.webadmin.dao.GroupBuyDao; import com.yunniu.farming.webadmin.model.GroupArea; import com.yunniu.farming.webadmin.model.GroupBuy; import com.yunniu.farming.webadmin.service.GroupAreaService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,9 +26,15 @@ public class GroupAreaServiceimpl implements GroupAreaService { @Autowired private GroupAreaDao mapper; + @Autowired + private GroupBuyDao groupBuyDao; @Override public List<GroupArea> findPageList(GroupArea item) { - + GroupBuy groupBuy = groupBuyDao.selectById(item.getGroupBuyId()); + if (StringUtils.isNotEmpty(groupBuy.getAreaIds())) { + List<Integer> areaids = JSON.parseArray(groupBuy.getAreaIds(), Integer.class); + item.setAreaIds(areaids); + } return mapper.findPageList(item); } diff --git a/src/main/resources/mappings/GroupAreaMapper.xml b/src/main/resources/mappings/GroupAreaMapper.xml index ba01593..ed27bb6 100644 --- a/src/main/resources/mappings/GroupAreaMapper.xml +++ b/src/main/resources/mappings/GroupAreaMapper.xml @@ -12,6 +12,12 @@ <if test="areaAddress != null and areaAddress != ''"> and areaAddress like concat('%', #{areaAddress,jdbcType=VARCHAR}, '%') </if> + <if test="areaIds != null and areaIds.size > 0"> + and id in + <foreach collection="areaIds" separator="," open="(" item="item" index="index" close=")" nullable="true"> + #{areaIds[${index}]} + </foreach> + </if> </where> </select> </mapper> \ No newline at end of file -- libgit2 0.26.0