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

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
e8545c52d4
4 измененных файлов: 9 добавлений и 4 удалений
  1. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 6
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -74,7 +74,12 @@ public class WxPropertyContractController extends WxContractBaseController {
@SystemControllerLog(description = "物业合同-新增") @SystemControllerLog(description = "物业合同-新增")
public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add");
MallUserInfo user = getUser();
//MallUserInfo user = getUser();
MallUserInfo user = new MallUserInfo();
user.setId(321127266275430400L);
user.setName("alitest");
user.setTenantId("789");
user.setParentTenantId("788");
wxPropertyContract.updateTenantInfo(user); wxPropertyContract.updateTenantInfo(user);
wxPropertyContract.setAdjustPeriodHandle(); wxPropertyContract.setAdjustPeriodHandle();
Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode());


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

@@ -79,7 +79,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Override @Override
public Map<String, Object> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { public Map<String, Object> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) {
//Object rentContractStatusInfo = getRentContractStatusInfo(record); //Object rentContractStatusInfo = getRentContractStatusInfo(record);
PageHelper.startPage(pageIndex, pageSize);
//PageHelper.startPage(pageIndex, pageSize);
//List<Map<String, Object>> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); //List<Map<String, Object>> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record));


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

@@ -79,7 +79,7 @@
<if test=" null != deposit ">and `deposit` = #{deposit}</if> <if test=" null != deposit ">and `deposit` = #{deposit}</if>
<if test=" null != payDate ">and `pay_date` = #{payDate}</if> <if test=" null != payDate ">and `pay_date` = #{payDate}</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if> <if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != merchantName ">and `merchant_name` = #{merchantName}</if>
<if test=" null != merchantName and '' != merchantName ">and `merchant_name` like concat('%', #{merchantName},'%') </if>
<if test=" null != brand ">and `brand` = #{brand}</if> <if test=" null != brand ">and `brand` = #{brand}</if>
<if test=" null != businessId ">and `business_id` = #{businessId}</if> <if test=" null != businessId ">and `business_id` = #{businessId}</if>
<if test=" null != shopType ">and `shop_type` = #{shopType}</if> <if test=" null != shopType ">and `shop_type` = #{shopType}</if>


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

@@ -114,7 +114,7 @@
<if test=" null != deposit and '' != deposit">and `deposit` = #{deposit}</if> <if test=" null != deposit and '' != deposit">and `deposit` = #{deposit}</if>
<if test=" null != payDate and '' != payDate">and `pay_date` = #{payDate}</if> <if test=" null != payDate and '' != payDate">and `pay_date` = #{payDate}</if>
<if test=" null != isDel and '' != isDel">and `is_del` = #{isDel}</if> <if test=" null != isDel and '' != isDel">and `is_del` = #{isDel}</if>
<if test=" null != merchantName and '' != merchantName">and `merchant_name` = #{merchantName}</if>
<if test=" null != merchantName and '' != merchantName">and `merchant_name` like concat('%', #{merchantName},'%') </if>
<if test=" null != brand and '' != brand">and `brand` = #{brand}</if> <if test=" null != brand and '' != brand">and `brand` = #{brand}</if>
<if test=" null != businessId and '' != businessId">and `business_id` = #{businessId}</if> <if test=" null != businessId and '' != businessId">and `business_id` = #{businessId}</if>
<if test=" null != shopType and '' != shopType">and `shop_type` = #{shopType}</if> <if test=" null != shopType and '' != shopType">and `shop_type` = #{shopType}</if>


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