lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-15-修复

Browse Source
This commit is contained in:
青云
2025-10-15 17:30:17 +08:00
parent 40d53dffba
commit 1b590bbcbd
7 changed files with 863 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractAccountController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.xzd.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.bo.XzdContractAccountBo;
import org.dromara.xzd.service.IXzdContractAccountService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 承包合同竣工结算
*
* @author Lion Li
* @date 2025-10-15
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/xzd/contractAccount")
public class XzdContractAccountController extends BaseController {
private final IXzdContractAccountService xzdContractAccountService;
/**
* 查询承包合同竣工结算列表
*/
@SaCheckPermission("xzd:contractAccount:list")
@GetMapping("/list")
public TableDataInfo<XzdContractAccountVo> list(XzdContractAccountBo bo, PageQuery pageQuery) {
return xzdContractAccountService.queryPageList(bo, pageQuery);
}
/**
* 导出承包合同竣工结算列表
*/
@SaCheckPermission("xzd:contractAccount:export")
@Log(title = "承包合同竣工结算", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(XzdContractAccountBo bo, HttpServletResponse response) {
List<XzdContractAccountVo> list = xzdContractAccountService.queryList(bo);
ExcelUtil.exportExcel(list, "承包合同竣工结算", XzdContractAccountVo.class, response);
}
/**
* 获取承包合同竣工结算详细信息
*
* @param id 主键
*/
@SaCheckPermission("xzd:contractAccount:query")
@GetMapping("/{id}")
public R<XzdContractAccountVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(xzdContractAccountService.queryById(id));
}
/**
* 新增承包合同竣工结算
*/
@SaCheckPermission("xzd:contractAccount:add")
@Log(title = "承包合同竣工结算", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody XzdContractAccountBo bo) {
return toAjax(xzdContractAccountService.insertByBo(bo));
}
/**
* 修改承包合同竣工结算
*/
@SaCheckPermission("xzd:contractAccount:edit")
@Log(title = "承包合同竣工结算", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody XzdContractAccountBo bo) {
return toAjax(xzdContractAccountService.updateByBo(bo));
}
/**
* 删除承包合同竣工结算
*
* @param ids 主键串
*/
@SaCheckPermission("xzd:contractAccount:remove")
@Log(title = "承包合同竣工结算", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(xzdContractAccountService.deleteWithValidByIds(List.of(ids), true));
}
}

161
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAccount.java Normal file
View File

@ -0,0 +1,161 @@
package org.dromara.xzd.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serial;
/**
* 承包合同竣工结算对象 xzd_contract_account
*
* @author Lion Li
* @date 2025-10-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("xzd_contract_account")
public class XzdContractAccount extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private Long id;
/**
* 标题
*/
private String title;
/**
* 单据日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
/**
* 合同id
*/
private Long contractId;
/**
* 合同名称
*/
private String contractName;
/**
* 合同编码
*/
private String contractCode;
/**
* 部门id
*/
private Long deptId;
/**
* 送审造价
*/
private Long submittedCost;
/**
* 审定总价
*/
private Long totalPrice;
/**
* 审定日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate;
/**
* 项目id
*/
private Long projectId;
/**
* 工程项目
*/
private String projectName;
/**
* 甲方id
*/
private Long firstPartyId;
/**
* 甲方单位(客户)
*/
private String firstParty;
/**
* 乙方id
*/
private Long secondPartyId;
/**
* 乙方单位(供应商)
*/
private String secondParty;
/**
* 支付条款id
*/
private Long terms;
/**
* 本期应收金额
*/
private Long amountReceivable;
/**
* 竣工日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate;
/**
* 备注
*/
private String remark;
/**
* 本期决算总额
*/
private Long settlementAmount;
/**
* 质保金金额(客户)
*/
private Long warrantyAmount;
/**
* 业主单位(客户)
*/
private Long owner;
/**
* 监理单位(客户)
*/
private Long supervision;
/**
* 审核单位(客户)
*/
private Long review;
}

143
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractAccountBo.java Normal file
View File

