mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导出增加字段

master
OathK1per 2022-07-22 17:45:19 +08:00
parent e7a93593e0
commit 6a061dfbf2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/cn/palmte/work/model/Project.java
View File

@ -183,13 +183,13 @@ public class Project {
private String planEndStr;
@Transient
private BigDecimal contractRound;
private String contractRound;
@Transient
private BigDecimal huazhiRound;
private String huazhiRound;
@Transient
private BigDecimal ziguangRound;
private String ziguangRound;
public int getId() {
return id;
@ -511,27 +511,27 @@ public class Project {
this.planEndStr = planEndStr;
}
public BigDecimal getContractRound() {
public String getContractRound() {
return contractRound;
}
public void setContractRound(BigDecimal contractRound) {
public void setContractRound(String contractRound) {
this.contractRound = contractRound;
}
public BigDecimal getHuazhiRound() {
public String getHuazhiRound() {
return huazhiRound;
}
public void setHuazhiRound(BigDecimal huazhiRound) {
public void setHuazhiRound(String huazhiRound) {
this.huazhiRound = huazhiRound;
}
public BigDecimal getZiguangRound() {
public String getZiguangRound() {
return ziguangRound;
}
public void setZiguangRound(BigDecimal ziguangRound) {
public void setZiguangRound(String ziguangRound) {
this.ziguangRound = ziguangRound;
}
}

2
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -52,7 +52,7 @@ public class ProjectService {
"CASE p.status WHEN 0 THEN '草稿' WHEN 1 THEN '项目创建' WHEN 5 THEN '概算完成' WHEN 10 THEN '预算完成' WHEN 15 THEN '结算中' WHEN 20 THEN '决算完成' ELSE '未知' AS statusDesc," +
"CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," +
*/
QueryHelper queryHelper = new QueryHelper("SELECT p.*, Round(p.contract_amount,2) as contractRound, Round(p.huazhi_product_amount,2) as huazhiRound, Round(p.ziguang_other_amount,2) as ziguangRound","project","p");
QueryHelper queryHelper = new QueryHelper("SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound","project","p");
if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){
queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status")));
}