feat:FLOW_HIS 改為關聯 esn_category,跨月相關改寫

WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs

@@ -62,15 +62,15 @@ namespace WebAPI.Controllers
                         Esn_Todos_FlowModel hisT = new Esn_Todos_FlowModel();
                         SqlCommand cmd = new SqlCommand("", Conn)
                         {
-                            CommandText = @" select a.ConfirmTime
-                            ,Case When a.ConfirmUserClass='PG' Then '程序' When a.ConfirmUserClass='PE' Then '承辦人'  When a.ConfirmUserClass='Leader' Then '主管' else '其他' End as ConfirmUserClass
-                            ,Case When a.ConfirmMethod='CF' Then '確認' When a.ConfirmMethod='RJ' Then '退回'  When a.ConfirmMethod='RV' Then '撤回'  
-                            When a.ConfirmMethod='RJTOp' Then '轉運營辦'   When a.ConfirmMethod='CFTLd' Then '待轉運營辦'    When a.ConfirmMethod='SL' Then '結算'  else '其他' End  as ConfirmMethod
+                            CommandText = @" select a.ConfirmTime,Case When  isnull(e.Names,'')='' then '其他' else e.Names End as ConfirmUserClass
+                            ,Case When isnull(f.Names,'')='' then '其他' else f.Names end as ConfirmMethod
                             ,a.Create_time,d.cn_name as Create_User_Name,b.Step_Text as ""From"",c.Step_Text as ""To"",a.Description
                             from esn_Todos_flow_his a
                             left join esn_todos_Flow_StepType b on a.FromType_id = b.id
                             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
+                            left join esn_category e  on e.ParentId='Flow_Role'  and a.ConfirmUserClass = e.QryKey1 
+                            left join esn_category f  on f.ParentId='Flow_Method'  and a.ConfirmMethod = f.QryKey1 
                             where a.Flow_id = @Flow_id
                     "
                         };
@@ -275,6 +275,8 @@ namespace WebAPI.Controllers
                                 IsConfirm = 0; return_msg = "提交成功"; break;
                             case "RJTOp":
                                 IsConfirm = 0; return_msg = "已轉至運營辦"; break;
+                            case "CFAW":
+                                IsConfirm = 0; return_msg = "已轉至管理中心"; break;
                             case "LA":
                                 IsConfirm = 1; return_msg = "請求提成完成"; break;
                             case "LAL":
@@ -434,23 +436,12 @@ namespace WebAPI.Controllers
 
                                     #endregion
 
-                                    if (Confirm_Method == "CF" || Confirm_Method == "CFTLd")
-                                    {
-
-                                        CStepTypeNext = AllStepType.Where(p => p.id == CStepTypeCur.Step_Id_Next).FirstOrDefault();
-                                    }
-
                                     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(); 
                                         CStepTypeNext = AllStepType.Where(p => p.id == CStepTypeCur.Step_Id_previous).FirstOrDefault();
                                     }
                                     else if (Confirm_Method == "RV")
                                     {
-                                        //CStepTypeNext = AllStepType.Where(p => p.id == StepType_id_Previous).FirstOrDefault();
-                                        //CStepTypeCur.id = CStepTypeNext.id; //回復與下一步 同ID
-                                        //Tsql = Tsql + CStepTypeNext.Map_Class + "_IsConfirm =" + IsConfirm + ",";
                                         CStepTypeNext = AllStepType.Where(p => p.id == StepType_id_Previous).FirstOrDefault();
                                         #region 重置結算日期,是否已解算
 
@@ -470,7 +461,7 @@ namespace WebAPI.Controllers
                                         Reject_Description = "承辦人:" + JtSn["todos_Reject_Desc"].ToString() + "<br>主管:" + Reject_Description; //轉運營辦訊息改為與傳給SP同步
                                         CStepTypeNext = AllStepType.Where(p => p.id == CStepTypeCur.Step_Id_previous).FirstOrDefault();
                                     }
-                                    else
+                                    else //預設為往下一步動作
                                     {
                                         //Tsql = Tsql + CStepTypeCur.Map_Class + "_IsConfirm =" + IsConfirm + ",";
                                         CStepTypeNext = AllStepType.Where(p => p.id == CStepTypeCur.Step_Id_Next).FirstOrDefault();