diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index ab022be92..439e62ee9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/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.exception.MallinkException; import com.iformall.mapper.*; +import com.iformall.service.WxFlowRecordService; import com.iformall.service.WxFlowService; import com.iformall.service.WxPropertyContractService; import com.iformall.utils.Constant; @@ -18,6 +19,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -54,6 +56,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Autowired WxFlowService wxFlowService; + @Autowired + WxFlowRecordService wxFlowRecordService; + @Override public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { Object rentContractStatusInfo = getRentContractStatusInfo(record); @@ -106,6 +111,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); //押金欠缴 result.put("depositOweCount",wxBillPropertyDepositMapper.queryOweCount(propertyContract)); + //发起人备注 + WxFlowRecord wxFlowRecord = new WxFlowRecord(); + wxFlowRecord.setBusinessId(id); + wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode()); + List flowRecordList = wxFlowRecordService.findList(wxFlowRecord); + if(!CollectionUtils.isEmpty(flowRecordList)){ + result.put("remark",flowRecordList.get(0).getRemark()); + } return new ResultData(Result.SUCCESS, "查询成功", result); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index d0e0634f3..f36c5974f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/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("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); + //发起人备注 + WxFlowRecord wxFlowRecord = new WxFlowRecord(); + wxFlowRecord.setBusinessId(id); + wxFlowRecord.setStatus(EnumFlowRecordStatus.NEW.getCode()); + List flowRecordList = wxFlowRecordService.findList(wxFlowRecord); + if(!CollectionUtils.isEmpty(flowRecordList)){ + result.put("remark",flowRecordList.get(0).getRemark()); + } return new ResultData(Result.SUCCESS, "查询成功", result); }