| @@ -6,25 +6,25 @@ public class WxNotRentShopVo { | |||||
| @Excel(name="商铺类型",width = 20,orderNum = "1", | @Excel(name="商铺类型",width = 20,orderNum = "1", | ||||
| replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"}) | replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"}) | ||||
| private Integer pointType; | |||||
| private String pointType; | |||||
| @Excel(name="商铺号",width = 20,orderNum = "2") | @Excel(name="商铺号",width = 20,orderNum = "2") | ||||
| private String shopNumber; | private String shopNumber; | ||||
| @Excel(name="楼座",width = 20,orderNum = "3") | @Excel(name="楼座",width = 20,orderNum = "3") | ||||
| private Long building; | |||||
| private String building; | |||||
| @Excel(name="楼层",width = 20,orderNum = "4") | @Excel(name="楼层",width = 20,orderNum = "4") | ||||
| private Long floor; | |||||
| private String floor; | |||||
| @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | ||||
| private String buildArea; | private String buildArea; | ||||
| @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | ||||
| private String operationArea; | private String operationArea; | ||||
| @Excel(name="闲置时间(天)",width = 20,orderNum = "7") | @Excel(name="闲置时间(天)",width = 20,orderNum = "7") | ||||
| private Integer freeDay; | |||||
| private Long freeDay; | |||||
| public Integer getPointType() { | |||||
| public String getPointType() { | |||||
| return pointType; | return pointType; | ||||
| } | } | ||||
| public void setPointType(Integer pointType) { | |||||
| public void setPointType(String pointType) { | |||||
| this.pointType = pointType; | this.pointType = pointType; | ||||
| } | } | ||||
| @@ -36,19 +36,19 @@ public class WxNotRentShopVo { | |||||
| this.shopNumber = shopNumber; | this.shopNumber = shopNumber; | ||||
| } | } | ||||
| public Long getBuilding() { | |||||
| public String getBuilding() { | |||||
| return building; | return building; | ||||
| } | } | ||||
| public void setBuilding(Long building) { | |||||
| public void setBuilding(String building) { | |||||
| this.building = building; | this.building = building; | ||||
| } | } | ||||
| public Long getFloor() { | |||||
| public String getFloor() { | |||||
| return floor; | return floor; | ||||
| } | } | ||||
| public void setFloor(Long floor) { | |||||
| public void setFloor(String floor) { | |||||
| this.floor = floor; | this.floor = floor; | ||||
| } | } | ||||
| @@ -68,11 +68,11 @@ public class WxNotRentShopVo { | |||||
| this.operationArea = operationArea; | this.operationArea = operationArea; | ||||
| } | } | ||||
| public Integer getFreeDay() { | |||||
| public Long getFreeDay() { | |||||
| return freeDay; | return freeDay; | ||||
| } | } | ||||
| public void setFreeDay(Integer freeDay) { | |||||
| public void setFreeDay(Long freeDay) { | |||||
| this.freeDay = freeDay; | this.freeDay = freeDay; | ||||
| } | } | ||||
| } | } | ||||
| @@ -55,7 +55,6 @@ public enum EnumChart { | |||||
| SALE_PRESS(47, "砍价营销数据"), | SALE_PRESS(47, "砍价营销数据"), | ||||
| SALE_GROUP(48, "拼团营销数据"), | SALE_GROUP(48, "拼团营销数据"), | ||||
| INDEX_SHOP_RENT(49, "商铺出租数据"), | INDEX_SHOP_RENT(49, "商铺出租数据"), | ||||
| INDEX_BILL_RECE_RATE(50, "费用收缴数据"), | INDEX_BILL_RECE_RATE(50, "费用收缴数据"), | ||||
| INDEX_COUPON_SCENE(51, "场景发券"), | INDEX_COUPON_SCENE(51, "场景发券"), | ||||
| @@ -10,10 +10,7 @@ import com.iformall.domain.po.WxMerchantShop; | |||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.vo.WxNotRentShopVo; | import com.iformall.domain.vo.WxNotRentShopVo; | ||||
| import com.iformall.domain.vo.WxShopVo; | import com.iformall.domain.vo.WxShopVo; | ||||
| import com.iformall.enums.EnumDelStatus; | |||||
| import com.iformall.enums.EnumRentShopType; | |||||
| import com.iformall.enums.EnumShopStatus; | |||||
| import com.iformall.enums.EnumUserAdmin; | |||||
| import com.iformall.enums.*; | |||||
| import com.iformall.mapper.WxMerchantShopMapper; | import com.iformall.mapper.WxMerchantShopMapper; | ||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| @@ -171,11 +168,20 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| @Override | @Override | ||||
| public void exportNotRentShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { | public void exportNotRentShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { | ||||
| List<WxShop> list = wxShopMapper.findList(wxShop); | |||||
| List<Map<String,Object>> shops = wxShopMapper.notRentListMapAsPage(wxShop); | |||||
| List<WxNotRentShopVo> notRentShopVoList = new ArrayList<>(); | List<WxNotRentShopVo> notRentShopVoList = new ArrayList<>(); | ||||
| for (WxShop ws:list) { | |||||
| for (Map<String,Object> m:shops) { | |||||
| WxNotRentShopVo notRentShopVo = new WxNotRentShopVo(); | WxNotRentShopVo notRentShopVo = new WxNotRentShopVo(); | ||||
| BeanUtils.copyProperties(ws, notRentShopVo); | |||||
| notRentShopVo.setBuildArea((String)m.get("buildArea")); | |||||
| notRentShopVo.setBuilding((String)m.get("building")); | |||||
| notRentShopVo.setFloor((String)m.get("floor")); | |||||
| notRentShopVo.setFreeDay((Long) m.get("freeDay")); | |||||
| notRentShopVo.setOperationArea((String) m.get("operationArea")); | |||||
| Integer point = (Integer) m.get("pointType"); | |||||
| if(point != null){ | |||||
| notRentShopVo.setPointType(EnumPointType.getEnum(point).getMessage()); | |||||
| } | |||||
| notRentShopVo.setShopNumber((String) m.get("shopNumber")); | |||||
| notRentShopVoList.add(notRentShopVo); | notRentShopVoList.add(notRentShopVo); | ||||
| } | } | ||||
| String name = "未出租商铺列表"; | String name = "未出租商铺列表"; | ||||