工资查看移动端接口，PC我的工资

1 vuosi sitten · ac85f3be5e
--- a/V7/Learun.Application.Organization/app.config
+++ b/V7/Learun.Application.Organization/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
+++ b/V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs
@@ -51,7 +51,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
        {
            return View();
        }

        /// <summary>
        /// 我的工资
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public ActionResult MyAmount()
        {
            return View();
        }
        #endregion

        #region 获取数据
@@ -112,6 +120,23 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
            };
            return Success(jsonData);
        }

        [HttpGet]
        [AjaxOnly]
        public ActionResult GetPageListMyCol(string pagination, string queryJson)
        {
            Pagination paginationobj = pagination.ToObject<Pagination>();
            var user = LoginUserInfo.Get();
            var data = gz_AmountsIBLL.GetPageListCol(paginationobj, queryJson, user.account);
            var jsonData = new
            {
                rows = data,
                total = paginationobj.total,
                page = paginationobj.page,
                records = paginationobj.records
            };
            return Success(jsonData);
        }
        /// <summary>
        /// 获取表单数据
        /// </summary>
@@ -129,7 +154,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
        [AjaxOnly]
        public ActionResult GetDetail(string userNo,int year,int month)
        {
            var data = gz_AmountsIBLL.GetAmountsDetail(userNo, year, month);
            var data = gz_AmountsIBLL.GetAmountsDetail(userNo, year, month, 0);
            return Success(data);
        }
        #endregion
