Просмотр исходного кода

[租赁合同][修改][作废时关闭审批流]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
2d12b6303e
4 измененных файлов: 22 добавлений и 4 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
  4. +8
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -39,4 +39,6 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Strin


void updateApplyStatus(WxRentContract wxRentContract); void updateApplyStatus(WxRentContract wxRentContract);


List<WxRentContract> getRentInvalidList(WxRentContract wxRentContract);

} }

+ 8
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -34,6 +34,7 @@ import java.math.RoundingMode;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;


/** /**
* @author gongbiao * @author gongbiao
@@ -607,6 +608,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int allCount = wxRentContractMapper.selectCount(wxRentContract); int allCount = wxRentContractMapper.selectCount(wxRentContract);
resultData.put("allCount", allCount); resultData.put("allCount", allCount);


//审核流程中止
List<Long> collect = wxRentContractMapper.getRentInvalidList(wxRentContract).stream()
.map(r -> r.getId()).collect(Collectors.toList());
if (!collect.isEmpty()) {
//中止
}

//把状态为签约而商户未关联的数据改为待签约状态 //把状态为签约而商户未关联的数据改为待签约状态
wxRentContractMapper.updateStatusForUnsign(wxRentContract); wxRentContractMapper.updateStatusForUnsign(wxRentContract);




+ 4
- 4
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -39,12 +39,12 @@
<if test=" null != imgUrl "> <if test=" null != imgUrl ">
and `img_url` like concat('%', #{imgUrl},'%') and `img_url` like concat('%', #{imgUrl},'%')
</if> </if>
<if test=" null != name ">
<if test=" null != name and ''!=name ">
and `name` like concat('%', #{name},'%') and `name` like concat('%', #{name},'%')
</if> </if>
<if test=" null != linkPhone ">
<if test=" null != linkPhone and ''!=linkPhone ">
and `link_phone` like concat('%', #{linkPhone},'%') and `link_phone` like concat('%', #{linkPhone},'%')
</if> </if>




+ 8
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -178,5 +178,13 @@
<select id="updateStatusForUnsign" parameterType="com.iformall.domain.po.WxRentContract"> <select id="updateStatusForUnsign" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=1 where tenant_id=#{tenantId} and status=2 and merchant_id is null update wx_rent_contract set status=1 where tenant_id=#{tenantId} and status=2 and merchant_id is null
</select> </select>
<select id="getRentInvalidList" parameterType="com.iformall.domain.po.WxRentContract"
resultType="com.iformall.domain.po.WxRentContract">
select id from wx_rent_contract where shop_id in (
select s.shop_id from (SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status in(2,3,4)
)s) and status=1 and status!=7 and tenant_id=#{tenantId}
</select>



</mapper> </mapper>

Загрузка…
Отмена
Сохранить