Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js

@@ -251,6 +251,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js

@@ -251,6 +251,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js

@@ -160,6 +160,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Form.js

@@ -65,20 +65,16 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Service_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '备注', name: 'Remark', width: 120, align: 'left'
                     },
                     {
                         label: '金额', name: 'TotalAmount', width: 120, align: 'left'
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
                     }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
                 mainId:'purchaseid',
                 height: 400,
                 isSubGrid: true,
@@ -86,11 +82,11 @@ var bootstrap = function ($, learun) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Purchase_Service/GetFormDetailData?keyValue=' + rowItem.purchaseid,
                         headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
+                            { label: "劳务维修内容", name: "ServiceContent", width: 100, align: "left" },
+                            { label: "估值", name: "Price", width: 130, align: "left" },
+                            { label: "人数", name: "Peoplecount", width: 100, align: "left" },
+                            { label: "天数", name: "Days", width: 150, align: "left" },
+                            { label: "标准", name: "Standar", width: 150, align: "left", },
                         ],
                         mainId: 'LessonNo',
                         isPage: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js

@@ -34,20 +34,16 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Service_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '备注', name: 'Remark', width: 120, align: 'left'
                     },
                     {
                         label: '金额', name: 'TotalAmount', width: 120, align: 'left'
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    //{
-                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    //}
+                    }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
                 mainId: 'purchaseid',
                 height: 400,
                 isSubGrid: true,
@@ -55,11 +51,11 @@ var bootstrap = function ($, learun) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Purchase_Service/GetFormDetailData?keyValue=' + rowItem.purchaseid,
                         headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
+                            { label: "劳务维修内容", name: "ServiceContent", width: 100, align: "left" },
+                            { label: "估值", name: "Price", width: 130, align: "left" },
+                            { label: "人数", name: "Peoplecount", width: 100, align: "left" },
+                            { label: "天数", name: "Days", width: 150, align: "left" },
+                            { label: "标准", name: "Standar", width: 150, align: "left", },
                         ],
                         mainId: 'LessonNo',
                         isPage: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js

@@ -72,9 +72,6 @@ var bootstrap = function ($, learun) {
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
                     }
                 ],
                 //isEdit:true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml

@@ -13,6 +13,10 @@
         <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
         <input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差人员<font face="宋体">*</font></div>
+        <input id="Traveler" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">随行人员<font face="宋体">*</font></div>
         <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -31,6 +35,10 @@
         @*<input id="Endtime" type="text" class="form-control" />*@
         <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差地点</div>
+        <input id="TravelAddress" type="text" class="form-control" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">附件上传</div>
         <div id="FilePath"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml

@@ -31,23 +31,31 @@
         <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
         <input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差人员<font face="宋体">*</font></div>
+        <input id="Traveler" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">随行人员<font face="宋体">*</font></div>
-        <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly/>
+        <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">出差原因</div>
-        <input id="Reason" type="text" class="form-control" readonly/>
+        <input id="Reason" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">开始时间</div>
         @*<input id="Starttime" type="text" class="form-control" />*@
-        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" readonly disabled/>
+        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" readonly disabled />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">结束时间</div>
         @*<input id="Endtime" type="text" class="form-control" />*@
-        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" readonly disabled/>
+        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" readonly disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差地点</div>
+        <input id="TravelAddress" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">附件上传</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js

@@ -246,6 +246,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js

@@ -120,6 +120,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Form.js

@@ -36,12 +36,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res, index) {
                         if (res) {
-                            $('#Purchase_Travel_applydetails').jfGridSet('removeRow', selectedRow.purchaseid);
-
-                            let totalamount = parseFloat($('#Totalamount').val());
-
-                            totalamount -= selectedRow.TotalAmount;
-                            $('#Totalamount').val(totalamount);
+                            $('#Purchase_Travel_applydetails').jfGridSet('removeRow', selectedRow.purchaseid);                            
                         }
                     });
                 }
@@ -65,42 +60,28 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Travel_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '出差人员', name: 'Traveler', width: 120, align: 'left'
+                    },
+                    {
+                        label: '随行人员', name: 'Follows', width: 120, align: 'left'
                     },
                     {
-                        label: '金额', name: 'TotalAmount', width: 120, align: 'left'
+                        label: '出差原因', name: 'Reason', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'CreateTime', width: 120, align: 'left'
+                        label: '出差地点', name: 'TravelAddress', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
+                        label: '开始时间', name: 'Starttime', width: 120, align: 'left', 
+                    },
+                    {
+                        label: '结束时间', name: 'Endtime', width: 120, align: 'left',
                     }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
