Browse Source

订单项目统计列表修改

anderx 1 year ago
parent
commit
9ea4574b88

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMidMapper.xml

@@ -730,7 +730,7 @@
     e3.cost_amount as costAmount,e.project_status as  projectStatus,e.task_start_time as taskStartTime,e.task_end_time as taskEndTime,
     e.receiver_name as receiverName ,'技术组' jsz,a.order_status orderStatus,e.satisfaction_degree satisfactionDegree,
     e.task_comment taskComment,'核算比例' hsbl,a.order_status orderStatus,
-    b.change_count changeCount, b.restatement_count restatementCount,b.refund_count refundCount
+    b.change_count changeType, b.restatement_count restatementType,b.refund_count refundType
     from t_order_new a
     left join t_order_mid b on a.order_no =b.order_no
     left join t_order_task c on a.order_no =c.order_no and c.main =1

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

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

+ 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.getRefundCount()!=null&&e.getRefundCount().equals("1")){
-				e.setRefundCount("有");
+			if (e.getRefundType()!=null&&e.getRefundType().equals("1")){
+				e.setRefundType("有");
 			}else {
-				e.setRefundCount("无");
+				e.setRefundType("无");
 			}
-			if (e.getRestatementCount()!=null&&e.getRestatementCount().equals("1")){
-				e.setRestatementCount("有");
+			if (e.getRestatementType()!=null&&e.getRestatementType().equals("1")){
+				e.setRestatementType("有");
 			}else {
-				e.setRestatementCount("无");
+				e.setRestatementType("无");
 			}
 			if (e.getOrderType()!=null&&e.getOrderType().equals("1")){
 				e.setOrderType("有");