--- a/V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml
+++ b/V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml
@@ -0,0 +1,294 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>我的工资</title>
    <link rel="stylesheet" href="~/Content/elementui/element-ui@2.15.13.css">
    <script src="~/Content/vue/vue.js"></script>
    <script src="~/Content/elementui/element-ui@2.15.13.js"></script>
    <script src="~/Content/jquery/jquery-1.10.2.min.js"></script>
 </head>
 <body>
    @{
        ViewBag.Title = "我的工资";
        Layout = "~/Views/Shared/_Index.cshtml";
    }
    <div id="app" style="height:100%">
        <el-row :gutter="14" style="margin-bottom:12px">
            <el-col :span="4">
                <el-date-picker size="small"
                                v-model="time"
                                type="monthrange"
                                start-placeholder="开始日期"
                                end-placeholder="结束日期"
                                value-format="yyyy-MM-dd">
                </el-date-picker>
            </el-col>
            <el-col :span="2">
                <a class="btn btn-default" v-on:click="search"><i class="el-icon-search" style="margin-right:4px"></i>查询</a>
            </el-col>
            <el-col :span="10" style="display: flex;justify-content: right;float:right;">
                <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>
            </el-col>
        </el-row>
        <div style="height:calc(100% - 80px)">
            <el-table :data="tableData"
                      height="100%"
                      size="mini"
                      :cell-style="{paddingTop:'2px',paddingBottom:'2px'}"
                      :header-row-style="{color:'#606266',fontWeight:400}"
                      :header-cell-style="{paddingTop:'2px',paddingBottom:'2px'}"
                      border
                      v-on:selection-change="handleSelectionChange">
                <el-table-column type="index"
                                 width="38"
                                 align="center">
                </el-table-column>
                <el-table-column align="center"
                                 type="selection"
                                 width="44">
                </el-table-column>
                <template v-for="item in fixedColumn">
                    <el-table-column :prop="item.prop"
                                     show-overflow-tooltip
                                     :label="item.label">
                    </el-table-column>
                </template>
            </el-table>
        </div>
        <div style="padding: 6px 0;display: flex;justify-content: center;">
            <el-pagination v-on:size-change="handleSizeChange" background
                           v-on:current-change="handleCurrentChange"
                           :current-page="currentPage"
                           :page-sizes="[30, 100, 200]"
                           :page-size="pageSize"
                           layout="total, sizes, prev, pager, next, jumper"
                           :total="total">
            </el-pagination>
        </div>
        <!-- 查看详情 -->
        <el-dialog title="详情"
                   :visible.sync="dialogVisible1"
                   :close-on-click-modal="false"
                   width="1200px">
            <div>
                <el-table :data="detailData" v-if="detailData.length"
                          border
                          show-overflow-tooltip
                          height="500">
                    <template v-for="item in fixedColumn">
                        <el-table-column :prop="item.prop"
                                         :label="item.label">
                        </el-table-column>
                    </template>
                    <template v-for="item in trendsColumn">
                        <el-table-column :prop="item.prop"
                                         :label="item.label">
                        </el-table-column>
                    </template>

                </el-table>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button v-on:click="dialogVisible1 = false" size="small">关 闭</el-button>
            </span>
        </el-dialog>
    </div>
    <script>
        var vm = new Vue({
            el: '#app',
            data() {
                return {
                    query: {},
                    time: null,
                    tableData: [],
                    multipleSelection: [],
                    currentPage: 1,
                    pageSize: 30,
                    total: 0,
                    totalSend: '',
                    departmentOptions: [],
                    //固定列
                    fixedColumn: [
                        { prop: 'DeptCode', label: '部门代码' },
                        { prop: 'DeptName', label: '部门名称' },
                        { prop: 'PersonTypeCode', label: '职员类型代码' },
                        { prop: 'PersonType', label: '职员类型' },
                        { prop: 'UserNo', label: '职员代码' },
                        { prop: 'RealName', label: '职员姓名' },
                        { prop: 'SendDate', label: '发放时间' },
                        { prop: 'SendCount', label: '发放次数' },
                        { prop: 'TotalDeduction', label: '扣款合计' },
                        { prop: 'Year', label: '发放年份' },
                        { prop: 'Month', label: '发放月份' },
                        { prop: 'TotalSend', label: '实发合计' },
                        { prop: 'Remark', label: '备注' },
                        { prop: 'Reviewer', label: '审核人' }
                    ],
                    // 导入
                    dialogVisible: false,
                    fileList: [],
                    isUploading: false,
                    accept: ['xls', 'xlsx'],
                    size: 10,
                    ready: true,
                    frequently: false,
                    month: '',
                    // 查看详情
                    dialogVisible1: false,
                    detailData: [],
                    trendsColumn: []
                }
            },
            mounted() {
                this.init()
            },
            methods: {
                async init() {
                    window.getTableData = this.importCallback
                    this.getTableData()
                },
                NetRequest(url, data, method = "POST") {
                    let _this = this
                    return new Promise((resolve) => {
                        $.ajax({
                            type: method,
                            data,
                            contentType: false,
                            processData: false,
                            dataType: "json",
                            async: false,
                            cache: false,
                            url: top.$.rootUrl + url,
                            success: function (res) {
                                if (res.code == 200) {
                                    resolve(res.data);
                                } else {
                                    _this.$message.error(res.info || "请求失败！");
                                    resolve(false);
                                }
                            },
                            error: function (error) {
                                _this.$message.error("请求出错！");
                                resolve(false);
                            },
                        });
                    });
                },
                handleSizeChange(val) {
                    this.pageSize = val
                    this.currentPage = 1
                    this.getTableData()
                },
                handleCurrentChange(val) {
                    this.currentPage = val
                    this.getTableData()
                },
                refresh() {
                    location.reload()
                },
                async getTableData() {
                    if (this.time) {
                        this.query.time1 = this.time[0]
                        this.query.time2 = this.time[1]
                    } else if (this.query['time1']) {
                        delete this.query['time1']
                        delete this.query['time2']
                    }
                    let getParams = {
                        pagination: JSON.stringify({
                            rows: this.pageSize, page: this.currentPage, sidx: '', sord: "DESC",
                        }),
                        queryJson: JSON.stringify(this.query)
                    }
                    let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageListMyCol', $.param(getParams), 'get')
                    this.tableData = result.rows
                    this.total = result.records
                },
                search() {
                    this.currentPage = 1
                    this.getTableData()
                },
                handleSelectionChange(val) {
                    this.multipleSelection = val;
                },
                
                // 查看详情
                async detailShow() {
                    if (this.multipleSelection.length != 1) {
                        this.$message.warning('请选择一条数据进行查看！')
                        return
                    }
                    this.detailData = []
                    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')
                    if (result) {
                        let obj = {}
                        this.trendsColumn = result.map((e, i) => {
                            obj['trends' + i] = e.Item2
                            return { prop: 'trends' + i, label: e.Item1 }
                        })
                        this.detailData = [{ ...this.multipleSelection[0], ...obj }]
                        console.log(this.detailData)
                    }
                    this.dialogVisible1 = true
                },
            }
        })
    </script>
    <style>
        html {
            width: calc(100% - 2px);
            height: calc(100% - 2px);
            background: #F8F8F8;
            box-sizing: border-box;
        }

        body {
            border: 1px solid #CCCCCC;
            border-radius: 4px;
            background: #fff;
            padding: 12px;
            height: calc(100% - 16px);
            box-sizing: border-box;
        }

        .el-input,
        .el-select,
        .el-date-editor.el-input,
        .el-date-editor.el-input__inner {
            width: 100%;
        }

        .btn {
            display: inline-block;
            padding: 6px 12px;
            margin-bottom: 0;
            font-size: 14px;
            font-weight: 400;
            line-height: 1.42857143;
            text-align: center;
            white-space: nowrap;
            vertical-align: middle;
            -ms-touch-action: manipulation;
            touch-action: manipulation;
            cursor: pointer;
            -webkit-user-select: none;
            -moz-user-select: none;
            -ms-user-select: none;
            user-select: none;
            background-image: none;
            border: 1px solid transparent;
            border-radius: 4px;
        }

        .btn-default {
            color: #333;
            background-color: #fff;
            border-color: #ccc;
        }
    </style>

 </body>
 </html>
