From 32aeb289ec01bffd529fa7b74544830c4630e70a Mon Sep 17 00:00:00 2001
From: zzj <31836194@qq.com>
Date: Fri, 19 Jan 2024 14:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Gz_AmountsController.cs       | 10 ++++-
 .../Views/Gz_Amounts/Index.cshtml             | 37 ++++++++++---------
 .../Gz_Amounts/Gz_AmountsBLL.cs               | 19 ++++++++++
 .../Gz_Amounts/Gz_AmountsIBLL.cs              |  3 ++
 .../Gz_Amounts/Gz_AmountsService.cs           | 23 ++++++++++++
 5 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
index 0413a9933..68a86c4c3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs	
@@ -100,7 +100,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetPageListCol(string pagination, string queryJson)
         {
-            pagination = "{page:1,rows:1}";
+            //pagination = "{page:1,rows:1}";
             queryJson = "{Year:2023,Month:12}";
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = gz_AmountsIBLL.GetPageListCol(paginationobj, queryJson);
@@ -125,6 +125,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             var data = gz_AmountsIBLL.GetEntity(keyValue);
             return Success(data);
         }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetDetail(string userNo,int year,int month)
+        {
+            var data = gz_AmountsIBLL.GetAmountsDetail(userNo, year, month);
+            return Success(data);
+        }
         #endregion
 
         #region 提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml
index 837494f80..480fe188c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml	
@@ -37,7 +37,7 @@
                 <a v-on:click="refresh" class="btn btn-default" style="margin-right:8px;font-size:14px"><i class="el-icon-refresh"></i></a>
                 <a class="btn btn-default" v-on:click="detailShow"><i class="el-icon-edit-outline" style="margin-right:4px"></i>查看</a>
                 <a class="btn btn-default" v-on:click="importantData"><i class="el-icon-download" style="margin-right:4px"></i>导入</a>
-                <a class="btn btn-default" v-on:click="del"><i class="el-icon-delete" style="margin-right:4px"></i>删除</a>
+                @*<a class="btn btn-default" v-on:click="del"><i class="el-icon-delete" style="margin-right:4px"></i>删除</a>*@
             </el-col>
         </el-row>
         <div style="height:calc(100% - 80px)">
@@ -123,11 +123,11 @@
                           border
                           show-overflow-tooltip
                           height="500">
-                    <template v-for="item in fixedColumn">
+                    @*<template v-for="item in fixedColumn">
                         <el-table-column :prop="item.prop"
                                          :label="item.label">
                         </el-table-column>
-                    </template>
+                    </template>*@
                     <template v-for="item in trendsColumn">
                         <el-table-column :prop="item.prop"
                                          :label="item.label">
@@ -154,21 +154,20 @@
                     total: 0,
                     //固定列
                     fixedColumn: [
-                        { prop: 'UserNo', label: '部门名称' },
-                        { prop: 'UserNo', label: '部门名称' },
-                        { prop: 'UserNo', label: '职员类型代码' },
-                        { prop: 'UserNo', label: '职员类型' },
+                        { prop: 'DeptCode', label: '部门代码' },
+                        { prop: 'DeptName', label: '部门名称' },
+                        { prop: 'PersonTypeCode', label: '职员类型代码' },
+                        { prop: 'PersonType', label: '职员类型' },
                         { prop: 'UserNo', label: '职员代码' },
-                        { prop: 'UserNo', label: '职员姓名' },
-                        { prop: 'CreateTime', label: '发放时间' },
-                        { prop: 'UserNo', label: '发放次数' },
-                        { prop: 'UserNo', label: '扣款合计' },
-                        { prop: 'UserNo', label: '职员类型代码' },
+                        { prop: 'RealName', label: '职员姓名' },
+                        { prop: 'SendDate', label: '发放时间' },
+                        { prop: 'SendCount', label: '发放次数' },
+                        { prop: 'TotalDeduction', label: '扣款合计' },
                         { prop: 'Year', label: '发放年份' },
                         { prop: 'Month', label: '发放月份' },
-                        { prop: 'Amount', label: '实发合计' },
-                        { prop: 'UserNo', label: '备注' },
-                        { prop: 'UserNo', label: '审核人' }
+                        { prop: 'TotalSend', label: '实发合计' },
+                        { prop: 'Remark', label: '备注' },
+                        { prop: 'Reviewer', label: '审核人' }
                     ],
                     // 导入
                     dialogVisible: false,
@@ -238,7 +237,7 @@
                         }),
                         queryJson: JSON.stringify(this.query)
                     }
-                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageList', $.param(getParams), 'get')
+                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageListCol', $.param(getParams), 'get')
                     this.tableData = result.rows
                     this.total = result.records
                 },
@@ -382,8 +381,10 @@
                         return
                     }
                     this.detailData = []
-                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/SaveForm', $.param({ keyValue: this.multipleSelection[0].id }), 'get')
-                    this.trendsColumn = [{ porp: 'aaa', label: '动态1' }]
+                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetDetail', $.param({ userNo: this.multipleSelection[0].UserNo, year: this.multipleSelection[0].Year, month: this.multipleSelection[0].Month }), 'get')
+                    debugger
+                    this.detailData = result;
+                    this.trendsColumn = [{ porp: 'Item2', label: 'Item1' }]
                     this.dialogVisible1 = true
                 },
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs
index 380b9dcd7..72e14ca64 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs	
@@ -190,6 +190,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+
+        public IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month)
+        {
+            try
+            {
+                return gz_AmountsService.GetAmountsDetail(userNo, year, month);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs
index d42f437c3..51f43eca2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs	
@@ -2,6 +2,7 @@
 using System.Data;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.PersonnelManagement.Gz_Amounts;
+using System;
 
 namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
@@ -56,6 +57,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         (DataTable failDt, int snum, int fnum) ExecuteImportExcel(DataTable dt, string[] ignoreCol, List<string> cols, List<Gz_ItemsEntity> itemList, string fileGuid);
 
         IEnumerable<Gz_AmountsCols> GetPageListCol(Pagination pagination, string queryJson);
+
+        IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month);
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
index 9cf99c7b0..b96a955e8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs	
@@ -361,6 +361,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+
+
+        public IEnumerable<Tuple<string,string>> GetAmountsDetail(string userNo, int year, int month)
+        {
+            try
+            {
+                var items = this.BaseRepository("CollegeMIS").FindList<Gz_ItemsEntity>(x => x.IsShow != true).ToList();
+                var itemId = items.Select(x => x.Id).ToArray();
+                var query = this.BaseRepository("CollegeMIS").FindList<Gz_AmountsEntity>(x => itemId.Contains(x.ItemId) && x.Year == year && x.Month == month && x.UserNo == userNo).Join(items, a => a.ItemId, b => b.Id, (a, b) => new Tuple<string, string>(b.Name, a.OriVal));
+                return query;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
     }
 }