From 8ccb6f885d6c7c03ebedbf4c47809a8c7dd9b97b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sun, 29 Jan 2023 14:58:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83--=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-customer-ui/src/layout/components/Navbar.vue | 4 ++-- supervise-customer-ui/src/settings.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/supervise-customer-ui/src/layout/components/Navbar.vue b/supervise-customer-ui/src/layout/components/Navbar.vue index 3f5fd403..ede3fb2a 100644 --- a/supervise-customer-ui/src/layout/components/Navbar.vue +++ b/supervise-customer-ui/src/layout/components/Navbar.vue @@ -1,7 +1,7 @@ diff --git a/supervise-customer-ui/src/settings.js b/supervise-customer-ui/src/settings.js index ab757998..d29191e3 100644 --- a/supervise-customer-ui/src/settings.js +++ b/supervise-customer-ui/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '汇融银行贷后监管平台', + title: '汇融银行供应链贷后监管平台', /** * @type {boolean} true | false From a563f6dcf3e3ed001bc29d33d83450572ebecd50 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sun, 29 Jan 2023 15:42:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-crm-ui/src/layout/components/Sidebar/index.vue | 2 +- supervise-crm-ui/src/layout/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/supervise-crm-ui/src/layout/components/Sidebar/index.vue b/supervise-crm-ui/src/layout/components/Sidebar/index.vue index ca588233..fe7c9255 100644 --- a/supervise-crm-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-crm-ui/src/layout/components/Sidebar/index.vue @@ -35,7 +35,7 @@ YongHuid: [], routes: [], params: { - sourceSid: '8aeb5ddd-b810-4846-96bf-34262094c0ea', + sourceSid: '9d048c07-7677-4774-9177-aa02b049ff06', userSid: '', } } diff --git a/supervise-crm-ui/src/layout/index.vue b/supervise-crm-ui/src/layout/index.vue index 4254e872..b1a19806 100644 --- a/supervise-crm-ui/src/layout/index.vue +++ b/supervise-crm-ui/src/layout/index.vue @@ -11,7 +11,7 @@
平台首页 - 客户中心 + 客户管理
From beb4accefed3e07535180c3f7a5e723b6262141e Mon Sep 17 00:00:00 2001 From: lzh Date: Sun, 29 Jan 2023 15:46:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E9=80=94=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdinstorage/GdInstorageCountMapper.java | 31 +++++++++++-- .../gdinstorage/GdInstorageCountMapper.xml | 43 ++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java index c3f44bd5..6c1739e9 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java @@ -63,10 +63,33 @@ public interface GdInstorageCountMapper extends BaseMapper { * * @return */ - @Select("select name,1 as ee,convert(ifnull(billtotalprice,0),decimal(12,2)) billtotalprice , " + - "CONVERT(IFNULL(prodvalue,0),DECIMAL(12,2)) prodvalue , " + - "CONVERT(IFNULL(wdhjz,0),DECIMAL(12,2)) wdhjz , " + - "CONVERT(IFNULL(cchjz,0),DECIMAL(12,2)) cchjz ,arrivaldate,sfyq from `hz_ztspglhzb`") + // @Select("select name,1 as ee,convert(ifnull(billtotalprice,0),decimal(12,2)) billtotalprice , " + + // "CONVERT(IFNULL(prodvalue,0),DECIMAL(12,2)) prodvalue , " + + // "CONVERT(IFNULL(wdhjz,0),DECIMAL(12,2)) wdhjz , " + + // "CONVERT(IFNULL(cchjz,0),DECIMAL(12,2)) cchjz ,arrivaldate,sfyq from `hz_ztspglhzb`") + @Select("SELECT t.*, " + + " CONVERT(IF((t.billTotalPrice-t.prodValue)>0,t.billTotalPrice-t.prodValue,0),DECIMAL(12,2)) wdhjz, " + + " CONVERT(IF((t.prodValue-t.billTotalPrice)>0,t.prodValue-t.billTotalPrice,0),DECIMAL(12,2)) cchjz, " + + " IF((t.billTotalPrice-t.prodValue)>0,'是','否') sfyq " + + "FROM( " + + " SELECT " + + " MAX(sbi.codeUnified) codeUnified, " + + " MAX(sbi.name) name , " + + " 1 as ee, " + + " CONVERT(SUM(packageTotalPrice),DECIMAL(12,2)) billtotalprice, " + + " ( " + + " SELECT CONVERT(SUM(colq16),DECIMAL(12,2)) FROM gd_instorage gic LEFT JOIN `product_information` PI ON pi.code=gic.colh7 " + + " WHERE gic.supplierCodeUnified=pr.supplierOnlyCode " + + " AND pi.categoryKey IN(SELECT categoryKey FROM `restricted_category`) " + + " AND pi.brandsid IN(SELECT CODE FROM `restricted_brand`) " + + " ) prodvalue, " + + " MAX(pr.`arrivalDate`) arrivaldate " + + " FROM `supplier_bank_info` sbi " + + " LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " + + " LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + + " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " + + " GROUP BY pr.supplierOnlyCode ORDER BY sbi.name " + + ") t ") List> gysdhhzb(); /** diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml index 17933203..fb987816 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml @@ -1,7 +1,7 @@ - SELECT name,proCode,proName, number , packageTotalPrice ptotalPrice, prodNum , prodValue , number-prodNum ztnumber, IF(( packageTotalPrice - prodValue )>0, packageTotalPrice - prodValue ,0) ztprodValue1, @@ -16,4 +16,45 @@ GROUP BY pr.supplierOnlyCode,prp.`proCode` ORDER BY sbi.name,prp.`proCode`) t + \ No newline at end of file