Browse Source

销售跟单BUG修复

caozj 1 year ago
parent
commit
b145bf4fc9

+ 4 - 1
hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -202,7 +202,10 @@ public class ContractVo extends Contract {
      */
     private Integer documentaryCount;
 
-
+    /**
+     * 订单状态
+     */
+    private Integer orderStatus;
 
 }
 

+ 3 - 3
hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -410,9 +410,9 @@
             CASE
 
             WHEN t1.purchaseAmountCNY < t1.amountCNY AND t1.sumClaimMoney < t1.amountCNY THEN 10
-            WHEN t1.purchaseAmountCNY < t1.amountCNY AND t1.sumClaimMoney > t1.amountCNY THEN 20
-            WHEN t1.purchaseAmountCNY > t1.amountCNY AND t1.sumClaimMoney < t1.amountCNY THEN 30
-            WHEN t1.purchaseAmountCNY > t1.amountCNY AND t1.sumClaimMoney > t1.amountCNY THEN 40
+            WHEN t1.purchaseAmountCNY < t1.amountCNY AND t1.sumClaimMoney >= t1.amountCNY THEN 20
+            WHEN t1.purchaseAmountCNY >= t1.amountCNY AND t1.sumClaimMoney < t1.amountCNY THEN 30
+            WHEN t1.purchaseAmountCNY >= t1.amountCNY AND t1.sumClaimMoney >= t1.amountCNY THEN 40
             ELSE 88
             END AS orderStatus
         FROM