From 1fca851e22aa4dbac3ac3d4b20e68bbda3f9b94c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 31 七月 2023 15:59:25 +0800
Subject: [PATCH] #
---
/dev/null | 1
src/main/resources/datav/sql/销售订单.sql | 18 +++++++++
src/main/java/com/zy/crm/common/web/DatavController.java | 46 ++++++++++++++++++----
src/main/resources/datav/sql/生产订单.sql | 17 ++++++++
src/main/resources/application.yml | 2
5 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/web/DatavController.java b/src/main/java/com/zy/crm/common/web/DatavController.java
index ee065f0..ea43349 100644
--- a/src/main/java/com/zy/crm/common/web/DatavController.java
+++ b/src/main/java/com/zy/crm/common/web/DatavController.java
@@ -1,33 +1,61 @@
package com.zy.crm.common.web;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.crm.common.service.DbSqlServer;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.PostConstruct;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2023/7/25
*/
@RestController
+@SuppressWarnings("all")
public class DatavController {
- private String sql1;
+ private String 鐢熶骇璁㈠崟;
+ private String 閿�鍞鍗�;
- @PostConstruct
- public void init() throws IOException {
- this.sql1 = read(new ClassPathResource("datav/sql/1.sql").getInputStream());
+ {
+ try {
+ this.鐢熶骇璁㈠崟 = read(new ClassPathResource("datav/sql/鐢熶骇璁㈠崟.sql").getInputStream());
+ this.閿�鍞鍗� = read(new ClassPathResource("datav/sql/閿�鍞鍗�.sql").getInputStream());
+ } catch (IOException ignore) {}
}
- @GetMapping("/1test")
- public R test1() {
- return R.ok(this.sql1);
+ @Autowired
+ private DbSqlServer dbSqlServer;
+
+ @GetMapping("/data1")
+ public R data1() {
+ List<Map<String, Object>> res = dbSqlServer.select(this.鐢熶骇璁㈠崟);
+ if (Cools.isEmpty(res)) {
+ return R.ok();
+ }
+ int limit = 30;
+ if (res.size() > limit) {
+ res = res.subList(0, limit);
+ }
+ return R.ok().add(res);
}
- public static String read(InputStream inputStream) {
+ @GetMapping("/data3")
+ public R data3() {
+ List<Map<String, Object>> res = dbSqlServer.select(this.閿�鍞鍗�);
+ if (Cools.isEmpty(res)) {
+ return R.ok();
+ }
+ return R.ok().add(res);
+ }
+
+ private static String read(InputStream inputStream) {
StringBuilder stringBuilder = new StringBuilder();
byte[] buffer = new byte[1024];
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e941b4d..5607a7c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,6 +62,6 @@
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://rm-bp13167j4w0m2029meo.sqlserver.rds.aliyuncs.com:1433;databasename=xtyasrs_dual
+ ur: jdbc:sqlserver://rm-bp13167j4w0m2029meo.sqlserver.rds.aliyuncs.com:1433;databasename=ZYLK
username: u9c
password: Zhongyang@u9c$
diff --git a/src/main/resources/datav/sql/1.sql b/src/main/resources/datav/sql/1.sql
deleted file mode 100644
index f2ba8f8..0000000
--- a/src/main/resources/datav/sql/1.sql
+++ /dev/null
@@ -1 +0,0 @@
-abc
\ No newline at end of file
diff --git "a/src/main/resources/datav/sql/\347\224\237\344\272\247\350\256\242\345\215\225.sql" "b/src/main/resources/datav/sql/\347\224\237\344\272\247\350\256\242\345\215\225.sql"
new file mode 100644
index 0000000..cd49373
--- /dev/null
+++ "b/src/main/resources/datav/sql/\347\224\237\344\272\247\350\256\242\345\215\225.sql"
@@ -0,0 +1,17 @@
+select
+A5.NAME AS 鎵�灞炵粍缁�,
+A.DocNo as 鍗曞彿,A3.Code as 椤圭洰鍙�,a7.Name as 鍗曟嵁绫诲瀷,
+A.StartDate as 璁″垝寮�宸ユ棩,
+A.CompleteDate as 璁″垝瀹屽伐鏃�,A2.Code as 鏂欏彿,A2.name as 鍝佸悕,A2.SPECS as 瑙勬牸 , a.ProductQty as 鐢熶骇鏁伴噺,TotalCompleteQty as 瀹屽伐鏁伴噺
+from MO_MO as A
+left join CBO_ItemMaster as A2 on (A.ItemMaster = A2.ID)
+left join CBO_Project as A3 on (A.Project = A3.ID)
+left join Base_Organization as A4 on (A.Org = A4.ID)
+left join Base_Organization_Trl as a5 on (a4.ID = a5.ID)
+left join MO_MODocType as a6 on (a.MODocType=a6.ID)
+left join MO_MODocType_Trl as a7 on (a6.id=a7.ID)
+where A7.NAME != '鐮斿彂椤圭洰' --杩囨护鍐呴儴鐮斿彂椤圭洰
+and A.IsWBSTask!=1 --杩囨护鐜板満鏂藉伐浠诲姟
+and A.DocState != '3' --杩囨护瀹屽伐鐘舵�佺殑璁㈠崟
+and (A7.NAME IS NOT NULL AND A7.NAME !='')
+ORDER BY A.CompleteDate
\ No newline at end of file
diff --git "a/src/main/resources/datav/sql/\351\224\200\345\224\256\350\256\242\345\215\225.sql" "b/src/main/resources/datav/sql/\351\224\200\345\224\256\350\256\242\345\215\225.sql"
new file mode 100644
index 0000000..e6baf3c
--- /dev/null
+++ "b/src/main/resources/datav/sql/\351\224\200\345\224\256\350\256\242\345\215\225.sql"
@@ -0,0 +1,18 @@
+select sum(total) as sum, month
+from
+(
+ select A.DOCNO as 椤圭洰鍙�,a.TotalMoneyTC as total,a.CreatedOn as 鍒涘缓鏃ユ湡,a3.PersonName_DisplayName as 涓氬姟鍛�,
+ a7.Name as 椤圭洰绫诲瀷,A6.Name as 瀹㈡埛鍚嶇О,A9.name AS 鎵�灞炵粍缁�,Month(a.CreatedOn) as month
+ from SM_SO as A
+ left join CBO_Operators as A2 on(A.Seller = A2.ID)
+ left join Base_Contact as A3 on (a2.Contact=a3.ID)
+ left join SM_SODocType as A4 on (A.DocumentType = a4.ID)
+ left join SM_SODocType_Trl as A7 ON (A4.ID=A7.ID)
+ left join CBO_Customer as A5 on(A.OrderBy_Customer = A5.ID)
+ left join CBO_Customer_Trl as A6 on (A5.ID=A6.ID) AND (A6.SysMLFlag = 'zh-CN')
+ left join Base_Organization as A8 on (A.Org = A8.ID)
+ left join Base_Organization_Trl as a9 on (a8.ID = a9.ID)
+ where A5.CODE not in ('S-00002','S-00003') --杩囨护鍐呴儴浜ゆ槗鐨勮鍗�
+) a
+group by month
+order by month asc
--
Gitblit v1.9.1