报修新增维修人需求完成

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportStudentController.cs

@@ -202,6 +202,13 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         /// <returns></returns>
         public ActionResult ModifyStatus(string keyValue, int  status, string processId)
         {
+            //查询当前用户是否有已处理未评价的报修数据
+            //select * from repairreport_teacher where status='2' and creator=''
+            int existcount = repairReportStudentIBLL.Waitevaluatecount();
+            if (existcount > 0)
+            {
+                return Fail("您有待评价的保修单，请评价后在提交！");
+            }
             repairReportStudentIBLL.ModifyStatus(keyValue, status, processId);
             var model = repairReportStudentIBLL.GetRepairReport_StudentEntity(keyValue);
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/RepairReportTeacherController.cs

@@ -199,6 +199,13 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         /// <returns></returns>
         public ActionResult ModifyStatus(string keyValue, int status, string processId)
         {
+            //查询当前用户是否有已处理未评价的报修数据
+            //select * from repairreport_teacher where status='2' and creator=''
+            int existcount = repairReportTeacherIBLL.Waitevaluatecount();
+            if (existcount>0)
+            {
+                return Fail("您有待评价的保修单，请评价后在提交！");
+            }
             //修改状态
             repairReportTeacherIBLL.ModifyStatus(keyValue, status, processId);
 

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

@@ -83,6 +83,10 @@
         <div class="lr-form-item-title">付款金额</div>
         <input id="Amount" class="form-control" />
     </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="Repairname" class="form-control" isvalid="yes" checkexpession="NotNull"/>
+    </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>

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

@@ -243,7 +243,7 @@
         tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
-        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:30.0pt">';
         tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
         tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人签字';
@@ -253,6 +253,16 @@
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;  padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:30.0pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">维修人签字';
+        tableHtml += '					</span>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;  padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
         tableHtml += '	</tbody>';
         tableHtml += '</table>';
         html += tableHtml;
@@ -272,7 +282,7 @@
         LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
         LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
 
-        LODOP.ADD_PRINT_HTM("25mm", 0, '100%', '100%', strFormHtml);
+        LODOP.ADD_PRINT_HTM("15mm", 0, '100%', '100%', strFormHtml);
         LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
         if (flag == "preview") {
             //打印预览

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

@@ -290,6 +290,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "付款金额", name: "Amount", width: 100, align: "left"},
+                    { label: "维修人姓名", name: "Repairname", width: 100, align: "left"},
                     //{ label: "维修图片", name: "RepairImg", width: 100, align: "left"},
                     { label: "评价", name: "Evaluate", width: 100, align: "left"},
                     { 

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

@@ -173,6 +173,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "付款金额", name: "Amount", width: 100, align: "left"},
+                    { label: "维修人姓名", name: "Repairname", width: 100, align: "left"},
                     //{ label: "维修图片", name: "RepairImg", width: 100, align: "left"},
                     { label: "评价", name: "Evaluate", width: 100, align: "left"},
                 ],

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

@@ -80,7 +80,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="RepairReport_Student">
         <div class="lr-form-item-title">付款金额</div>
-        <input id="Amount" class="form-control"  />
+        <input id="Amount" class="form-control" />
+    </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="Repairname" 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>

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

@@ -229,7 +229,7 @@
         tableHtml += (title.indexOf("结束") >= 0 ? (data.Amount ? data.Amount : "") : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
-        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:30.0pt">';
         tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
         tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">报修人签字';
@@ -239,6 +239,16 @@
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;  padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
+        tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:30.0pt">';
+        tableHtml += '			<td valign="top" style="border:solid windowtext 1.0pt;  border-top:none;padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
+        tableHtml += '					<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">维修人签字';
+        tableHtml += '					</span>';
+        tableHtml += '				</p>';
+        tableHtml += '			</td>';
+        tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;  padding:0cm 5.4pt 0cm 5.4pt;height:67.0pt">';
+        tableHtml += '			</td>';
+        tableHtml += '		</tr>';
         tableHtml += '	</tbody>';
         tableHtml += '</table>';
         //html += '<tr><td>' + b.type + '</td><td>' + b.className + '</td><td style="text-align:center">' + b.achievement + '</td></tr>';
@@ -307,7 +317,7 @@
         LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
         LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
 
-        LODOP.ADD_PRINT_HTM("25mm", 0, '100%', '100%', strFormHtml);
+        LODOP.ADD_PRINT_HTM("15mm", 0, '100%', '100%', strFormHtml);
         LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
         if (flag == "preview") {
             //打印预览

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

@@ -193,6 +193,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "付款金额", name: "Amount", width: 100, align: "left"},
+                    { label: "维修人姓名", name: "Repairname", width: 100, align: "left"},
                     //{ label: "维修图片", name: "RepairImg", width: 100, align: "left"},
                     { label: "评价", name: "Evaluate", width: 100, align: "left"},
                     { 

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

@@ -136,6 +136,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "付款金额", name: "Amount", width: 100, align: "left"},
+                    { label: "维修人姓名", name: "Repairname", width: 100, align: "left"},
                     //{ label: "维修图片", name: "RepairImg", width: 100, align: "left"},
                     //{ label: "评价", name: "Evaluate", width: 100, align: "left"},
                 ],

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

@@ -54,6 +54,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="status">审核状态</param>
         /// <param name="processId">流程Id</param>
         void ModifyStatus(string keyValue, int status, string processId);
+        /// <summary>
+        /// 待评价数据
+        /// </summary>
+        int Waitevaluatecount();
         #endregion
     }
 }

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

