| @@ -41,9 +41,9 @@ public class BaseEntity implements Serializable { | |||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| if(!find) { | |||||
| return null; | |||||
| } | |||||
| // if(!find) { | |||||
| // return null; | |||||
| // } | |||||
| //扫描注解,优先解析注解 | //扫描注解,优先解析注解 | ||||
| for (Field field : fields) { | for (Field field : fields) { | ||||
| @@ -133,6 +133,7 @@ public class WxShop extends BaseEntity { | |||||
| //闲置时间 | //闲置时间 | ||||
| @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") | @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") | ||||
| @Transient | @Transient | ||||
| @SortColumn(column = "freeDay") | |||||
| private Integer freeDay; | private Integer freeDay; | ||||
| public Integer getFreeDay() { | public Integer getFreeDay() { | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.mapper; | package com.iformall.mapper; | ||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.dto.WxOrderReportDto; | |||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import com.iformall.domain.vo.*; | import com.iformall.domain.vo.*; | ||||
| @@ -31,7 +32,7 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> { | |||||
| List<WxOrderReportVo> listMicroPayOrderReportByDateAndMerchant(HashMap<String,Object> params); | List<WxOrderReportVo> listMicroPayOrderReportByDateAndMerchant(HashMap<String,Object> params); | ||||
| List<WxMerchantMicroPayVo> findListOfMerchantMicroPayOrderByDate(HashMap<String,Object> params); | |||||
| List<WxMerchantMicroPayVo> findListOfMerchantMicroPayOrderByDate(WxOrderReportDto wxOrderReportDto); | |||||
| List<WxOrder> findListOrder(WxOrderQueryVo record); | List<WxOrder> findListOrder(WxOrderQueryVo record); | ||||
| @@ -619,23 +619,18 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchantMicroPayVo> listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) { | public PageInfo<WxMerchantMicroPayVo> listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) { | ||||
| HashMap<String, Object> params = new HashMap<>(); | |||||
| if (!StringUtils.isEmpty(wxOrderReportDto.getMerchantName())) | |||||
| params.put("merchantName",wxOrderReportDto.getMerchantName()); | |||||
| if (wxOrderReportDto.getStartTime() != null) { | if (wxOrderReportDto.getStartTime() != null) { | ||||
| params.put("startTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); | |||||
| wxOrderReportDto.setStartTime(convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); | |||||
| } else { | } else { | ||||
| params.put("startTime", addDay(-1)); | |||||
| wxOrderReportDto.setStartTime(addDay(-1)); | |||||
| } | } | ||||
| if (wxOrderReportDto.getEndTime() != null) { | if (wxOrderReportDto.getEndTime() != null) { | ||||
| params.put("endTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); | |||||
| wxOrderReportDto.setEndTime(convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); | |||||
| } else { | } else { | ||||
| params.put("endTime", addDay(0)); | |||||
| wxOrderReportDto.setEndTime(addDay(0)); | |||||
| } | } | ||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| List<WxMerchantMicroPayVo> list = wxOrderMapper.findListOfMerchantMicroPayOrderByDate(params); | |||||
| List<WxMerchantMicroPayVo> list = wxOrderMapper.findListOfMerchantMicroPayOrderByDate(wxOrderReportDto); | |||||
| return new PageInfo<>(list); | return new PageInfo<>(list); | ||||
| } | } | ||||
| @@ -52,9 +52,6 @@ | |||||
| <if test=" null != isDel "> | <if test=" null != isDel "> | ||||
| and `is_del` = #{isDel} | and `is_del` = #{isDel} | ||||
| </if> | </if> | ||||
| <if test=" null != status "> | |||||
| and `status` = #{status} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -464,7 +464,7 @@ | |||||
| (case when mo.amount > 0 then mo.amount else 0 end) trade_amt | (case when mo.amount > 0 then mo.amount else 0 end) trade_amt | ||||
| </sql> | </sql> | ||||
| <select id="findListOfMerchantMicroPayOrderByDate" parameterType="map" resultMap="WxMerchantMicroPayVo"> | |||||
| <select id="findListOfMerchantMicroPayOrderByDate" parameterType="com.iformall.domain.dto.WxOrderReportDto" resultMap="WxMerchantMicroPayVo"> | |||||
| select | select | ||||
| <include refid="WxMerchantMicroPayColumnsVo"/> | <include refid="WxMerchantMicroPayColumnsVo"/> | ||||
| from wx_merchant wm | from wx_merchant wm | ||||
| @@ -484,8 +484,10 @@ | |||||
| </if> | </if> | ||||
| group by m.id,xTime) mo on mo.mid = wm.id | group by m.id,xTime) mo on mo.mid = wm.id | ||||
| where wm.status = 1 | where wm.status = 1 | ||||
| <if test=" null != merchantName "> | |||||
| <if test=" null != merchantName"> | |||||
| <if test=" '' != merchantName"> | |||||
| and wm.name like concat('%', #{merchantName},'%') | and wm.name like concat('%', #{merchantName},'%') | ||||
| </if> | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| <if test=" null == sortColumns"> order by wm.create_date desc </if> | <if test=" null == sortColumns"> order by wm.create_date desc </if> | ||||
| @@ -150,7 +150,7 @@ | |||||
| <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | ||||
| select s.id,s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, | select s.id,s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, | ||||
| s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea, | |||||
| s.img_url imgUrl,CONVERT(s.build_area,SIGNED)s.operation_area operationArea, | |||||
| s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | ||||
| m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | ||||
| s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | ||||
| @@ -263,8 +263,8 @@ | |||||
| </select> | </select> | ||||
| <select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | <select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | ||||
| select s.id,s.shop_number shopNumber,s.build_area buildArea, | |||||
| s.img_url imgUrl,s.operation_area operationArea, | |||||
| select s.id,s.shop_number shopNumber,CONVERT(s.build_area,SIGNED)buildArea, | |||||
| s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea, | |||||
| s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, | s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, | ||||
| s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | ||||
| from wx_shop s | from wx_shop s | ||||