sql过滤条件更新

mjava-lanyun/src/main/java/com/malk/lanyun/Mapper/ProjectAnalysisMapper.java

@@ -26,11 +26,11 @@ public class ProjectAnalysisMapper implements RowMapper<ProjectAnalysis> {
         projectAnalysis.setCostSum(resultSet.getBigDecimal("cost_sum"));
         projectAnalysis.setTaxes(resultSet.getBigDecimal("taxes"));
         projectAnalysis.setGrossProfit(resultSet.getBigDecimal("gross_profit"));
-        projectAnalysis.setGrossMargin(resultSet.getBigDecimal("gross_margin"));
+        projectAnalysis.setGrossMargin(resultSet.getString("gross_margin"));
         projectAnalysis.setOverhead(resultSet.getBigDecimal("overhead"));
         projectAnalysis.setCorporateIncomeTax(resultSet.getBigDecimal("corporate_income_tax"));
         projectAnalysis.setNetProfit(resultSet.getBigDecimal("net_profit"));
-        projectAnalysis.setNetMargin(resultSet.getBigDecimal("net_margin"));
+        projectAnalysis.setNetMargin(resultSet.getString("net_margin"));
 //        projectAnalysis.setFormat(resultSet.getString("format"));
 //        projectAnalysis.setCustomerSystem(resultSet.getString("customer_system"));
 //        projectAnalysis.setProfitLoss(resultSet.getString("profit_loss"));

mjava-lanyun/src/main/java/com/malk/lanyun/entity/ProjectAnalysis.java

@@ -24,11 +24,11 @@ public class ProjectAnalysis implements Serializable {
     private BigDecimal costSum;
     private BigDecimal taxes;
     private BigDecimal grossProfit;
-    private BigDecimal grossMargin;
+    private String grossMargin;
     private BigDecimal overhead;
     private BigDecimal corporateIncomeTax;
     private BigDecimal netProfit;
-    private BigDecimal netMargin;
+    private String netMargin;
     private String format;
     private String customerSystem;
     private String profitLoss;