@ -0,0 +1,143 @@
package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 承包合同竣工结算业务对象 xzd_contract_account
*
* @author Lion Li
* @date 2025-10-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdContractAccount.class, reverseConvertGenerate = false)
public class XzdContractAccountBo extends BaseEntity {
/**
* id
*/
private Long id;
/**
* 标题
*/
@NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
private String title;
/**
* 单据日期
*/
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
/**
* 合同编号id
*/
@NotNull(message = "合同编号id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long contractId;
/**
* 部门id
*/
@NotNull(message = "部门id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long deptId;
/**
* 合同名称
*/
private String contractName;
/**
* 送审造价
*/
private Long submittedCost;
/**
* 审定总价
*/
private Long totalPrice;
/**
* 审定日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate;
/**
* 工程项目
*/
private String projectName;
/**
* 甲方单位(客户)
*/
private String firstParty;
/**
* 乙方单位(供应商)
*/
private String secondParty;
/**
* 支付条款id
*/
private Long terms;
/**
* 本期应收金额
*/
private Long amountReceivable;
/**
* 竣工日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate;
/**
* 备注
*/
private String remark;
/**
* 本期决算总额
*/
private Long settlementAmount;
/**
* 质保金金额(客户)
*/
private Long warrantyAmount;
/**
* 业主单位(客户)
*/
private Long owner;
/**
* 监理单位(客户)
*/
private Long supervision;
/**
* 审核单位(客户)
*/
private Long review;
}

180
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java Normal file
View File

@ -0,0 +1,180 @@
package org.dromara.xzd.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractAccount;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.domain.XzdSettlementRules;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
/**
* 承包合同竣工结算视图对象 xzd_contract_account
*
* @author Lion Li
* @date 2025-10-15
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = XzdContractAccount.class)
public class XzdContractAccountVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 标题
*/
@ExcelProperty(value = "标题")
private String title;
/**
* 单据日期
*/
@ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
/**
* 合同编号id
*/
@ExcelProperty(value = "合同编号id")
private Long contractId;
/**
* 合同名称
*/
@ExcelProperty(value = "合同名称")
private String contractName;
/**
* 合同编码
*/
private String contractCode;
/**
* 部门id
*/
@ExcelProperty(value = "部门id")
private Long deptId;
/**
* 送审造价
*/
@ExcelProperty(value = "送审造价")
private Long submittedCost;
/**
* 审定总价
*/
@ExcelProperty(value = "审定总价")
private Long totalPrice;
/**
* 审定日期
*/
@ExcelProperty(value = "审定日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate;
/**
* 项目ID
*/
private Long projectId;
/**
* 工程项目
*/
@ExcelProperty(value = "工程项目")
private String projectName;
/**
* 甲方单位(客户)
*/
@ExcelProperty(value = "甲方单位(客户)")
private String firstParty;
/**
* 乙方单位(供应商)
*/
@ExcelProperty(value = "乙方单位(供应商)")
private String secondParty;
/**
* 支付条款id
*/
@ExcelProperty(value = "支付条款id")
private Long terms;
/**
* 支付条款对象
*/
private XzdSettlementRules settlementRules;
/**
* 本期应收金额
*/
@ExcelProperty(value = "本期应收金额")
private Long amountReceivable;
/**
* 竣工日期
*/
@ExcelProperty(value = "竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date completionDate;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 本期决算总额
*/
@ExcelProperty(value = "本期决算总额")
private Long settlementAmount;
/**
* 质保金金额(客户)
*/
@ExcelProperty(value = "质保金金额(客户)")
private Long warrantyAmount;
/**
* 业主单位(客户)
*/
@ExcelProperty(value = "业主单位(客户)")
private Long owner;
/**
* 监理单位(客户)
*/
@ExcelProperty(value = "监理单位(客户)")
private Long supervision;
/**
* 审核单位(客户)
*/
@ExcelProperty(value = "审核单位(客户)")
private Long review;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractAccountMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.xzd.mapper;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 承包合同竣工结算Mapper接口
*
* @author Lion Li
* @date 2025-10-15
*/
public interface XzdContractAccountMapper extends BaseMapperPlus<XzdContractAccount, XzdContractAccountVo> {
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdContractAccountService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.xzd.service;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.bo.XzdContractAccountBo;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 承包合同竣工结算Service接口
*
* @author Lion Li
* @date 2025-10-15
*/
public interface IXzdContractAccountService extends IService<XzdContractAccount>{
/**
* 查询承包合同竣工结算
*
* @param id 主键
* @return 承包合同竣工结算
*/
XzdContractAccountVo queryById(Long id);
/**
* 分页查询承包合同竣工结算列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 承包合同竣工结算分页列表
*/
TableDataInfo<XzdContractAccountVo> queryPageList(XzdContractAccountBo bo, PageQuery pageQuery);
/**
* 查询符合条件的承包合同竣工结算列表
*
* @param bo 查询条件
* @return 承包合同竣工结算列表
*/
List<XzdContractAccountVo> queryList(XzdContractAccountBo bo);
/**
* 新增承包合同竣工结算
*
* @param bo 承包合同竣工结算
* @return 是否新增成功
*/
Boolean insertByBo(XzdContractAccountBo bo);
/**
* 修改承包合同竣工结算
*
* @param bo 承包合同竣工结算
* @return 是否修改成功
*/
Boolean updateByBo(XzdContractAccountBo bo);
/**
* 校验并批量删除承包合同竣工结算信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

189
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java Normal file
View File

@ -0,0 +1,189 @@
package org.dromara.xzd.service.impl;
import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.xzd.domain.bo.XzdContractAccountBo;
import org.dromara.xzd.domain.vo.XzdContractAccountVo;
import org.dromara.xzd.domain.XzdContractAccount;
import org.dromara.xzd.mapper.XzdContractAccountMapper;
import org.dromara.xzd.service.IXzdContractAccountService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 承包合同竣工结算Service业务层处理
*
* @author Lion Li
* @date 2025-10-15
*/
@RequiredArgsConstructor
@Service
public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccountMapper, XzdContractAccount> implements IXzdContractAccountService {
private final XzdContractAccountMapper baseMapper;
@Autowired
private XzdContractDetailsServiceImpl xzdContractDetailsService;
@Autowired
private XzdSettlementRulesServiceImpl xzdSettlementRulesService;
/**
* 查询承包合同竣工结算
*
* @param id 主键
* @return 承包合同竣工结算
*/
@Override
public XzdContractAccountVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询承包合同竣工结算列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 承包合同竣工结算分页列表
*/
@Override
public TableDataInfo<XzdContractAccountVo> queryPageList(XzdContractAccountBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdContractAccount> lqw = buildQueryWrapper(bo);
Page<XzdContractAccountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的承包合同竣工结算列表
*
* @param bo 查询条件
* @return 承包合同竣工结算列表
*/
@Override
public List<XzdContractAccountVo> queryList(XzdContractAccountBo bo) {
LambdaQueryWrapper<XzdContractAccount> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<XzdContractAccount> buildQueryWrapper(XzdContractAccountBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdContractAccount> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdContractAccount::getId);
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdContractAccount::getTitle, bo.getTitle());
lqw.between(params.get("beginDocumentDate") != null && params.get("endDocumentDate") != null,
XzdContractAccount::getDocumentDate ,params.get("beginDocumentDate"), params.get("endDocumentDate"));
lqw.eq(bo.getContractId() != null, XzdContractAccount::getContractId, bo.getContractId());
lqw.eq(bo.getDeptId() != null, XzdContractAccount::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdContractAccount::getContractName, bo.getContractName());
lqw.eq(bo.getSubmittedCost() != null, XzdContractAccount::getSubmittedCost, bo.getSubmittedCost());
lqw.eq(bo.getTotalPrice() != null, XzdContractAccount::getTotalPrice, bo.getTotalPrice());
lqw.eq(bo.getApprovedDate() != null, XzdContractAccount::getApprovedDate, bo.getApprovedDate());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), XzdContractAccount::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getFirstParty()), XzdContractAccount::getFirstParty, bo.getFirstParty());
lqw.eq(StringUtils.isNotBlank(bo.getSecondParty()), XzdContractAccount::getSecondParty, bo.getSecondParty());
lqw.eq(bo.getTerms() != null, XzdContractAccount::getTerms, bo.getTerms());
lqw.eq(bo.getAmountReceivable() != null, XzdContractAccount::getAmountReceivable, bo.getAmountReceivable());
lqw.eq(bo.getCompletionDate() != null, XzdContractAccount::getCompletionDate, bo.getCompletionDate());
lqw.eq(bo.getSettlementAmount() != null, XzdContractAccount::getSettlementAmount, bo.getSettlementAmount());
lqw.eq(bo.getWarrantyAmount() != null, XzdContractAccount::getWarrantyAmount, bo.getWarrantyAmount());
lqw.eq(bo.getOwner() != null, XzdContractAccount::getOwner, bo.getOwner());
lqw.eq(bo.getSupervision() != null, XzdContractAccount::getSupervision, bo.getSupervision());
lqw.eq(bo.getReview() != null, XzdContractAccount::getReview, bo.getReview());
return lqw;
}
/**
* 新增承包合同竣工结算
*
* @param bo 承包合同竣工结算
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(XzdContractAccountBo bo) {
XzdContractAccount add = MapstructUtils.convert(bo, XzdContractAccount.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改承包合同竣工结算
*
* @param bo 承包合同竣工结算
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(XzdContractAccountBo bo) {
XzdContractAccount update = MapstructUtils.convert(bo, XzdContractAccount.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(XzdContractAccount entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除承包合同竣工结算信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
public void setValue(List<XzdContractAccountVo> vos){
for (XzdContractAccountVo vo : vos) {
//获取合同对象
XzdContractDetailsVo detailsVo = xzdContractDetailsService.queryById(vo.getContractId());
if (detailsVo != null){
List<XzdContractDetailsVo> detailsVo1 = List.of(detailsVo);
xzdContractDetailsService.setValue(detailsVo1);
detailsVo = detailsVo1.getFirst();
//合同名称
vo.setContractName(detailsVo.getContractName());
//合同编码
vo.setContractCode(detailsVo.getContractCode());
//项目名称
vo.setProjectName(detailsVo.getProjectName());
//甲方名称
vo.setFirstParty(detailsVo.getPartyAUnitName());
//乙方名称
vo.setSecondParty(detailsVo.getPartyBUnitName());
}
//支付条款对象
if (vo.getTerms() != null){
XzdSettlementRules settlementRulesVo = xzdSettlementRulesService.getById(vo.getTerms());
if (settlementRulesVo != null) {
vo.setSettlementRules(settlementRulesVo);
}
}
}
}
}