@@ -147,6 +147,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
+        public int Waitevaluatecount()
+        {
+            return repairReportStudentService.Waitevaluatecount();
+        }
         #endregion
 
     }

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

@@ -227,6 +227,30 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
+        /// <summary>
+        /// 获取未评价订单条数
+        /// </summary>
+        public int Waitevaluatecount()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select count(*) from repairreport_student where status='2' and creator='" + LoginUserInfo.Get().userId + "' ");
+                //strSql.Append(" order by t.createtime desc");
+                return (int)this.BaseRepository("CollegeMIS").FindObject(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }

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

@@ -129,17 +129,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("ISPAY")]
         public string IsPay { get; set; }
-        [NotMapped]
-        public string rejectuser { get; set; }
-        [NotMapped]
-        public string rejecttime { get; set; }
-        [NotMapped]
-        public string rejectreason { get; set; }
         /// <summary>
         /// Amount
         /// </summary>
         [Column("AMOUNT")]
         public string Amount { get; set; }
+        /// <summary>
+        /// Repairname
+        /// </summary>
+        [Column("REPAIRNAME")]
+        public string Repairname { get; set; }
         #endregion
 
         #region 扩展操作
@@ -163,6 +162,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string rejectuser { get; set; }
+        [NotMapped]
+        public string rejecttime { get; set; }
+        [NotMapped]
+        public string rejectreason { get; set; }
         #endregion
     }
 }

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

@@ -148,6 +148,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
+        public int Waitevaluatecount()
+        {
+            return repairReportTeacherService.Waitevaluatecount();
+        }
         #endregion
 
     }

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

@@ -54,6 +54,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="status">审核状态</param>
         /// <param name="processId">流程Id</param>
         void ModifyStatus(string keyValue, int status, string processId);
+        /// <summary>
+        /// 待评价数据
+        /// </summary>
+        int Waitevaluatecount();
         #endregion
     }
 }

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

@@ -227,6 +227,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
+
+        /// <summary>
+        /// 获取未评价订单条数
+        /// </summary>
+        public int Waitevaluatecount()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select count(*) from repairreport_teacher where status='2' and creator='"+ LoginUserInfo.Get().userId +"' ");
+                //strSql.Append(" order by t.createtime desc");
+                return (int)this.BaseRepository("CollegeMIS").FindObject(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }

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

@@ -124,12 +124,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("AMOUNT")]
         public string Amount { get; set; }
-        [NotMapped]
-        public string rejectuser { get; set; }
-        [NotMapped]
-        public string rejecttime { get; set; }
-        [NotMapped]
-        public string rejectreason { get; set; }
+        /// <summary>
+        /// Repairname
+        /// </summary>
+        [Column("REPAIRNAME")]
+        public string Repairname { get; set; }
         #endregion
 
         #region 扩展操作
@@ -153,6 +152,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string rejectuser { get; set; }
+        [NotMapped]
+        public string rejecttime { get; set; }
+        [NotMapped]
+        public string rejectreason { get; set; }
         #endregion
     }
 }