qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 期货账单，bug修复。

Browse Source
This commit is contained in:
tianyongbao
2024-06-19 18:41:24 +08:00
parent 8e1ea226bf
commit e913962851
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.invest.domain; package com.ruoyi.invest.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@@ -30,6 +31,9 @@ public class FutureStocksBill extends BaseEntity
private String name; private String name;
/** 账单日 */ /** 账单日 */
@ApiModelProperty(value="账单日")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "账单日", width = 30, dateFormat = "yyyy-MM-dd")
private Date billDate; private Date billDate;
/** 期货股票id */ /** 期货股票id */

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java
View File

@@ -35,7 +35,13 @@ public class FutureStocksBillServiceImpl implements IFutureStocksBillService
@Override @Override
public FutureStocksBillVo selectFutureStocksBillById(Long id) 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;
} }
/** /**