Browse Source

订单项目统计列表修改

anderx 1 year ago
parent
commit
2ddad75bb1

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

@@ -194,7 +194,7 @@ public class OutOrderProject {
      * 是否重报
      */
     @Excel(name = "是否重报")
-    private String restatement;
+    private String restatementCount;
     /**
      * 是否科技项目(订单类型) 0认证项目 1科技项目 2 两化融化管理体系认证项目
      */
@@ -259,12 +259,12 @@ public class OutOrderProject {
      * 变更情况
      */
     @Excel(name = "变更情况")
-    private String changeType;
+    private String changeCount;
     /**
      * 退单退款
      */
     @Excel(name = "退单退款")
-    private String refundType;
+    private String refundCount;
 
     public String getOrderNo() {
         return orderNo;
@@ -546,13 +546,6 @@ public class OutOrderProject {
         this.taskDistributionTime = taskDistributionTime;
     }
 
-    public String getRestatement() {
-        return restatement;
-    }
-
-    public void setRestatement(String restatement) {
-        this.restatement = restatement;
-    }
 
     public String getOrderType() {
         return orderType;
@@ -650,19 +643,27 @@ public class OutOrderProject {
         this.orderStatus = orderStatus;
     }
 
-    public String getChangeType() {
-        return changeType;
+    public String getRestatementCount() {
+        return restatementCount;
+    }
+
+    public void setRestatementCount(String restatementCount) {
+        this.restatementCount = restatementCount;
+    }
+
+    public String getChangeCount() {
+        return changeCount;
     }
 
-    public void setChangeType(String changeType) {
-        this.changeType = changeType;
+    public void setChangeCount(String changeCount) {
+        this.changeCount = changeCount;
     }
 
-    public String getRefundType() {
-        return refundType;
+    public String getRefundCount() {
+        return refundCount;
     }
 
-    public void setRefundType(String refundType) {
-        this.refundType = refundType;
+    public void setRefundCount(String refundCount) {
+        this.refundCount = refundCount;
     }
 }

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

@@ -121,15 +121,15 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 			}else {
 				e.setContractAmountProportion("100%");
 			}
-			if (e.getRefundType()!=null&&e.getRefundType().equals("1")){
-				e.setRefundType("有");
+			if (e.getRefundCount()!=null&&e.getRefundCount().equals("1")){
+				e.setRefundCount("有");
 			}else {
-				e.setRefundType("无");
+				e.setRefundCount("无");
 			}
-			if (e.getRestatement()!=null&&e.getRestatement().equals("1")){
-				e.setRestatement("有");
+			if (e.getRestatementCount()!=null&&e.getRestatementCount().equals("1")){
+				e.setRestatementCount("有");
 			}else {
-				e.setRestatement("无");
+				e.setRestatementCount("无");
 			}
 			if (e.getOrderType()!=null&&e.getOrderType().equals("1")){
 				e.setOrderType("有");