Browse Source

[合同管理][修改][选择店铺问题,计租中包括即将到期]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
646e48e19d
3 changed files with 13 additions and 9 deletions
  1. +8
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +3
    -3
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 8
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -203,16 +203,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
Map<String,Object> resultData=new HashMap();
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId(tenantId);
//将到期
wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode());
int endSoonCount=wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract);
wxRentContractMapper.updateRentContractEndSoonStatus(wxRentContract);
resultData.put("endSoonCount",endSoonCount);

//计租中
wxRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode());
int rendPaidCount =wxRentContractMapper.queryRentContractPaidStatus(wxRentContract);
wxRentContractMapper.updateRentContractPaidStatus(wxRentContract);
resultData.put("rendPaidCount",rendPaidCount);

//将到期
wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode());
int endSoonCount=wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract);
wxRentContractMapper.updateRentContractEndSoonStatus(wxRentContract);
resultData.put("endSoonCount",endSoonCount);

//到期
wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END.getCode());
int endCount=wxRentContractMapper.queryRentContractEndStatus(wxRentContract);


+ 3
- 3
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -111,15 +111,15 @@
</select>
<update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and DATEDIFF(rental_end_date,now()) &lt;= 30
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and DATEDIFF(rental_end_date,now()) &lt;= 30
</update>
<update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and rental_start_date &lt;= now() and rental_end_date >= now()
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and rental_start_date &lt;= now() and rental_end_date >= now()
</update>
<update id="updateRentContractEndStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and rental_end_date &lt;now()
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and rental_end_date &lt;now()
</update>

</mapper>

+ 2
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml View File

@@ -127,7 +127,8 @@

select s.id,s.shop_number shopNumber,s.build_area buildArea,
s.img_url imgUrl,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
from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0
left join wx_merchant m on ms.merchant_id=m.id
left join wx_mall_building b on s.building=b.id


Loading…
Cancel
Save