+                //isSubGrid: true,
                 mainId:'purchaseid',
                 height: 400,
-                isSubGrid: true,
-                subGridExpanded: function (subContentId, rowItem) {
-                    $('#' + subContentId).jfGrid({
-                        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.purchaseid,
-                        headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
-                        ],
-                        mainId: 'LessonNo',
-                        isPage: false,
-                        sidx: 'ReviewTime desc'
-                    });
-                    var param;
-                    param = param || {};
-                    param.StuNo = rowItem.StuNo;
-                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
-                }
             });
         },
         initData: function () {
@@ -122,7 +103,6 @@ var bootstrap = function ($, learun) {
     refreshGirdData = function (e) {
         //console.log(e)
         //计算总金额
-        let totalamount = 0;
         //清楚所有
         var datas = $('#Purchase_Travel_applydetails').jfGridGet('rowdatas').length
         for (var i = 0; i < datas; i++) {
@@ -132,15 +112,16 @@ var bootstrap = function ($, learun) {
         for (var i = 0; i < e.length; i++) {
             var itemdata = {
                 'Id': '',
-                'Remark': e[i].Remark,
-                'TotalAmount': e[i].TotalAmount,
-                'CreateTime': e[i].CreateTime,
+                'Traveler': e[i].Traveler,
+                'Follows': e[i].Follows,
+                'Reason': e[i].Reason,
+                'TravelAddress': e[i].TravelAddress,
+                'Starttime': e[i].Starttime,
+                'Endtime': e[i].Endtime,
                 'purchaseid': e[i].Id
             };
             $('#Purchase_Travel_applydetails').jfGridSet('addRow', itemdata);
-            totalamount += e[i].TotalAmount;
         }
-        $('#Totalamount').val(totalamount);
 
     };
     // 保存数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js

@@ -34,42 +34,28 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Travel_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '出差人员', name: 'Traveler', width: 120, align: 'left'
                     },
                     {
-                        label: '金额', name: 'TotalAmount', width: 120, align: 'left'
+                        label: '随行人员', name: 'Follows', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'CreateTime', width: 120, align: 'left'
+                        label: '出差原因', name: 'Reason', width: 120, align: 'left'
                     },
-                    //{
-                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    //}
+                    {
+                        label: '出差地点', name: 'TravelAddress', width: 120, align: 'left'
+                    },
+                    {
+                        label: '开始时间', name: 'Starttime', width: 120, align: 'left',
+                    },
+                    {
+                        label: '结束时间', name: 'Endtime', width: 120, align: 'left',
+                    }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
+                //isSubGrid: true,
                 mainId: 'purchaseid',
                 height: 400,
-                isSubGrid: true,
-                subGridExpanded: function (subContentId, rowItem) {
-                    $('#' + subContentId).jfGrid({
-                        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.purchaseid,
-                        headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
-                        ],
-                        mainId: 'LessonNo',
-                        isPage: false,
-                        sidx: 'ReviewTime desc'
-                    });
-                    var param;
-                    param = param || {};
-                    param.StuNo = rowItem.StuNo;
-                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
-                }
             });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js

@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js

@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js