--- a/V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -7950,6 +7950,7 @@
    <Content Include="Areas\PersonnelManagement\Views\Gz_Amounts\GzImport.cshtml" />
    <Content Include="Content\elementui\fonts\element-icons.ttf" />
    <Content Include="Content\elementui\fonts\element-icons.woff" />
    <Content Include="Areas\PersonnelManagement\Views\Gz_Amounts\MyAmount.cshtml" />
    <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
    <Content Include="Views\Login\Default-beifen.cshtml" />
--- a/V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
+++ b/V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
@@ -196,6 +196,7 @@
    <Compile Include="Bootstraper.cs" />
    <Compile Include="Modules\AnnexesApiWx.cs" />
    <Compile Include="Modules\EducationalAdministration\AddressBookApi.cs" />
    <Compile Include="Modules\PersonnelManagement\GzAmountApi.cs" />
    <Compile Include="Modules\StuFreshPayFeeApi.cs" />
    <Compile Include="Modules\StuPayFeeApi.cs" />
    <Compile Include="Modules\BaseNoLoginApi.cs" />
--- a/V7/Learun.Application.WebApi/Modules/PersonnelManagement/GzAmountApi.cs
+++ b/V7/Learun.Application.WebApi/Modules/PersonnelManagement/GzAmountApi.cs
@@ -0,0 +1,64 @@
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using Learun.Util;
 using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;

 namespace Learun.Application.WebApi.Modules.PersonnelManagement
 {
    public class GzAmountApi : BaseApi
    {
        private Gz_AmountsIBLL gz_AmountsIBLL = new Gz_AmountsBLL();
        /// <summary>
        /// 注册接口
        /// <summary>
        public GzAmountApi()
            : base("/Learun/adms/PersonnelManagement/GzAmount")
        {
            Get["/my"] = GetMy;
            Get["/more"] = GetMore;
        }


        public Response GetMy(dynamic _)
        {
            ReqPageParam parameter = this.GetReqData<ReqPageParam>();

            var qj = parameter.queryJson.ToJObject();

            var year = Convert.ToInt32(qj["year"]);
            var month = Convert.ToInt32(qj["month"]);

            var data = gz_AmountsIBLL.GetAmountsDetail(this.userInfo.account,year,month,1);
            var jsonData = new
            {
                rows = data,
                total = parameter.pagination.total,
                page = parameter.pagination.page,
                records = parameter.pagination.records
            };
            return Success(jsonData);
        }
        public Response GetMore(dynamic _)
        {
            ReqPageParam parameter = this.GetReqData<ReqPageParam>();

            var qj = parameter.queryJson.ToJObject();

            var year = Convert.ToInt32(qj["year"]);
            var month = Convert.ToInt32(qj["month"]);

            var data = gz_AmountsIBLL.GetAmountsDetail(this.userInfo.account, year, month, 0);
            var jsonData = new
            {
                rows = data,
                total = parameter.pagination.total,
                page = parameter.pagination.page,
                records = parameter.pagination.records
            };
            return Success(jsonData);
        }
    }
 }
