From 6a061dfbf213a0d14ce14f2b08794b5d02903ca4 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 22 Jul 2022 17:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/model/Project.java     | 18 +++++++++---------
 .../cn/palmte/work/service/ProjectService.java |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index db8abf1..b954dcb 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -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;
     }
 }
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 9ff1d47..62382d9 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -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")));
         }