From 47b223121c982f28fe478f8b146d8eb949053e33 Mon Sep 17 00:00:00 2001
From: kinghan <hanzheng@seaskysh.com>
Date: Thu, 27 Apr 2023 23:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=A9=E6=94=BF=20=E4=B8=8A=E6=88=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B920230427?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat.WebApp/PubWeChatSta.ashx.cs          | 27 ++++++++++++---------
 WeChat.WebPage/BLL/FundBLL.cs               | 10 +++++++-
 WeChat.WebPage/Controllers/PubController.cs |  8 ++++++
 WeChat.WebPage/Error.htm                    | 21 ++++++++--------
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/WeChat.WebApp/PubWeChatSta.ashx.cs b/WeChat.WebApp/PubWeChatSta.ashx.cs
index d2b3171..d00708b 100644
--- a/WeChat.WebApp/PubWeChatSta.ashx.cs
+++ b/WeChat.WebApp/PubWeChatSta.ashx.cs
@@ -142,30 +142,33 @@ namespace WeChat.WebApp
             ChildMenu menu11 = new ChildMenu("钖祫鏌ヨ", ChildMenu.MenuTypeEnum.view, "http://Cwcw.sta.edu.cn/Pub/Index?state=Sta!salary");
             ChildMenu menu12 = new ChildMenu("椤圭洰鏌ヨ", ChildMenu.MenuTypeEnum.view, "http://Cwcw.sta.edu.cn/Pub/Index?state=Sta!fund");
             ChildMenu menu13 = new ChildMenu("瀛﹁垂鏌ヨ", ChildMenu.MenuTypeEnum.view, "http://Cwcw.sta.edu.cn/Pub/Index?state=Sta!charge");
-            ChildMenu menu14 = new ChildMenu("鏉ユ鏌ヨ", ChildMenu.MenuTypeEnum.click, "14");
-            ChildMenu menu15 = new ChildMenu("娲ヨˉ璐存煡璇�", ChildMenu.MenuTypeEnum.click, "15");
+            //ChildMenu menu14 = new ChildMenu("鏉ユ鏌ヨ", ChildMenu.MenuTypeEnum.click, "14");
+            //ChildMenu menu15 = new ChildMenu("娲ヨˉ璐存煡璇�", ChildMenu.MenuTypeEnum.click, "15");
 
 
             menu1.sub_button.Add(menu11);
             menu1.sub_button.Add(menu12);
             menu1.sub_button.Add(menu13);
-            menu1.sub_button.Add(menu14);
-            menu1.sub_button.Add(menu15);
+            //menu1.sub_button.Add(menu14);
+            //menu1.sub_button.Add(menu15);
 
-            ChildMenu menu21 = new ChildMenu("瀛︾敓缂磋垂", ChildMenu.MenuTypeEnum.view, "http://payment.cloud.ccb.com/index_u.jhtml?param=4C4A647F371B43F11DBA91BA7799EE58C59D79B9E834A07D7CE6C5522E5A9F46DA6A3FC12483D94B4D562A556E153CFFD15776F0B17D91BE65EC5221B4A931F1C1F6331EE5E1ED11232A46AA1E196B49DC7901A2E97F9D32C9472BFD4CA567687AC7760BB7E6CB52E11236DC3E5F61C1D1B21F50E66048EA47A4526B703C5C90546B9B12CB61C99D9264D07D287F5EC8");
-            ChildMenu menu22 = new ChildMenu("鎶ヨ处璺熻釜", ChildMenu.MenuTypeEnum.click, "22");
+            ChildMenu menu21 = new ChildMenu("瀛︾敓缂磋垂");//, ChildMenu.MenuTypeEnum.view, ""
+            ////http://payment.cloud.ccb.com/index_u.jhtml?param=4C4A647F371B43F11DBA91BA7799EE58C59D79B9E834A07D7CE6C5522E5A9F46DA6A3FC12483D94B4D562A556E153CFFD15776F0B17D91BE65EC5221B4A931F1C1F6331EE5E1ED11232A46AA1E196B49DC7901A2E97F9D32C9472BFD4CA567687AC7760BB7E6CB52E11236DC3E5F61C1D1B21F50E66048EA47A4526B703C5C90546B9B12CB61C99D9264D07D287F5EC8
+            //ChildMenu menu22 = new ChildMenu("鎶ヨ处璺熻釜", ChildMenu.MenuTypeEnum.click, "22");
 
 
             menu2.sub_button.Add(menu21);
-            menu2.sub_button.Add(menu22);
+            //menu2.sub_button.Add(menu22);
 
-            ChildMenu menu31 = new ChildMenu("閫氱煡鍏憡", ChildMenu.MenuTypeEnum.view, "http://cwcw.sta.edu.cn:8001/Home/Articles?m=0c356049-28f7-475f-98fa-152d51737ed5");
-            ChildMenu menu32 = new ChildMenu("鎶ラ攢鍒跺害", ChildMenu.MenuTypeEnum.view, "http://cwcw.sta.edu.cn/bxzn.html");
-            ChildMenu menu33 = new ChildMenu("鍙戠エ楠岀湡", ChildMenu.MenuTypeEnum.view, "https://www.tax.sh.gov.cn/wsbs/WSBSptFpCx_loginsNewl.jsp");
+            ChildMenu menu31 = new ChildMenu("閫氱煡鍏憡", ChildMenu.MenuTypeEnum.view, "http://Cwcw.sta.edu.cn/Pub/Index?state=Sta!tzgg");
+            ChildMenu menu32 = new ChildMenu("鎶ラ攢鍒跺害", ChildMenu.MenuTypeEnum.view, "http://Cwcw.sta.edu.cn/Pub/Index?state=Sta!bxzd");
+            ChildMenu menu39 = new ChildMenu("甯哥敤璐㈠姟淇℃伅", ChildMenu.MenuTypeEnum.view, "http://cwcw.sta.edu.cn/cycwxx.html");
+            //ChildMenu menu33 = new ChildMenu("鍙戠エ楠岀湡", ChildMenu.MenuTypeEnum.view, "https://www.tax.sh.gov.cn/wsbs/WSBSptFpCx_loginsNewl.jsp");
             ChildMenu menu34 = new ChildMenu("瑙i櫎缁戝畾", ChildMenu.MenuTypeEnum.click, "31");
             menu3.sub_button.Add(menu31);