--- a/V7/Learun.Application.WebApi/Web.config
+++ b/V7/Learun.Application.WebApi/Web.config
@@ -106,6 +106,14 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <oracle.manageddataaccess.client>
--- a/V7/Learun.Application.Website/Web.config
+++ b/V7/Learun.Application.Website/Web.config
@@ -81,6 +81,14 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <system.webServer>
--- a/V7/Learun.Application.WorkFlowServer/App.config
+++ b/V7/Learun.Application.WorkFlowServer/App.config
@@ -226,6 +226,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <entityFramework>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.AppMagager/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.AppMagager/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/App.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/App.config
@@ -32,6 +32,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Extention/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Extention/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/app.config
@@ -6,6 +6,22 @@
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/App.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/App.config
@@ -36,6 +36,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/app.config
@@ -22,6 +22,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/app.config
@@ -6,6 +6,22 @@
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Report/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Report/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsBLL.cs
@@ -176,7 +176,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
        {
            try
            {
                return gz_AmountsService.GetPageListCol(pagination, queryJson, out decimal totalSend);
                return gz_AmountsService.GetPageListCol(pagination, queryJson, out totalSend);
            }
            catch (Exception ex)
            {
@@ -191,11 +191,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
            }
        }

        public IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month)
        public IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month, int show)
        {
            try
            {
                return gz_AmountsService.GetAmountsDetail(userNo, year, month);
                return gz_AmountsService.GetAmountsDetail(userNo, year, month, show);
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }

        public IEnumerable<Gz_AmountsCols> GetPageListCol(Pagination pagination, string queryJson, string userNo)
        {
            try
            {
                return gz_AmountsService.GetPageListCol(pagination, queryJson, userNo);
            }
            catch (Exception ex)
            {
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsCols.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsCols.cs
@@ -51,7 +51,7 @@
        /// </summary>
        public string TotalSend { get; set; }

        public decimal TotalSendDecimal { get; set }
        public decimal TotalSendDecimal { get; set; }
        /// <summary>
        /// 备注
        /// </summary>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsIBLL.cs
@@ -58,7 +58,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement

        IEnumerable<Gz_AmountsCols> GetPageListCol(Pagination pagination, string queryJson, out decimal totalSend);

        IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month);

        IEnumerable<Gz_AmountsCols> GetPageListCol(Pagination pagination, string queryJson, string userNo);

        IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month, int show);
        #endregion

    }
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs
@@ -370,7 +370,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                }
                if (!qj["department"].IsEmpty())
                {
                    var dept = qj["value"].ToString();
                    var dept = qj["department"].ToString();
                    ls = ls.Where(x => x.DeptCode == dept);
                }

