Browse Source

报销完成新增订单统计

anderx 1 year ago
parent
commit
3a1f9696d6

+ 2 - 2
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -251,9 +251,9 @@ public class OutOrderProject {
     @Excel(name = "核算比例")
     private String hsbl;
     /**
-     * 订单情况
+     * 订单情况 ,readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单"
      */
-    @Excel(name = "订单情况",readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单")
+    @Excel(name = "订单情况")
     private String orderStatus;
     /**
      * 变更情况

+ 34 - 0
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -147,6 +147,40 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 					e.setArrearsAmount(e.getOrderReceivables().subtract(e.getSettlementAmount()));
 				}
 			}
+			if(e.getChangeType().equals("0")){
+				e.setChangeType("无");
+			}else {
+				e.setChangeType("更新"+e.getChangeType()+"次");
+			}
+			if (e.getOrderStatus()!=null){
+				//0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单
+				switch(e.getOrderStatus())
+					{
+					case "0":
+						e.setOrderStatus("待签单");
+						break;
+					case "1":
+						e.setOrderStatus("签单待审核");
+						break;
+					case "2":
+						e.setOrderStatus("签单审核通过");
+						break;
+					case "3":
+						e.setOrderStatus("签单审核拒绝");
+						break;
+					case "4":
+						e.setOrderStatus("已结项");
+						break;
+					case "5":
+						e.setOrderStatus("已驳回");
+						break;
+					case "6":
+						e.setOrderStatus("已退单");
+						break;
+					default:
+						e.setOrderStatus("未知");
+				}
+			}
 
 		}
 		return page;