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 @@
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
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