@@ -394,11 +394,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
        }


        public IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month)
        public IEnumerable<Tuple<string, string>> GetAmountsDetail(string userNo, int year, int month, int show)
        {
            try
            {
                var items = this.BaseRepository("CollegeMIS").FindList<Gz_ItemsEntity>(x => x.IsShow != true).ToList();
                var items = this.BaseRepository("CollegeMIS").FindList<Gz_ItemsEntity>(x => x.IsShow == (show==1)).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;
@@ -415,6 +415,74 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                }
            }
        }

        public IEnumerable<Gz_AmountsCols> GetPageListCol(Pagination pagination, string queryJson, string userNo)
        {
            try
            {
                var yearStart = DateTime.Now.Year;
                var monthStart = DateTime.Now.Month;
                var yearEnd = DateTime.Now.Year;
                var monthEnd = DateTime.Now.Month;

                var skip = pagination.rows * (pagination.page - 1);

                var qj = queryJson.ToJObject();

                if (!qj["time1"].IsEmpty())
                {
                    var ts = Convert.ToDateTime(qj["time1"]);
                    yearStart = ts.Year;
                    monthStart = ts.Month;
                }
                if (!qj["time2"].IsEmpty())
                {
                    var ts = Convert.ToDateTime(qj["time2"]);
                    yearEnd = ts.Year;
                    monthEnd = ts.Month;
                }

                var items = this.BaseRepository("CollegeMIS").FindList<Gz_ItemsEntity>(x => x.IsShow == true).ToList();

                var xmId = items.FirstOrDefault(x => x.Name == "职员姓名").Id;
                var deptCodeId = items.FirstOrDefault(x => x.Name == "部门代码").Id;
                var deptId = items.FirstOrDefault(x => x.Name == "部门名称").Id;
                var ptcId = items.FirstOrDefault(x => x.Name == "职员类型代码").Id;
                var ptId = items.FirstOrDefault(x => x.Name == "职员类型").Id;
                var sendId = items.FirstOrDefault(x => x.Name == "发放时间").Id;
                var sendCountId = items.FirstOrDefault(x => x.Name == "发放次数").Id;
                var kchjId = items.FirstOrDefault(x => x.Name == "扣款合计").Id;
                var sfhjId = items.FirstOrDefault(x => x.Name == "实发合计").Id;
                var bzId = items.FirstOrDefault(x => x.Name == "备注").Id;
                var shrId = items.FirstOrDefault(x => x.Name == "审核人").Id;

                var itemId = items.Select(x => x.Id).ToArray();

                var q = this.BaseRepository("CollegeMIS").FindList<Gz_AmountsEntity>(x => x.UserNo == userNo && itemId.Contains(x.ItemId) && ((yearStart == yearEnd && x.Year == yearStart && x.Month >= monthStart && x.Month <= monthEnd) || (yearStart < yearEnd && (x.Year == yearStart && x.Month >= monthStart) || (x.Year == yearEnd && x.Month <= monthEnd) || (x.Year > yearStart && x.Year < yearEnd))));

                var query = q.GroupBy(x => new { x.UserNo, x.Year, x.Month });
                pagination.records = query.Count();

                var ls = query.Select(x => new Gz_AmountsCols { UserNo = x.Key.UserNo, Year = x.Key.Year ?? 0, Month = x.Key.Month ?? 0, RealName = x.FirstOrDefault(a => a.ItemId == xmId)?.OriVal ?? "", DeptCode = x.FirstOrDefault(a => a.ItemId == deptCodeId)?.OriVal ?? "", DeptName = x.FirstOrDefault(a => a.ItemId == deptId)?.OriVal ?? "", PersonTypeCode = x.FirstOrDefault(a => a.ItemId == ptcId)?.OriVal ?? "", PersonType = x.FirstOrDefault(a => a.ItemId == ptId)?.OriVal ?? "", SendDate = x.FirstOrDefault(a => a.ItemId == sendId)?.OriVal ?? "", SendCount = x.FirstOrDefault(a => a.ItemId == sendCountId)?.OriVal ?? "", TotalDeduction = x.FirstOrDefault(a => a.ItemId == kchjId)?.OriVal ?? "", TotalSend = x.FirstOrDefault(a => a.ItemId == sfhjId)?.OriVal ?? "", TotalSendDecimal = x.FirstOrDefault(a => a.ItemId == sfhjId)?.Amount ?? 0, Remark = x.FirstOrDefault(a => a.ItemId == bzId)?.OriVal ?? "", Reviewer = x.FirstOrDefault(a => a.ItemId == shrId)?.OriVal ?? "" });

                

                var rs = ls.Skip(skip).Take(pagination.rows);
                return rs;

            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }
        #endregion
    }
 }
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/app.config
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/app.config
@@ -22,6 +22,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Factory/app.config
+++ b/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Factory/app.config
@@ -14,6 +14,10 @@
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/Learun.Cache.Redis.csproj
+++ b/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/Learun.Cache.Redis.csproj
@@ -84,8 +84,8 @@
      <HintPath>..\..\..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
