资产报修优化

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/EvaluateFormView.cshtml

@@ -79,8 +79,8 @@
         <span>评价</span>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">评价</div>
-        <input id="Evaluate" type="text" class="form-control" />
+        <div class="lr-form-item-title">评价<font face="宋体">*</font></div>
+        <input id="Evaluate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportStudent/EvaluateFormView.js")

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

@@ -37,47 +37,47 @@
         <input id="Contact" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">报修地址</div>
-        <input id="Address" type="text" class="form-control" />
+        <div class="lr-form-item-title">报修地址<font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
         <div class="lr-form-item-title">报修类型<font face="宋体">*</font></div>
         <div id="ServiceType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">故障描述</div>
-        <input id="Remark" type="text" class="form-control" />
+        <div class="lr-form-item-title">故障描述<font face="宋体">*</font></div>
+        <input id="Remark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写故障描述（具体损坏部位，故障原因）例如：马桶故障，不上水；课桌损坏，断腿。" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">故障图片</div>
-        <div id="FilePath"></div>
+        <div class="lr-form-item-title">故障图片<font face="宋体">*</font></div>
+        <div id="FilePath" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">给维修人留言</div>
-        <input id="LeaveMsg" type="text" class="form-control" />
+        <div class="lr-form-item-title">给维修人留言<font face="宋体">*</font></div>
+        <input id="LeaveMsg" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写给维修人员留言，如约定维修时间。详细描述宿舍什么时间有人，教室什么时候没课，维修人员可以过去维修。" />
     </div>
     @*<div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
-        <span>维修处理信息</span>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">处理日期</div>
-        <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">故障原因</div>
-        <input id="Reason" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">耗材信息</div>
-        <input id="Material" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">维修图片</div>
-        <div id="RepairImg"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">评价</div>
-        <input id="Evaluate" type="text" class="form-control" />
-    </div>*@
+            <span>维修处理信息</span>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">处理日期</div>
+            <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">故障原因</div>
+            <input id="Reason" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">耗材信息</div>
+            <input id="Material" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">维修图片</div>
+            <div id="RepairImg"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">评价</div>
+            <input id="Evaluate" type="text" class="form-control" />
+        </div>*@
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportStudent/Form.js")

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

@@ -13,8 +13,6 @@ var bootstrap = function ($, learun) {
         init: function () {
             $('.lr-form-wrap').lrscroll();
             userinfo = learun.clientdata.get(['userinfo']);//用户数据
-
-            console.log(userinfo)
             page.bind();
             page.initData();
         },

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

@@ -64,6 +64,12 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可编辑！");
+                    return;
+                }
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 0) {//提交
                         learun.alert.warning("当前记录已提交！");
@@ -84,6 +90,12 @@ var bootstrap = function ($, learun) {
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可删除！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 0) {//提交
@@ -102,6 +114,12 @@ var bootstrap = function ($, learun) {
             // 提交
             $('#lr-sub').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可提交！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status > 0) {
@@ -141,6 +159,12 @@ var bootstrap = function ($, learun) {
             //  评价
             $('#lr-eval').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可评价！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 2) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealFormView.cshtml

@@ -60,27 +60,27 @@
         <span>维修处理信息</span>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">处理日期</div>
-        <input  id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">处理日期 <font face="宋体">*</font></div>
+        <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">故障原因</div>
-        <input id="Reason" type="text" class="form-control"  />
+        <div class="lr-form-item-title">故障原因 <font face="宋体">*</font></div>
+        <input id="Reason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">耗材信息</div>
-        <input id="Material" type="text" class="form-control"  />
+        <div class="lr-form-item-title">耗材信息 <font face="宋体">*</font></div>
+        <input id="Material" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">维修图片</div>
-        <div id="RepairImg"></div>
+        <div class="lr-form-item-title">维修图片<font face="宋体">*</font></div>
+        <div id="RepairImg" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     @*<div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
-        <span>评价</span>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
-        <div class="lr-form-item-title">评价</div>
-        <input id="Evaluate" type="text" class="form-control" />
-    </div>*@
+            <span>评价</span>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+            <div class="lr-form-item-title">评价</div>
+            <input id="Evaluate" type="text" class="form-control" />
+        </div>*@
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportStudent/dealFormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.js

@@ -68,7 +68,6 @@ var bootstrap = function ($, learun) {
             });
             //维修处理
             $('#lr-deal').on('click', function () {
-                console.log(123)
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
@@ -180,7 +179,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            param.Status = '1,2,3'
+            param.Status = '1'
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/EvaluateFormView.cshtml

@@ -73,8 +73,8 @@
             <div id="RepairImg"  ></div>
         </div>
         <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">评价</div>
-            <input id="Evaluate" type="text" class="form-control"  />
+            <div class="lr-form-item-title">评价 <font face="宋体">*</font></div>
+            <input id="Evaluate" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull" />
         </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/RepairReportTeacher/EvaluateFormView.js")

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

@@ -34,24 +34,24 @@
         <input id="Contact" type="text" class="form-control" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
-        <div class="lr-form-item-title">报修地址</div>
-        <input id="Address" type="text" class="form-control" />
+        <div class="lr-form-item-title">报修地址 <font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control"isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">报修类型<font face="宋体">*</font></div>
         <div id="ServiceType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
-        <div class="lr-form-item-title">故障描述</div>
-        <input id="Remark" type="text" class="form-control" />
+        <div class="lr-form-item-title">故障描述<font face="宋体">*</font></div>
+        <input id="Remark" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" placeholder="请填写故障描述（具体损坏部位，故障原因）例如：马桶故障，不上水；课桌损坏，断腿。" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
-        <div class="lr-form-item-title">故障图片</div>
-        <div id="FilePath"></div>
+        <div class="lr-form-item-title">故障图片<font face="宋体">*</font></div>
+        <div id="FilePath" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
-        <div class="lr-form-item-title">给维修人留言</div>
-        <input id="LeaveMsg" type="text" class="form-control" />
+        <div class="lr-form-item-title">给维修人留言<font face="宋体">*</font></div>
+        <input id="LeaveMsg" type="text" class="form-control"isvalid="yes" checkexpession="NotNull" placeholder="请填写给维修人员留言，如约定维修时间。详细描述宿舍什么时间有人，教室什么时候没课，维修人员可以过去维修。" />
     </div>
     @*<div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;" >
             <span>维修处理信息</span>

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

@@ -13,7 +13,6 @@ var bootstrap = function ($, learun) {
         init: function () {
             $('.lr-form-wrap').lrscroll();
             userinfo = learun.clientdata.get(['userinfo']);//用户数据
-            console.log(userinfo)
             page.bind();
             page.initData();
         },

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

@@ -63,6 +63,12 @@ var bootstrap = function ($, learun) {
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可编辑！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 0) {//提交
@@ -84,6 +90,12 @@ var bootstrap = function ($, learun) {
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可删除！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 0) {//提交
@@ -102,6 +114,12 @@ var bootstrap = function ($, learun) {
             // 提交
             $('#lr-sub').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可提交！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status > 0) {
@@ -142,6 +160,12 @@ var bootstrap = function ($, learun) {
             //  评价
             $('#lr-eval').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Creator = $('#gridtable').jfGridValue('Creator');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (Creator != user) {
+                    learun.alert.warning("当前项不可评价！");
+                    return;
+                }
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status != 2) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealFormView.cshtml

@@ -1,6 +1,8 @@
 @{
-    ViewBag.Title = "教师报修";
-    Layout = "~/Views/Shared/_Form.cshtml";
+                /**/
+
+                ViewBag.Title = "教师报修";
+                Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="RepairReport_Teacher" style="display: none; ">
@@ -35,7 +37,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">报修地址</div>
-        <input id="Address" type="text" class="form-control" disabled/>
+        <input id="Address" type="text" class="form-control" disabled />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">报修类型<font face="宋体">*</font></div>
@@ -43,7 +45,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">故障描述</div>
-        <input id="Remark" type="text" class="form-control" disabled/>
+        <input id="Remark" type="text" class="form-control" disabled />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">故障图片</div>
@@ -51,28 +53,28 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Teacher">
         <div class="lr-form-item-title">给维修人留言</div>
-        <input id="LeaveMsg" type="text" class="form-control" disabled/>
-    </div>
-    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;" >
-            <span>维修处理信息</span>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">处理日期</div>
-            <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })"   isvalid="yes" checkexpession="NotNull"/>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">故障原因</div>
-            <input id="Reason" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull"/>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">耗材信息</div>
-            <input id="Material" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull"/>
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
-            <div class="lr-form-item-title">维修图片</div>
-            <div id="RepairImg"  ></div>
-        </div>
-        @*<div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
+        <input id="LeaveMsg" type="text" class="form-control" disabled />
+    </div>
+    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
+        <span>维修处理信息</span>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">处理日期 <font face="宋体">*</font></div>
+        <input id="RepairTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RepairTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">故障原因 <font face="宋体">*</font></div>
+        <input id="Reason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">耗材信息 <font face="宋体">*</font></div>
+        <input id="Material" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
+        <div class="lr-form-item-title">维修图片<font face="宋体">*</font></div>
+        <div id="RepairImg" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item"  data-table="RepairReport_Teacher" >
             <div class="lr-form-item-title">评价</div>
             <input id="Evaluate" type="text" class="form-control"  />
         </div>*@

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -168,6 +168,8 @@
 	<add key="QJUrl" value="www.qj.com"/>
 	<!--系主任角色Id-->
 	<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--维修角色Id-->
+  <add key="MaintainRoleId" value="2939ea21-971d-4e3c-a2e9-6330a64bfab5" />
 	<!-- 登录次数限制：登录连续错误要禁止登录 -->
 	<add key="ForbidLoginNum" value="5"/>
 	<!-- 禁止登录时间（分钟） -->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/RepairReport/RepairReportStudentApi.cs

@@ -134,8 +134,8 @@ namespace Learun.Application.WebApi
             var model = repairreportStudentIBLL.GetRepairReport_StudentEntity(keyValue);
 
             //向所有维修员发消息
-            string roleid = roleIBLL.GetIdByRoleName("维修角色");
-            var data = userRelationIBLL.GetUserIdList(roleid);
+            var MaintainRoleId = Config.GetValue("MaintainRoleId");
+            var data = userRelationIBLL.GetUserIdList(MaintainRoleId);
             string userIds = "";
             foreach (var item in data)
             {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/RepairReport/RepairReportTeacherApi.cs

@@ -134,8 +134,8 @@ namespace Learun.Application.WebApi
             var model = repairreportTeacherIBLL.GetRepairReport_TeacherEntity(keyValue);
 
             //向所有维修员发消息
-            string roleid = roleIBLL.GetIdByRoleName("维修角色");
-            var data = userRelationIBLL.GetUserIdList(roleid);
+            var MaintainRoleId = Config.GetValue("MaintainRoleId");
+            var data = userRelationIBLL.GetUserIdList(MaintainRoleId);
             string userIds = "";
             foreach (var item in data)
             {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -104,6 +104,8 @@
   <add key="verifypwd" value="false"/>
   <!--疫情防控组角色Id-->
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
+  <!--维修角色Id-->
+  <add key="MaintainRoleId" value="2939ea21-971d-4e3c-a2e9-6330a64bfab5" />
   <add key="QJUrl" value="www.qj.com"/>
   <!-- 报名选修课的最大课程数 -->
   <add key="ElectiveLessonApplyMax" value="2" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportStudent/RepairReportStudentService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.LogisticsManagement
@@ -31,29 +32,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.OrderNumber,
-                t.CreateTime,
-                t.CreatorName,
-                t.StuNo,
-                t.DeptNo,
-                t.DeptName,
-                t.MajorNo,
-                t.TeachClassNo,
-                t.Contact,
-                t.Address,
-                t.ServiceType,
-                t.Remark,
-                t.FilePath,
-                t.LeaveMsg,
-                t.RepairTime,
-                t.Reason,
-                t.Material,
-                t.RepairImg,
-                t.Evaluate,
-                t.Status
-                ");
+                strSql.Append(@" t.* ");
                 strSql.Append("  FROM RepairReport_Student t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -65,7 +44,24 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<RepairReport_StudentEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["Status"].IsEmpty())
+                {
+                    strSql.Append(" AND t.Status !=0 ");
+                }
+                var userLogin = LoginUserInfo.Get();
+                //按角色查询是否有查看的权限
+                var MaintainRoleId = Config.GetValue("MaintainRoleId");
+                var loginInfoRoleIds = LoginUserInfo.Get().roleIds;
+                if (!userLogin.Description.Contains("管理员") && !loginInfoRoleIds.Split(',').Contains(MaintainRoleId))
+                {
+                    strSql.Append(" AND t.Creator = '" + userLogin.userId + "' ");
+                }
+                //else
+                //{
+                //    dp.Add("Creator", queryParam["Creator"].ToString(), DbType.String);
+                //    strSql.Append(" AND t.Creator = @Creator ");
+                //}
+                return this.BaseRepository("CollegeMIS").FindList<RepairReport_StudentEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -116,7 +112,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<RepairReport_StudentEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<RepairReport_StudentEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -171,8 +167,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     }
                     else
                     {
-                        string str = todaydata.ToString().Substring(entity.OrderNumber.Length,2);
-                        entity.OrderNumber += (str.ToInt()+1).ToString("00");
+                        string str = todaydata.ToString().Substring(entity.OrderNumber.Length, 2);
+                        entity.OrderNumber += (str.ToInt() + 1).ToString("00");
                     }
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/RepairReportTeacher/RepairReportTeacherService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.LogisticsManagement
@@ -31,27 +32,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.OrderNumber,
-                t.CreateTime,
-                t.CreatorName,
-                t.TeachNo,
-                t.DeptNo,
-                t.DeptName,
-                t.Contact,
-                t.Address,
-                t.ServiceType,
-                t.Remark,
-                t.FilePath,
-                t.LeaveMsg,
-                t.RepairTime,
-                t.Reason,
-                t.Material,
-                t.RepairImg,
-                t.Evaluate,
-                t.Status
-                ");
+                strSql.Append(@" t.* ");
                 strSql.Append("  FROM RepairReport_Teacher t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -64,11 +45,23 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) ");
                 }
                 if (!queryParam["Status"].IsEmpty())
+                {
+                    strSql.Append(" AND t.Status !=0 ");
+                }
+                var userLogin = LoginUserInfo.Get();
+                //按角色查询是否有查看的权限
+                var MaintainRoleId = Config.GetValue("MaintainRoleId");
+                var loginInfoRoleIds = LoginUserInfo.Get().roleIds;
+                if (!userLogin.Description.Contains("管理员") && !loginInfoRoleIds.Split(',').Contains(MaintainRoleId))
+                {
+                    strSql.Append(" AND t.Creator = '" + userLogin.userId + "' ");
+                }
+                if (!queryParam["Status"].IsEmpty())
                 {
                     //dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
                     strSql.Append(" AND t.Status !=0 ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<RepairReport_TeacherEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<RepairReport_TeacherEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -119,7 +112,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<RepairReport_TeacherEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<RepairReport_TeacherEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -174,8 +167,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     }
                     else
                     {
-                        string str = todaydata.ToString().Substring(entity.OrderNumber.Length,2);
-                        entity.OrderNumber += (str.ToInt()+1).ToString("00");
+                        string str = todaydata.ToString().Substring(entity.OrderNumber.Length, 2);
+                        entity.OrderNumber += (str.ToInt() + 1).ToString("00");
                     }
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }