前端代码

yanjinhui

2025-07-29 c5de0d98241f8c8349fa38851b77efcfc61e4d26

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs

@@ -235,11 +235,12 @@
            {
                // 1. æŸ¥æ‰¾ç›®æ ‡ç”¨æˆ·ï¼ˆè¦è¢«å¼ºåˆ¶ä¸‹çº¿çš„人）
                var maint = BaseDal.QueryData().FirstOrDefault(x => x.ID == id);
                var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user表
                if (maint == null || sysuer==null)
                if (maint==null)
                {
                    return new WebResponseContent { Status = false, Message = "没有找到该用户" };
                }
                var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user表
               
               

                // 2. æŸ¥æ‰¾å½“前登录用户（执行操作的人）
@@ -262,7 +263,7 @@
                maint.MaintenanceStatus = 0;  // æ”¹å˜çŠ¶æ€ä¸ºä¸‹çº¿
                BaseDal.UpdateData(maint);

                var ip = LocalIP.Replace("::ffff:", "");
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""

                // 5. è®°å½•æ“ä½œæ—¥å¿—
                var recording = new Dt_MaintenanceTeam
@@ -539,7 +540,8 @@
                    }

                }
                var ip = LocalIP.Replace("::ffff:", "");
               
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""
                //如果满足下面的条件就开始
                maint.MaintenancStartTime = DateTime.Now;//记录开始时间
                maint.MaintenanceStatus = 1;//更改状态
@@ -561,7 +563,7 @@
                    Account = account,
                    MaintenanceStatus=1,
                    OperatorName = sysuer.UserTrueName,
                    TeamName = sysuer.RoleName,
                    TeamName = sysuer.Userteam,
                    DistributionTime = DateTime.Now,
                    IPAddress = addressIp,
                };
@@ -619,7 +621,7 @@
                            return new WebResponseContent
                            {
                                Status = false,
                                Message = "您是最后一个在场的组长，请等待所有组员完成检修后再结束"
                                Message = "您是最后一个在场的一级人员，请等待所有二级人员完成检修后再结束"
                            };
                        }
                    }
@@ -628,8 +630,8 @@
                //{
                //    return new WebResponseContent { Status = false, Message = "操作设备不同，请回到原本设备再点击结束检修" };
                //}
                var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
                var ip = LocalIP.Replace("::ffff:", "");
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""
                var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
                var addressIp = "";
                if (address != null) //找到了
                {
@@ -651,7 +653,7 @@
                    Account = account,
                    MaintenanceStatus = 0,
                    OperatorName = sysuer.UserTrueName,
                    TeamName = sysuer.RoleName,
                    TeamName = sysuer.Userteam,
                    IPAddress = addressIp,
                    EndTime = DateTime.Now,
                };