Commit 6bf1fc87 authored by solho's avatar solho

撤回fixed

parent 1ecb7332
......@@ -170,8 +170,8 @@ namespace WebAPI.Controllers
#region 取得該員身分
cmd.CommandText = @"select * from evw_Employee a
where a.user_id= @user_id  and a.is_enabled=1 and isnull(Emp_LeaveDate,'')=''";
//cmd.Parameters.AddWithValue("@user_id", obj_input["Wade_User_ID"].ToString());
cmd.Parameters.AddWithValue("@user_id", "FD67D192-041B-4725-A3E1-CB5E62A5CC61");//test
cmd.Parameters.AddWithValue("@user_id", obj_input["Wade_User_ID"].ToString());
//cmd.Parameters.AddWithValue("@user_id", "FD67D192-041B-4725-A3E1-CB5E62A5CC61");//test
ds = SqlToDs(cmd);
......@@ -182,8 +182,7 @@ namespace WebAPI.Controllers
if (dr["is_dept_manager"].ToString() == "1") Confirm_Class.Add("Leader");
}
#endregion
//Confirm_Class.Add("PG"); Confirm_Class.Add("Leader"); //test
#region 取得FLOW相關
cmd.CommandText = @"select et.*,etf.id AS Flowid,etf.*,
etfs.* FROM esn_todos et
......@@ -208,8 +207,8 @@ namespace WebAPI.Controllers
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 = "";
JToken JtSn = obj_input.SelectToken("$.Sns[?(@.todos_sn == '888302')]");
List<String> sql = new List<string>();
JToken JtSn;
//List<String> sql = new List<string>();
int StepType_id_Previous, StepType_id;
foreach (DataRow dr in ds.Tables[0].Rows)
{
......@@ -258,6 +257,7 @@ namespace WebAPI.Controllers
else if (Confirm_Method == "RV")
{
CStepTypeNext = AllStepType.Where(p => p.id == StepType_id_Previous).FirstOrDefault();
CStepTypeCur.id = CStepTypeNext.id; //回復與下一步 同ID
}
Tsql = Tsql + CStepTypeCur.Map_Class + "_IsConfirm =" + IsConfirm + ",";
Tsql = Tsql + " StepType_id = '" + CStepTypeNext.id + "',StepType_id_Previous = '" + CStepTypeCur.id +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment