查詢歷史修正

WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs

@@ -69,7 +69,6 @@ namespace WebAPI.Controllers
                             left join esn_todos_Flow_StepType c on a.ToType_id = c.id
                             left join evw_Employee d  on a.Create_User_id = d.user_id
                             where a.Flow_id = @Flow_id
-                            order by ConfirmTime desc
                     "
                         };
                         cmd.Parameters.AddWithValue("@Flow_id", obj_input["Flowid"].ToString());
@@ -90,6 +89,7 @@ namespace WebAPI.Controllers
                                 Description = dr["Description"].ToString()
                             };
                             Hislist.Add(hisT);
+                            //Hislist.OrderByDescending(p => p.ConfirmTime);
                         }
                     }
 
@@ -205,11 +205,11 @@ namespace WebAPI.Controllers
                         #endregion
 
                         String Wade_User_ID = obj_input["Wade_User_ID"].ToString(), Reject_Description = obj_input["Reject_Description"].ToString(),
-                            date0 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:dd"), Tsql = "";
+                            date0 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Tsql = "";
 
                         JToken JtSn;
                         //List<String> sql = new List<string>();
-                        int StepType_id_Previous, StepType_id;
+                        int StepType_id_Previous, StepType_id, StepType_idHis;
                         foreach (DataRow dr in ds.Tables[0].Rows)
                         {
                             StepType_id_Previous = dr["StepType_id_Previous"] == DBNull.Value ? 0 : Convert.ToInt32(dr["StepType_id_Previous"]);
@@ -219,6 +219,7 @@ namespace WebAPI.Controllers
                             if (dr["esn_todos_sn"] == DBNull.Value) //insert
                             {
 
+                                StepType_idHis = CStepTypeCur.id;
                                 CStepTypeNext = AllStepType.Where(p => p.Map_Class.Contains("PE")).FirstOrDefault();
                                 CStepTypeCur = CStepTypeNext; 
                                 Tsql = @"insert into esn_todos_Flow(esn_todos_sn,[StepType_id],[" + CStepTypeCur.Map_Class
@@ -227,7 +228,6 @@ namespace WebAPI.Controllers
                                      + " values (" + dr["sn"] + ",'" + CStepTypeNext.id + "'," + IsConfirm + ",'" + 1
                                      + "','" + Reject_Description + "','" + Wade_User_ID + "'" + ",'" + date0 + "'" + ",'" + Wade_User_ID + "'" + ",'" + date0 + "'" + "); "
                                      ;
-
                             }
                             else //update
                             {
@@ -249,13 +249,16 @@ namespace WebAPI.Controllers
                                 CStepTypeNext = AllStepType.Where(p => p.Step_Value == CStepTypeCur.Step_Value_Next).FirstOrDefault();
                                 String Step_Value_previous = dr["Step_Value_previous"].ToString(), Step_Value_Next = dr["Step_Value_Next"].ToString();
                                 Tsql = Tsql + "update esn_todos_Flow set ";
+
                                 if (Confirm_Method == "RJ")
                                 {
                                     Tsql = Tsql + "PG_IsConfirm =" + IsConfirm + "," + "PE_IsConfirm =" + IsConfirm + "," + "Leader_IsConfirm =" + IsConfirm + ","; //退回後,改為更新所有Flow狀態確認
                                     CStepTypeNext = AllStepType.Where(p => p.Step_Value == Step_Value_previous).FirstOrDefault();
+                                    StepType_idHis = CStepTypeCur.id;
                                 }
                                 else if (Confirm_Method == "RV")
                                 {
+                                    StepType_idHis = CStepTypeCur.id;
                                     CStepTypeNext = AllStepType.Where(p => p.id == StepType_id_Previous).FirstOrDefault();
                                     CStepTypeCur.id = CStepTypeNext.id; //回復與下一步 同ID
                                     Tsql = Tsql + CStepTypeNext.Map_Class + "_IsConfirm =" + IsConfirm + ",";
@@ -263,15 +266,17 @@ namespace WebAPI.Controllers
                                 else
                                 { 
                                    Tsql = Tsql + CStepTypeCur.Map_Class + "_IsConfirm =" + IsConfirm + ",";
+                                    StepType_idHis = CStepTypeCur.id;
                                 }
                                 Tsql = Tsql + " StepType_id = '" + CStepTypeNext.id + "',StepType_id_Previous = '" + CStepTypeCur.id +
                                     "',Description = '" + Reject_Description + "',update_user_id='" + Wade_User_ID + "',update_time='" + date0 + "' "
                                     + " output Inserted.id  into @TempTable where id =" + dr["Flowid"] + ";"
                                     ;
                             }
+
                             Tsql = Tsql + "select @FlowId=id from @TempTable;";
                             Tsql = Tsql + "insert into esn_todos_Flow_his  (Flow_id,ConfirmTime,FromType_id,ToType_id,ConfirmUserId,ConfirmUserClass,ConfirmMethod,Description,Create_User_id,Create_time) "
-                                + " values (@FlowId,'" + date0 + "','" + CStepTypeCur.id + "','" + CStepTypeNext.id + "','" + Wade_User_ID
+                                + " values (@FlowId,'" + date0 + "','" + StepType_idHis + "','" + CStepTypeNext.id + "','" + Wade_User_ID
                                 + "','" + CStepTypeCur.Map_Class + "','" + Confirm_Method + "','" + Reject_Description + "','" + Wade_User_ID + "','" + date0 + "'" + ") ;";
 
                         }