From 8118ab4dbe0b2ff014203fbef27447e23dda68bd Mon Sep 17 00:00:00 2001
From: ICEC <414933307@qq.com>
Date: Wed, 15 Jul 2020 11:23:18 +0800
Subject: [PATCH] no commit message
---
.../fx_sample_best_selling_by_use.vue | 21 +++++++++++++++++++
.../DB_Ajax_DashBoard_Technologist_48102.java | 10 ++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue
index 1431d6d74..15cad349b 100644
--- a/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue
+++ b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue
@@ -30,6 +30,11 @@
sortable
label="热销区域">
+
+
@@ -64,6 +69,11 @@
sortable
label="热销区域">
+
+
@@ -98,6 +108,11 @@
sortable
label="热销区域">
+
+
@@ -156,6 +171,8 @@
MouldingStyleCode: response.data[i].MouldingStyleCode,
CNY: ((response.data[i].CNY)*1).toFixed(2),
Area: response.data[i].Area,
+ CustomerNum: response.data[i].CustomerNum,
+
})
}
@@ -171,6 +188,8 @@
MouldingStyleCode: response.data[i].MouldingStyleCode,
CNY: ((response.data[i].CNY)*1).toFixed(2),
Area: response.data[i].Area,
+ CustomerNum: response.data[i].CustomerNum,
+
})
}
})
@@ -185,6 +204,8 @@
MouldingStyleCode: response.data[i].MouldingStyleCode,
CNY: ((response.data[i].CNY)*1).toFixed(2),
Area: response.data[i].Area,
+ CustomerNum: response.data[i].CustomerNum,
+
})
}
})
diff --git a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
index aafd0c4ed..926a7d2ef 100644
--- a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
+++ b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
@@ -459,9 +459,9 @@ public class DB_Ajax_DashBoard_Technologist_48102 {
String sql = "SELECT DISTINCT TOP\n" +
"\t20 chen_12个月_A版本BOM销售额.MouldingStyleCode,\n" +
"\tchen_12个月_A版本BOM销售额.[折算人民币价税合计] AS CNY,\n" +
- "\tchen_打样分析汇总.[客户数量],\n" +
+ "\tchen_打样分析汇总.[客户数量] as CustomerNum,\n" +
"\tMouldingSampleMakingMasterSchedule.ProductionLine ,\n" +
- "\t( SELECT TOP 1 SHCountry FROM MouldingDataStatistics WHERE MouldingCode = reverse( SUBSTRING ( reverse( chen_12个月_A版本BOM销售额.MouldingStyleCode ), charindex( '-', reverse( chen_12个月_A版本BOM销售额.MouldingStyleCode ) ) + 1, 500 ) ) GROUP BY SHCountry ORDER BY SUM ( SHMouldingSaleLength ) DESC ) AS Area \n" +
+ "\t( SELECT TOP 1 SHCountry FROM MouldingDataStatistics WHERE MouldingCode = reverse( SUBSTRING ( reverse( chen_12个月_A版本BOM销售额.MouldingStyleCode ), charindex( '-', reverse( chen_12个月_A版本BOM销售额.MouldingStyleCode ) ) + 1, 500 ) ) and SHCountry is not null GROUP BY SHCountry ORDER BY SUM ( SHMouldingSaleLength ) DESC ) AS Area \n" +
"FROM\n" +
"\t[chen_12个月_A版本BOM销售额]\n" +
"\tLEFT JOIN MouldingSampleMakingMasterSchedule ON MouldingSampleMakingMasterSchedule.MouldingStyleCode = chen_12个月_A版本BOM销售额.MouldingStyleCode\n" +
@@ -479,6 +479,8 @@ public class DB_Ajax_DashBoard_Technologist_48102 {
map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
map.put("CNY",rs.getString("CNY"));
map.put("Area",rs.getString("Area"));
+ map.put("CustomerNum",rs.getString("CustomerNum"));
+
hashMapList.add(map);
}
@@ -502,7 +504,7 @@ public class DB_Ajax_DashBoard_Technologist_48102 {
Connection conn = getSQLConnection();
String sql = "SELECT DISTINCT TOP\n" +
"\t20 chen_12个月_A版本BOM销售额.MouldingStyleCode,\n" +
- "\tchen_12个月_A版本BOM销售额.[折算人民币价税合计] AS CNY,\tchen_打样分析汇总.[客户数量],\n" +
+ "\tchen_12个月_A版本BOM销售额.[折算人民币价税合计] AS CNY,\tchen_打样分析汇总.[客户数量] as CustomerNum,\n" +
"\tMouldingSampleMakingMasterSchedule.ProductionLine ,\n" +
"\n" +
"\t(SELECT TOP\n" +
@@ -531,6 +533,8 @@ public class DB_Ajax_DashBoard_Technologist_48102 {
map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
map.put("CNY",rs.getString("CNY"));
map.put("Area",rs.getString("Area"));
+ map.put("CustomerNum",rs.getString("CustomerNum"));
+
hashMapList.add(map);
}