diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java index 9635950..71857e8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java @@ -1,5 +1,6 @@ package com.ruoyi.invest.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -30,6 +31,9 @@ public class FutureStocksBill extends BaseEntity private String name; /** 账单日 */ + @ApiModelProperty(value="账单日") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "账单日", width = 30, dateFormat = "yyyy-MM-dd") private Date billDate; /** 期货股票id */ diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java index 782f35a..6a19592 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java @@ -35,7 +35,13 @@ public class FutureStocksBillServiceImpl implements IFutureStocksBillService @Override public FutureStocksBillVo selectFutureStocksBillById(Long id) { - return futureStocksBillMapper.selectFutureStocksBillById(id); + FutureStocksBillVo futureStocksBill=futureStocksBillMapper.selectFutureStocksBillById(id); + if(futureStocksBill.getFutureStocksCode()!=null){ + futureStocksBill.setFutureStocksNameCode(futureStocksBill.getFutureStocksName()+"("+ futureStocksBill.getFutureStocksCode()+")"); + }else { + futureStocksBill.setFutureStocksNameCode(futureStocksBill.getFutureStocksName()); + } + return futureStocksBill; } /**