Merge remote-tracking branch 'origin/master'

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: '',
         }
       }

supervise-crm-ui/src/layout/index.vue

@@ -11,7 +11,7 @@
     <div class="main-container">
       <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
-        <a href="javascript:void(0);" class="text-center">客户中心</a>
+        <a href="javascript:void(0);" class="text-center">客户管理</a>
       </div>
       <sidebar class="sidebar-container" />
       <!--菜单-->

supervise-customer-ui/src/layout/components/Navbar.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-      <h3 class="breadcrumb-container">汇融银行贷后监管平台</h3>
+      <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3>
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
         <p>欢迎您，{{name}}</p>
@@ -10,7 +10,7 @@
         <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融银行贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融银行供应链贷后监管平台 All Rights Reserved</el-footer>
   </div>
 </template>
 

supervise-customer-ui/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融银行贷后监管平台',
+  title: '汇融银行供应链贷后监管平台',
 
   /**
    * @type {boolean} true | false

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<GdInstorageCount> {
      *
      * @return
      */
-    @Select("select name,1 as ee,convert(ifnull(billtotalprice,0),decimal(12,2)) billtotalprice , " +
+    // @Select("select name,1 as ee,convert(ifnull(billtotalprice,0),decimal(12,2)) billtotalprice , " +
-            "CONVERT(IFNULL(prodvalue,0),DECIMAL(12,2)) prodvalue , " +
+    //         "CONVERT(IFNULL(prodvalue,0),DECIMAL(12,2)) prodvalue , " +
-            "CONVERT(IFNULL(wdhjz,0),DECIMAL(12,2)) wdhjz , " +
+    //         "CONVERT(IFNULL(wdhjz,0),DECIMAL(12,2)) wdhjz , " +
-            "CONVERT(IFNULL(cchjz,0),DECIMAL(12,2)) cchjz ,arrivaldate,sfyq from `hz_ztspglhzb`")
+    //         "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<Map<String, Object>> gysdhhzb();
 
     /**

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountMapper">
-    <select id="spdhmxb" resultType="java.util.Map">
+    <select id="spdhmxb111" resultType="java.util.Map">
         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
 
     </select>
+    <select id="spdhmxb" resultType="java.util.Map">
+        SELECT
+        name,
+        proCode,
+        proName,
+        number ,
+        packageTotalPrice   ptotalPrice,
+        prodNum ,
+        prodValue ,
+        number-prodNum  ztnumber,
+        IF((  packageTotalPrice  -  prodValue  )>0,  packageTotalPrice  -  prodValue  ,0) ztprodValue1,
+        IF((  prodValue -  packageTotalPrice  )>0,  prodValue  - packageTotalPrice  ,0) ztprodValue2
+        FROM(
+        SELECT
+        sbi.name ,
+        prp.`proCode`,
+        prp.`proName`,
+        prp.`number`,
+        SUM(CONVERT(packageTotalPrice,DECIMAL(12,2))) packageTotalPrice,
+        (
+        SELECT CONVERT(IFNULL(SUM(colr17),0),DECIMAL(12,2)) FROM gd_instorage gic LEFT JOIN `product_information` pi ON pi.code=gic.colh7
+        WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode
+        AND prp.`proCode`=gic.colh7
+        AND pi.categoryKey IN(SELECT categoryKey FROM `restricted_category`)
+        AND pi.brandsid IN(SELECT CODE FROM `restricted_brand`)
+        ) prodNum,
+        (
+        SELECT CONVERT(IFNULL(SUM(colq16),0),DECIMAL(12,2)) FROM gd_instorage gic LEFT JOIN `product_information` pi ON pi.code=gic.colh7
+        WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode
+        AND prp.`proCode`=gic.colh7
+        AND pi.categoryKey IN(SELECT categoryKey FROM `restricted_category`)
+        AND pi.brandsid IN(SELECT CODE FROM `restricted_brand`)
+        ) prodValue
+        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,prp.`proCode`  ORDER BY sbi.name,prp.`proCode`
+        ) t
+
+    </select>
 </mapper>