fix: 期货账单,bug修复。

This commit is contained in:
tianyongbao
2024-06-19 18:41:24 +08:00
parent b43f165d06
commit c9fcb90385
2 changed files with 11 additions and 1 deletions

View File

@@ -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 */

View File

@@ -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;
}
/**