@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseEduApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Edu_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Edu_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaseeduIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id = purchaseeduIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaseeduIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-7", processId, "", 1, "", userInfo);
+            Purchase_EduEntity parameter = this.GetReqData<Purchase_EduEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaseeduIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-7", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseInfoApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Info_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Info_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseInfoIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseInfoIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseInfoIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-4", processId, "", 1, "", userInfo);
+            Purchase_InfoEntity parameter = this.GetReqData<Purchase_InfoEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseInfoIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-4", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseLogisticApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Logistic_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Logistic_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseLogisticIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+           string id= PurchaseLogisticIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseLogisticIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-2", processId, "", 1, "", userInfo);
+            Purchase_LogisticEntity parameter = this.GetReqData<Purchase_LogisticEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseLogisticIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-2", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseOtherApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Other_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Other_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseOtherIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseOtherIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseOtherIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-6", processId, "", 1, "", userInfo);
+            Purchase_OtherEntity parameter = this.GetReqData<Purchase_OtherEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseOtherIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-6", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchasePrintApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Print_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Print_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseprintIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseprintIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseprintIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-3", processId, "", 1, "", userInfo);
+            Purchase_PrintEntity parameter = this.GetReqData<Purchase_PrintEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseprintIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-3", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseServiceApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Service_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Service_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseServiceIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseServiceIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseServiceIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-14", processId, "", 1, "", userInfo);
+            Purchase_ServiceEntity parameter = this.GetReqData<Purchase_ServiceEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseServiceIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-14", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseStudentApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Student_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Student_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseStudentIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseStudentIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseStudentIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-5", processId, "", 1, "", userInfo);
+            Purchase_StudentEntity parameter = this.GetReqData<Purchase_StudentEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseStudentIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-5", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseTravelApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             //List<Purchase_Travel_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Travel_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseTravelIBLL.SaveEntity(parameter.keyValue, entity);
-            return Success("保存成功！");
+            string id=PurchaseTravelIBLL.SaveEntity(parameter.keyValue, entity);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseTravelIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("0.1", processId, "", 1, "", userInfo);
+            Purchase_TravelEntity parameter = this.GetReqData<Purchase_TravelEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseTravelIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("0.1", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseWorkApi.cs

@@ -129,8 +129,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Work_DetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Work_DetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaseworkIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=purchaseworkIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -139,11 +143,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaseworkIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("2-1", processId, "", 1, "", userInfo);
+            Purchase_WorkEntity parameter = this.GetReqData<Purchase_WorkEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaseworkIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("2-1", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseEduApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Edu_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Edu_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaseeduIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=purchaseeduIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaseeduIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-1", processId, "", 1, "", userInfo);
+            Purchase_Edu_ApplyEntity parameter= this.GetReqData<Purchase_Edu_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaseeduIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-1", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseInfoApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Info_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Info_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaseinfoIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=purchaseinfoIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaseinfoIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-4", processId, "", 1, "", userInfo);
+            Purchase_Info_ApplyEntity parameter = this.GetReqData<Purchase_Info_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaseinfoIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-4", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseLogisticApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Logistic_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Logistic_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaselogisticIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=purchaselogisticIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaselogisticIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-3", processId, "", 1, "", userInfo);
+            Purchase_Logistic_ApplyEntity parameter = this.GetReqData<Purchase_Logistic_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaselogisticIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-3", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseOtherApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Other_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Other_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseOtherIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseOtherIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseOtherIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-2", processId, "", 1, "", userInfo);
+            Purchase_Other_ApplyEntity parameter = this.GetReqData<Purchase_Other_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseOtherIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-2", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchasePrintApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Print_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Print_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            purchaseprintIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+           string id= purchaseprintIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            purchaseprintIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-6", processId, "", 1, "", userInfo);
+            Purchase_Print_ApplyEntity parameter = this.GetReqData<Purchase_Print_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            purchaseprintIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-6", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseServiceApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Service_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Service_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseServiceIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseServiceIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseServiceIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-13", processId, "", 1, "", userInfo);
+            Purchase_Service_ApplyEntity parameter = this.GetReqData<Purchase_Service_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseServiceIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-13", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseStudentApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Student_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Student_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseStudentIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseStudentIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseStudentIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-8", processId, "", 1, "", userInfo);
+            Purchase_Student_ApplyEntity parameter = this.GetReqData<Purchase_Student_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseStudentIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-8", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseTravelApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Travel_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Travel_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseTravelIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseTravelIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseTravelIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-5", processId, "", 1, "", userInfo);
+            Purchase_Travel_ApplyEntity parameter = this.GetReqData<Purchase_Travel_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseTravelIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-5", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PurchaseApply/PurchaseWorkApplyApi.cs

@@ -118,8 +118,12 @@ namespace Learun.Application.WebApi
             List<Purchase_Work_ApplydetailsEntity> detailList = parameter.DetailList.ToObject<List<Purchase_Work_ApplydetailsEntity>>();
             //var code = entity.EnCode;
 
-            PurchaseWorkIBLL.SaveEntity(parameter.keyValue, entity, detailList);
-            return Success("保存成功！");
+            string id=PurchaseWorkIBLL.SaveEntity(parameter.keyValue, entity, detailList);
+            var json = new
+            {
+                Id = id
+            };
+            return Success(json);
         }
         /// <summary>
         /// 提交
