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

[审批流][添加][添加合同提前终止审批]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
b29ee9d7e8
2 измененных файлов: 21 добавлений и 0 удалений
  1. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -10,6 +10,7 @@ import com.iformall.domain.po.*;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxFlowRecordService;
import com.iformall.service.WxFlowService; import com.iformall.service.WxFlowService;
import com.iformall.service.WxPropertyContractService; import com.iformall.service.WxPropertyContractService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -18,6 +19,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -54,6 +56,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
@Autowired @Autowired
WxFlowService wxFlowService; WxFlowService wxFlowService;


@Autowired
WxFlowRecordService wxFlowRecordService;

@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);
@@ -106,6 +111,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract));
//押金欠缴 //押金欠缴
result.put("depositOweCount",wxBillPropertyDepositMapper.queryOweCount(propertyContract)); result.put("depositOweCount",wxBillPropertyDepositMapper.queryOweCount(propertyContract));
//发起人备注
WxFlowRecord wxFlowRecord = new WxFlowRecord();
wxFlowRecord.setBusinessId(id);
wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode());
List<WxFlowRecord> flowRecordList = wxFlowRecordService.findList(wxFlowRecord);
if(!CollectionUtils.isEmpty(flowRecordList)){
result.put("remark",flowRecordList.get(0).getRemark());
}
return new ResultData(Result.SUCCESS, "查询成功", result); return new ResultData(Result.SUCCESS, "查询成功", result);
} }




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

@@ -137,6 +137,14 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract));
//押金欠缴 //押金欠缴
result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract));
//发起人备注
WxFlowRecord wxFlowRecord = new WxFlowRecord();
wxFlowRecord.setBusinessId(id);
wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode());
List<WxFlowRecord> flowRecordList = wxFlowRecordService.findList(wxFlowRecord);
if(!CollectionUtils.isEmpty(flowRecordList)){
result.put("remark",flowRecordList.get(0).getRemark());
}
return new ResultData(Result.SUCCESS, "查询成功", result); return new ResultData(Result.SUCCESS, "查询成功", result);
} }




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