-            menu3.sub_button.Add(menu32);
-            menu3.sub_button.Add(menu33);
+            menu3.sub_button.Add(menu32);
+            menu3.sub_button.Add(menu39);
+            //menu3.sub_button.Add(menu33);
             menu3.sub_button.Add(menu34);
 
             rootmenu.button.Add(menu1);
diff --git a/WeChat.WebPage/BLL/FundBLL.cs b/WeChat.WebPage/BLL/FundBLL.cs
index 50bb15c..a5826e9 100644
--- a/WeChat.WebPage/BLL/FundBLL.cs
+++ b/WeChat.WebPage/BLL/FundBLL.cs
@@ -106,6 +106,13 @@ namespace WeChat.WebPage.BLL
 
             string sql = string.Format(@"
 
+select OutFreezeAmount,ProjectCode,ProjectName,ValidDate,BegBalance,ApproveIn,
+ case when SR is null then 0 else SR end as SR,
+ case when ZC is null then 0 else ZC end as ZC,
+ case when JK is null then 0 else JK end as JK,
+ case when YE is null then 0 else YE end as YE,
+ case when SYV is null then 0 else SYV end as SYV from 
+(
  select OutFreezeAmount,a.ProjectCode,a.ProjectName,a.ValidDate,BegBalance,ApproveIn,SR,ZC,JK,(BegBalance-BegTranpayout+ApproveIn+SR-ZC-JK) as YE,(convert(decimal(18,2),(ZC+JK)/(BegBalance+ApproveIn+SR-BegTranpayout)))*100 as SYV from 
  (
  select YearId,ProjectCode,ProjectName,t1.validDate,t2.OutFreezeAmount,
@@ -124,7 +131,7 @@ and  ProjectCode in
 ) 
 {0}
 )a
-join 
+left join 
 (
  select ProjectCode,ProjectName,sum(case when BudType=3 then BudMoney else 0 end )as SR,sum(case when BudType=2 then BudMoney else 0 end) as  ZC,sum(case when BudType=1 then BudMoney else 0 end) as  JK from 
 (
@@ -163,6 +170,7 @@ where t1.ValidStatus = 1 and t1.[Year]='{1}'
 {0}
 group by ProjectCode,ProjectName,BudType
 )b on a.ProjectCode=b.ProjectCode
+)a
 order by a.ProjectCode
 ", sqlwhere, Year, peopleCode);
             return new SqlHelperFund().GetDataTable(sql);
diff --git a/WeChat.WebPage/Controllers/PubController.cs b/WeChat.WebPage/Controllers/PubController.cs
index 1fcc4e8..06c5327 100644
--- a/WeChat.WebPage/Controllers/PubController.cs
+++ b/WeChat.WebPage/Controllers/PubController.cs
@@ -195,6 +195,14 @@ namespace WeChat.WebPage.Controllers
                     else if ("pay".Equals(signMenu))
                     {
                         url = string.Format(pay_baseURL,userID);
+                    }
+                    else if ("tzgg".Equals(signMenu))
+                    {
+                        url = "http://cwcw.sta.edu.cn:8001/Home/Articles?m=0c356049-28f7-475f-98fa-152d51737ed5";
+                    }
+                    else if ("bxzd".Equals(signMenu))
+                    {
+                        url = "http://cwcw.sta.edu.cn/bxzn.html";
                     }
                     //MyLog.WriteLog(url);
                     return new RedirectResult(url);
diff --git a/WeChat.WebPage/Error.htm b/WeChat.WebPage/Error.htm
index 4308eef..84df665 100644
--- a/WeChat.WebPage/Error.htm
+++ b/WeChat.WebPage/Error.htm
@@ -4,16 +4,17 @@
     <link href="Css/weui.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<div class="container js_container">
-
-    <div class="page slideIn msg">
-    <div class="weui_msg">
-        <div class="weui_icon_area"><i class="weui_icon_warn weui_icon_msg"></i></div>
-        <div class="weui_text_area">
-            <h2 class="weui_msg_title">椤甸潰閿欒</h2> 
+    <div class="container js_container"> 
+        <div class="page slideIn msg">
+            <div class="weui_msg">
+                <div class="weui_icon_area"><i class="weui_icon_warn weui_icon_msg"></i></div>
+                <div class="weui_text_area">
+                    <h2 class="weui_msg_title">椤甸潰閿欒</h2>
+                </div>
+                <div class="weui_opr_area">
+                </div>
+            </div>
         </div>
-        <div class="weui_opr_area">
-        </div>
-</div>
+    </div>
 </body>
 </html>
-- 
GitLab