From c4e5a143a1a22124daf6fbd95269ca14a6c7d149 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 17 Jun 2021 22:35:30 +0800
Subject: [PATCH] 业绩规则4
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html | 1 +
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 1 +
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 3 +++
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 15 +++++++++++++--
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index fe414cc..0c313f0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -3,11 +3,9 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
-import com.matrix.system.app.dto.BasePageDto;
import com.matrix.system.common.bean.EntityDTOExt;
import org.springframework.format.annotation.DateTimeFormat;
-import java.io.Serializable;
import java.util.Date;
/**
*
@@ -251,6 +249,19 @@
private String cateName;
+ /**
+ * 业绩规则名称
+ */
+ private String achieveRuleName;
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
+
public Double getCardCash() {
return cardCash;
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 651ca07..b66d44a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -52,6 +52,7 @@
<result property="goodsName" column="goodsName" />
<result property="cateName" column="cateName" />
+ <result property="achieveRuleName" column="achieveRuleName" />
</resultMap>
@@ -68,6 +69,7 @@
e.name as pro_name,
b.ZK_TOTAL as zk_total,
a.his_consume,
+ er.name as achieveRuleName,
a.free_consume,
f.su_name meiliao,
g.su_name guwen,
@@ -88,6 +90,7 @@
left join sys_vip_info c on a.vip_id=c.id
left join sys_vip_level d on c.LEVEL_ID=d.id
left join shopping_goods e on a.shopping_goods_id=e.id
+ left join achieve_rule er on e.achieve_rule_id=er.id
LEFT JOIN sys_users f on a.beault_id=f.su_id
LEFT JOIN sys_users g on a.sale_id = g.su_id
LEFT JOIN sys_shop_info h ON a.SHOP_ID = h.ID
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
index 2243f43..32384da 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
@@ -111,6 +111,7 @@
<el-table-column prop="orderType" label="订单类型"></el-table-column>
<el-table-column prop="vipName" label="会员姓名"></el-table-column>
<el-table-column prop="proName" label="产品" width="200"></el-table-column>
+ <el-table-column prop="achieveRuleName" label="业绩规则" width="200"></el-table-column>
<el-table-column prop="cateName" label="产品分类"></el-table-column>
<el-table-column prop="zkTotal" label="订单金额"></el-table-column>
<el-table-column prop="goodsCash" label="现金"></el-table-column>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
index 8da1de1..75306ee 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
@@ -113,6 +113,7 @@
<el-table-column prop="orderType" label="订单类型"></el-table-column>
<el-table-column prop="vipName" label="会员姓名"></el-table-column>
<el-table-column prop="proName" label="产品" width="200"></el-table-column>
+ <el-table-column prop="achieveRuleName" label="业绩规则" width="200"></el-table-column>
<el-table-column prop="cateName" label="产品分类"></el-table-column>
<el-table-column prop="zkTotal" label="订单金额"></el-table-column>
<el-table-column prop="goodsCash" label="现金"></el-table-column>
--
Gitblit v1.9.1