@@ -128,11 +132,12 @@ namespace Learun.Application.WebApi
         /// <returns></returns>
         public Response Submit(dynamic _)
         {
-            string keyValue = this.GetReqData();
-            var processId = Guid.NewGuid().ToString();
-            PurchaseWorkIBLL.ModifyStatus(keyValue, 1, processId);
-            UserInfo userInfo = LoginUserInfo.Get();
-            nWFProcessIBLL.CreateFlow("1-7", processId, "", 1, "", userInfo);
+            Purchase_Work_ApplyEntity parameter = this.GetReqData<Purchase_Work_ApplyEntity>();
+            //string keyValue = this.GetReqData();
+            //var processId = Guid.NewGuid().ToString();
+            PurchaseWorkIBLL.ModifyStatus(parameter.Id, 1, parameter.ProcessId);
+            //UserInfo userInfo = LoginUserInfo.Get();
+            //nWFProcessIBLL.CreateFlow("1-7", processId, "", 1, "", userInfo);
             return Success("提交成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduBLL.cs

@@ -195,11 +195,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Edu_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Edu_DetailsList)
         {
             try
             {
-                purchase_EduService.SaveEntity(keyValue, entity,purchase_Edu_DetailsList);
+                return purchase_EduService.SaveEntity(keyValue, entity,purchase_Edu_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduIBLL.cs

@@ -64,7 +64,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_EduEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -269,7 +275,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Edu_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_EduEntity entity,List<Purchase_Edu_DetailsEntity> purchase_Edu_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -312,6 +318,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> purchase_Edu_applydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> purchase_Edu_applydetailsList)
         {
             try
             {
-                purchase_Edu_ApplyService.SaveEntity(keyValue, entity,purchase_Edu_applydetailsList);
+               return purchase_Edu_ApplyService.SaveEntity(keyValue, entity,purchase_Edu_applydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> purchase_Edu_applydetailsList);
+        string SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> purchase_Edu_applydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Edu_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> Purchase_Edu_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Edu_ApplyEntity entity,List<Purchase_Edu_ApplydetailsEntity> Purchase_Edu_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoBLL.cs

@@ -171,11 +171,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Info_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Info_DetailsList)
         {
             try
             {
-                purchase_InfoService.SaveEntity(keyValue, entity,purchase_Info_DetailsList);
+                return purchase_InfoService.SaveEntity(keyValue, entity,purchase_Info_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_InfoEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -218,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Work_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_InfoEntity entity,List<Purchase_Info_DetailsEntity> purchase_Work_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -261,6 +267,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList)
         {
             try
             {
-                Purchase_Info_ApplyService.SaveEntity(keyValue, entity,Purchase_Info_ApplydetailsList);
+                return Purchase_Info_ApplyService.SaveEntity(keyValue, entity,Purchase_Info_ApplydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList);
+        string SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Info_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Info_ApplyEntity entity,List<Purchase_Info_ApplydetailsEntity> Purchase_Info_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticBLL.cs

@@ -171,11 +171,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Logistic_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Logistic_DetailsList)
         {
             try
             {
-                purchase_LogisticService.SaveEntity(keyValue, entity,purchase_Logistic_DetailsList);
+                return purchase_LogisticService.SaveEntity(keyValue, entity,purchase_Logistic_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_LogisticEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -218,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Work_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_LogisticEntity entity,List<Purchase_Logistic_DetailsEntity> purchase_Work_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -261,6 +267,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList)
         {
             try
             {
-                Purchase_Logistic_ApplyService.SaveEntity(keyValue, entity,Purchase_Logistic_ApplydetailsList);
+                return  Purchase_Logistic_ApplyService.SaveEntity(keyValue, entity,Purchase_Logistic_ApplydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList);
+        string SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Logistic_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Logistic_ApplyEntity entity,List<Purchase_Logistic_ApplydetailsEntity> Purchase_Logistic_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherBLL.cs

@@ -171,11 +171,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Other_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Other_DetailsList)
         {
             try
             {
-                purchase_OtherService.SaveEntity(keyValue, entity,purchase_Other_DetailsList);
+                return purchase_OtherService.SaveEntity(keyValue, entity,purchase_Other_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_OtherEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -218,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Work_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_OtherEntity entity,List<Purchase_Other_DetailsEntity> purchase_Work_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -261,6 +267,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList)
         {
             try
             {
-                Purchase_Other_ApplyService.SaveEntity(keyValue, entity,Purchase_Other_ApplydetailsList);
+                return Purchase_Other_ApplyService.SaveEntity(keyValue, entity,Purchase_Other_ApplydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList);
+        string SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Other_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Other_ApplyEntity entity,List<Purchase_Other_ApplydetailsEntity> Purchase_Other_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintBLL.cs

@@ -171,11 +171,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Print_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Print_DetailsList)
         {
             try
             {
-                purchase_PrintService.SaveEntity(keyValue, entity,purchase_Print_DetailsList);
+                return purchase_PrintService.SaveEntity(keyValue, entity,purchase_Print_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_PrintEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -218,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Work_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_PrintEntity entity,List<Purchase_Print_DetailsEntity> purchase_Work_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -261,6 +267,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList)
         {
             try
             {
-                Purchase_Print_ApplyService.SaveEntity(keyValue, entity,Purchase_Print_ApplydetailsList);
+                return Purchase_Print_ApplyService.SaveEntity(keyValue, entity,Purchase_Print_ApplydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList);
+        string SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Print_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Print_ApplyEntity entity,List<Purchase_Print_ApplydetailsEntity> Purchase_Print_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceBLL.cs

@@ -195,11 +195,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> Purchase_Service_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> Purchase_Service_DetailsList)
         {
             try
             {
-                Purchase_ServiceService.SaveEntity(keyValue, entity,Purchase_Service_DetailsList);
+                return Purchase_ServiceService.SaveEntity(keyValue, entity,Purchase_Service_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceIBLL.cs

@@ -64,7 +64,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_ServiceEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -269,7 +275,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> Purchase_Service_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_ServiceEntity entity,List<Purchase_Service_DetailsEntity> Purchase_Service_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -312,6 +318,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_applydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_applydetailsList)
         {
             try
             {
-                Purchase_Service_ApplyService.SaveEntity(keyValue, entity,Purchase_Service_applydetailsList);
+                return Purchase_Service_ApplyService.SaveEntity(keyValue, entity,Purchase_Service_applydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_applydetailsList);
+        string SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_applydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Service_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Service_ApplyEntity entity,List<Purchase_Service_ApplydetailsEntity> Purchase_Service_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentBLL.cs

@@ -171,11 +171,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Student_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Student_DetailsList)
         {
             try
             {
-                purchase_StudentService.SaveEntity(keyValue, entity,purchase_Student_DetailsList);
+                return purchase_StudentService.SaveEntity(keyValue, entity,purchase_Student_DetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Work_DetailsList);
+        string SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Work_DetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs

@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_StudentEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -218,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Work_DetailsList)
+        public string SaveEntity(string keyValue, Purchase_StudentEntity entity,List<Purchase_Student_DetailsEntity> purchase_Work_DetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -261,6 +267,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList)
         {
             try
             {
-                Purchase_Student_ApplyService.SaveEntity(keyValue, entity,Purchase_Student_ApplydetailsList);
+                return Purchase_Student_ApplyService.SaveEntity(keyValue, entity,Purchase_Student_ApplydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList);
+        string SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs

@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Student_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -232,7 +238,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Student_ApplyEntity entity,List<Purchase_Student_ApplydetailsEntity> Purchase_Student_ApplydetailsList)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -277,6 +283,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelBLL.cs

@@ -149,11 +149,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_TravelEntity entity)
+        public string SaveEntity(string keyValue, Purchase_TravelEntity entity)
         {
             try
             {
-                Purchase_TravelService.SaveEntity(keyValue, entity);
+                return Purchase_TravelService.SaveEntity(keyValue, entity);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs

@@ -56,6 +56,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("ENDTIME")]
         public DateTime? Endtime { get; set; }
+        /// <summary>
+        /// 出差人员
+        /// </summary>
+        [Column("TRAVELER")]
+        public string Traveler { get; set; }
+        /// <summary>
+        /// 出差地点
+        /// </summary>
+        [Column("TRAVELADDRESS")]
+        public string TravelAddress { get; set; }
 
 
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelIBLL.cs

@@ -53,7 +53,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_TravelEntity entity);
+        string SaveEntity(string keyValue, Purchase_TravelEntity entity);
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs

@@ -35,6 +35,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 t.Id,
                 t.CreatorId,
                 t.CreatorName,
+                t.Traveler,
+                t.TravelAddress,
                 t.Follows,
                 t.Reason,
                 t.Starttime,
@@ -71,6 +73,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_TravelEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -222,7 +230,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, Purchase_TravelEntity entity)
+        public string SaveEntity(string keyValue, Purchase_TravelEntity entity)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -254,6 +262,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            return entity.Id;
         }
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyBLL.cs

@@ -172,11 +172,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, Purchase_Travel_ApplyEntity entity,List<Purchase_Travel_ApplydetailsEntity> Purchase_Travel_applydetailsList)
+        public string SaveEntity(string keyValue, Purchase_Travel_ApplyEntity entity,List<Purchase_Travel_ApplydetailsEntity> Purchase_Travel_applydetailsList)
         {
             try
             {
-                Purchase_Travel_ApplyService.SaveEntity(keyValue, entity,Purchase_Travel_applydetailsList);
+                return Purchase_Travel_ApplyService.SaveEntity(keyValue, entity,Purchase_Travel_applydetailsList);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyIBLL.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, Purchase_Travel_ApplyEntity entity,List<Purchase_Travel_ApplydetailsEntity> Purchase_Travel_applydetailsList);
+        string SaveEntity(string keyValue, Purchase_Travel_ApplyEntity entity,List<Purchase_Travel_ApplydetailsEntity> Purchase_Travel_applydetailsList);
         #endregion