--- a/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/app.config
+++ b/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/app.config
@@ -14,6 +14,10 @@
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/packages.config
+++ b/V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Redis/packages.config
@@ -9,7 +9,7 @@
  <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
  <package id="System.IO.Pipelines" version="4.7.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.3" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
  <package id="System.Threading.Channels" version="4.7.1" targetFramework="net461" />
--- a/V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/app.config
+++ b/V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/app.config
@@ -18,6 +18,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
--- a/V7/Quanjiang.DigitalScholl.DataSync/App.config
+++ b/V7/Quanjiang.DigitalScholl.DataSync/App.config
@@ -47,6 +47,10 @@
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <unity>
--- a/V7/packages/System.Numerics.Vectors.4.4.0/.signature.p7s
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/.signature.p7s
--- a/V7/packages/System.Numerics.Vectors.4.4.0/LICENSE.TXT
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/LICENSE.TXT
@@ -1,23 +0,0 @@
 The MIT License (MIT)

 Copyright (c) .NET Foundation and Contributors

 All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/V7/packages/System.Numerics.Vectors.4.4.0/System.Numerics.Vectors.4.4.0.nupkg
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/System.Numerics.Vectors.4.4.0.nupkg
--- a/V7/packages/System.Numerics.Vectors.4.4.0/THIRD-PARTY-NOTICES.TXT
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/THIRD-PARTY-NOTICES.TXT
@@ -1,226 +0,0 @@
 .NET Core uses third-party libraries or other resources that may be
 distributed under licenses different than the .NET Core software.

 In the event that we accidentally failed to list a required notice, please
 bring it to our attention. Post an issue or email us:

           dotnet@microsoft.com

 The attached notices are provided for information only.

 License notice for Slicing-by-8 
 -------------------------------

 http://sourceforge.net/projects/slicing-by-8/

 Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved


 This software program is licensed subject to the BSD License,  available at
 http://www.opensource.org/licenses/bsd-license.html.


 License notice for Unicode data
 -------------------------------

 http://www.unicode.org/copyright.html#License

 Copyright © 1991-2017 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of the Unicode data files and any associated documentation
 (the "Data Files") or Unicode software and any associated documentation
 (the "Software") to deal in the Data Files or Software
 without restriction, including without limitation the rights to use,
 copy, modify, merge, publish, distribute, and/or sell copies of
 the Data Files or Software, and to permit persons to whom the Data Files
 or Software are furnished to do so, provided that either
 (a) this copyright and permission notice appear with all copies
 of the Data Files or Software, or
 (b) this copyright and permission notice appear in associated
 Documentation.

 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT OF THIRD PARTY RIGHTS.
 IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
 NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
 DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THE DATA FILES OR SOFTWARE.

 Except as contained in this notice, the name of a copyright holder
 shall not be used in advertising or otherwise to promote the sale,
 use or other dealings in these Data Files or Software without prior
 written authorization of the copyright holder.

 License notice for Zlib 
 -----------------------

 https://github.com/madler/zlib
 http://zlib.net/zlib_license.html

 /* zlib.h -- interface of the 'zlib' general purpose compression library
  version 1.2.11, January 15th, 2017

  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.

  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:

  1. The origin of this software must not be misrepresented; you must not
     claim that you wrote the original software. If you use this software
     in a product, an acknowledgment in the product documentation would be
     appreciated but is not required.
  2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.

  Jean-loup Gailly        Mark Adler
  jloup@gzip.org          madler@alumni.caltech.edu

 */

 License notice for Mono
 -------------------------------

 http://www.mono-project.com/docs/about-mono/

 Copyright (c) .NET Foundation Contributors

 MIT License

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software  and associated documentation files (the Software), to deal
 in the Software without restriction,  including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense,  and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so,  subject to the following conditions:

 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 License notice for International Organization for Standardization
 -----------------------------------------------------------------

 Portions (C) International Organization for Standardization 1986:
     Permission to copy in any form is granted for use with
     conforming SGML systems and applications as defined in
     ISO 8879, provided this notice is included in all copies.

 License notice for Intel
 ------------------------

 "Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

 1. Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.

 2. Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 License notice for Xamarin and Novell
 -------------------------------------

 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

 Copyright (c) 2011 Novell, Inc (http://www.novell.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

 Third party notice for W3C
 --------------------------

 "W3C SOFTWARE AND DOCUMENT NOTICE AND LICENSE
 Status: This license takes effect 13 May, 2015.
 This work is being provided by the copyright holders under the following license.
 License
 By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
 Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
 The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
 Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
 Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
 Disclaimers
 THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
 COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
 The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders."

 License notice for Bit Twiddling Hacks
 --------------------------------------

 Bit Twiddling Hacks

 By Sean Eron Anderson
 seander@cs.stanford.edu

 Individually, the code snippets here are in the public domain (unless otherwise
 noted) — feel free to use them however you please. The aggregate collection and
 descriptions are © 1997-2005 Sean Eron Anderson. The code and descriptions are
 distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY and
 without even the implied warranty of merchantability or fitness for a particular
 purpose. 
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/MonoAndroid10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/MonoAndroid10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/MonoTouch10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/MonoTouch10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/net46/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/net46/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/net46/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/net46/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/netcoreapp2.0/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/netcoreapp2.0/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard1.0/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard1.0/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard1.0/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard1.0/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard2.0/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard2.0/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard2.0/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/netstandard2.0/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinios10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinios10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinmac20/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinmac20/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarintvos10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarintvos10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinwatchos10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/lib/xamarinwatchos10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/MonoAndroid10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/MonoAndroid10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/MonoTouch10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/MonoTouch10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/net46/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/net46/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/net46/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/net46/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/netcoreapp2.0/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/netcoreapp2.0/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard1.0/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard1.0/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard1.0/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard1.0/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard2.0/System.Numerics.Vectors.dll
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard2.0/System.Numerics.Vectors.dll
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard2.0/System.Numerics.Vectors.xml
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/netstandard2.0/System.Numerics.Vectors.xml
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinios10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinios10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinmac20/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinmac20/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarintvos10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarintvos10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinwatchos10/_._
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/ref/xamarinwatchos10/_._
--- a/V7/packages/System.Numerics.Vectors.4.4.0/useSharedDesignerContext.txt
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/useSharedDesignerContext.txt
--- a/V7/packages/System.Numerics.Vectors.4.4.0/version.txt
+++ b/V7/packages/System.Numerics.Vectors.4.4.0/version.txt
@@ -1 +0,0 @@
 8321c729934c0f8be754953439b88e6e1c120c24