From 59f70c3ade304f0837511273e813d7989d6a89de Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期六, 07 八月 2021 17:45:15 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
index 87dde7c..6c2baa4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
@@ -20,6 +20,9 @@
         DataSet ds;
 
 
+        #region 缁翠慨鏂瑰紡
+
+        #region 缁翠慨鏂瑰紡鍔犺浇鍒楄〃
         /// <summary>
         /// 杩斿洖缁翠慨鏂瑰紡鍒楄〃
         ///鍙傛暟锛歴tring sql銆�
@@ -67,8 +70,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
+        #region 缁翠慨鏂瑰紡鏍规嵁鏍戝瀷id鏌ヨ鍒楄〃
         /// <summary>
         /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
         ///鍙傛暟锛歴tring sql銆�
@@ -81,7 +85,7 @@
             try
             {
                 
-                ds = oCN.RunProcReturn("select * from h_v_IF_RepairTypeList where HitemID=" + HInterID, "h_v_IF_RepairTypeList");
+                ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_IF_RepairTypeList WHERE HitemID="+ HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_IF_RepairTypeList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_IF_RepairTypeList");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -108,7 +112,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region 缁翠慨鏂瑰紡鍒犻櫎
         /// <summary>
         /// 缁翠慨鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -187,16 +193,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-        //[Route("Gy_Department/LoadTree")]
-        //[HttpGet]
-        //public object LoadTree_Json()
-        //{
-        //    DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
-        //}
-
-
-
+        #region 缁翠慨鏂瑰紡鏂板淇濆瓨
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -220,7 +219,7 @@
 
                 List<MaintenanceMode> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceMode>>(msg1);
 
-                long HItemID = list[0].HItemID;
+                long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
                 string HShortNumber = list[0].HNumber;
@@ -248,10 +247,13 @@
                 oCN.RunProc("Insert Into Gy_RepairType " +
                 "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                 ",HLevel,HEndFlag,HStopflag,HRemark) " +
-                " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','0'" +
+                " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
                 ",'1',0,'" + HStopflag + "','"+ HRemark + "')");
                 //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
-                oCN.RunProc("Update Gy_RepairType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (list[0].HItemID.ToString() != "")
+                {
+                    oCN.RunProc("Update Gy_RepairType set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
                 oCN.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -269,8 +271,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
-
+        #region 缁翠慨鏂瑰紡淇敼淇濆瓨
         /// <summary>
         /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -301,7 +304,7 @@
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
                 string HShortNumber = list[0].HNumber;
-                long HParentID = list[0].HParentID;
+                long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
                 string HHelpCode = list[0].HHelpCode;
                 string HRemark = list[0].HRemark;
                 string HStopflag = list[0].HStopflag;
@@ -370,6 +373,7 @@
                 return objJsonResult;
             }
         }
+        #endregion 
 
 
         /// <summary>
@@ -402,6 +406,8 @@
         }
 
 
+        #region 缁翠慨鏂瑰紡淇敼鑾峰彇閫変腑鏁版嵁
+
         /// <summary>
         /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
         ///鍙傛暟锛歴tring sql銆�
@@ -430,8 +436,10 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
 
+        #region 缁翠慨鏂瑰紡鑾峰彇鏍戝瀷鏁版嵁
 
         [Route("Gy_MaintenanceMode/LoadTree")]
         [HttpGet]
@@ -458,7 +466,9 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #endregion
 
 
         //

--
Gitblit v1.9.1