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

[租赁物业合同][修改][更新账单]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5e7006162a
3 измененных файлов: 12 добавлений и 56 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +7
    -51
      mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java

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

@@ -71,12 +71,12 @@ 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);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(rentContractData); PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(rentContractData);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("rentContractStatusInfo", rentContractStatusInfo);
//result.put("rentContractStatusInfo", rentContractStatusInfo);
result.put("pageInfo", pageInfo); result.put("pageInfo", pageInfo);
return result; return result;




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

@@ -110,12 +110,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {


@Override @Override
public Map<String, Object> listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { public Map<String, Object> listAsPage(WxRentContract 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 = wxRentContractMapper.queryRentContractData(record); List<Map<String, Object>> rentContractData = wxRentContractMapper.queryRentContractData(record);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(rentContractData); PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(rentContractData);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("rentContractStatusInfo", rentContractStatusInfo);
//result.put("rentContractStatusInfo", rentContractStatusInfo);
result.put("pageInfo", pageInfo); result.put("pageInfo", pageInfo);
return result; return result;
} }
@@ -1376,7 +1376,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())). p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).
findFirst().orElse(null); findFirst().orElse(null);
if (propertyContract != null) { if (propertyContract != null) {
wxPropertyContractService.updatePropertyPreviewBill(propertyContract);
wxPropertyContractService.updatePropertyContractStatus(propertyContract.getId());
} }
} }
} }


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

@@ -7,10 +7,11 @@ import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.domain.vo.WxRentPropertyContractVo;
import com.iformall.enums.EnumRentContractStatus; import com.iformall.enums.EnumRentContractStatus;
import com.iformall.mapper.*;
import com.iformall.service.*;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import com.iformall.mapper.WxPropertyContractMapper;
import com.iformall.mapper.WxRentContractMapper;
import com.iformall.service.WxPropertyContractService;
import com.iformall.service.WxRentContractService;
import com.iformall.service.WxRentPropertyContractService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -26,62 +27,17 @@ import java.util.Map;
public class WxRentPropertyContractServiceImpl implements WxRentPropertyContractService { public class WxRentPropertyContractServiceImpl implements WxRentPropertyContractService {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private String fmUploadDir;

@Autowired @Autowired
WxRentContractMapper wxRentContractMapper; WxRentContractMapper wxRentContractMapper;


@Autowired
WxShopMapper wxShopMapper;

@Autowired
WxMerchantService wxMerchantService;

@Autowired
WxBillRentMapper wxBillRentMapper;

@Autowired
WxBillDepositMapper wxBillDepositMapper;

@Autowired @Autowired
WxPropertyContractMapper wxPropertyContractMapper; WxPropertyContractMapper wxPropertyContractMapper;


@Autowired
WxMerchantMapper wxMerchantMapper;

@Autowired
WxBusinessMapper wxBusinessMapper;

@Autowired
WxMallMapper wxMallMapper;

@Autowired
WxBrandMapper WxBrandMapper;

@Autowired
WxFlowRecordService wxFlowRecordService;

@Autowired
RuntimeService runtimeService;

@Autowired
private TaskService taskService;

@Autowired
private WxFlowService wxFlowService;

@Autowired
WxMerchantShopMapper wxMerchantShopMapper;

@Autowired
WxFlowRecordMapper wxFlowRecordMapper;

@Autowired @Autowired
WxPropertyContractService wxPropertyContractService; WxPropertyContractService wxPropertyContractService;


@Autowired @Autowired
WxRentContractService wxRentontractService;
WxRentContractService wxRentContractService;


@Override @Override
public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { public PageInfo<WxRentPropertyContractVo> listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) {
@@ -91,7 +47,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract
@Override @Override
public ResultData getContractInfo(Long id) { public ResultData getContractInfo(Long id) {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
Map<String, Object> rent = wxRentontractService.getById(id);
Map<String, Object> rent = wxRentContractService.getById(id);
data.put("rent", rent); data.put("rent", rent);
WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); WxPropertyContract wxPropertyContractQuery = new WxPropertyContract();
wxPropertyContractQuery.setRentContractId(id); wxPropertyContractQuery.setRentContractId(id);


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