duhe
2024-09-02 634c9e4a9e16077795233cf460c949e396b943ec
钉钉数据同步:宜搭单据 同步 实例状态、审批结果
5个文件已修改
177 ■■■■■ 已修改文件
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -100,6 +100,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题
            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果
            //单据内容
            public string HDate;                                //日期
@@ -124,6 +126,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题
            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果
            //单据内容
            public string HDate;                                //日期
@@ -155,6 +159,7 @@
            public string HTitle;                               //单据标题
            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果
            //单据内容
            public string HEmployeeID;                          //成员ID
@@ -192,6 +197,8 @@
            public string HOriginator;                          //发起人
            public string HTitle;                               //单据标题
            public string HInstanceStatus;                      //实例状态
            public string HApprovedResult;                      //审批结果
            //单据内容
            public string HQuestionType;                        //问题分类
@@ -398,7 +405,7 @@
                //OriginatorId = "12",                                                                                          //根据流程发起人工号查询。
                //TaskId = "12",                                                                                                //任务ID。
                CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //创建时间终止值。
                PageSize = pageSize,                                                  //分页大小。
@@ -699,6 +706,49 @@
                                oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
                            }
                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }
                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }
                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }
                            lsmain.Add(oItem);
                        }catch(Exception e)
                        {
@@ -755,7 +805,7 @@
            try
            {
                oCN.BeginTran();
              oCN.BeginTran();
                foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
                {
                    string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
@@ -769,7 +819,8 @@
                    string sql_main = "insert into DD_FenCengShenHeQianDaoBiao" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
                        ",HDate" +
                        ",HCheckLevel,HArea,HEmployeeID,HEmplpyee) " +
                        ",HCheckLevel,HArea,HEmployeeID,HEmplpyee" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -785,6 +836,8 @@
                        ",'" + (oItem.HArea==null?"": oItem.HArea) + "'" +
                        ",'" + (oItem.HEmployeeID==null?"": oItem.HEmployeeID) + "'" +
                        ",'" + (oItem.HEmplpyee==null?"": oItem.HEmplpyee) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";
                    oCN.RunProc(sql_main);
@@ -895,7 +948,50 @@
                            {
                                oItem.HRiskRemak_Result = response.Body.Result[i].FormData["textareaField_lxblb9xa"].ToString().Replace("'", "");
                            }
                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }
                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }
                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }
                            lsmain.Add(oItem);
                        }catch(Exception e)
                        {
@@ -961,7 +1057,8 @@
                    string sql_main = "insert into DD_XianChangBianHuaDianPingShenDan" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
                        ",HDate" +
                        ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result) " +
                        ",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -983,6 +1080,8 @@
                        ",'" + (oItem.HRiskRemark_Equipment==null?"": oItem.HRiskRemark_Equipment) + "'" +
                        ",'" + (oItem.HRiskRemark_Product==null?"": oItem.HRiskRemark_Product) + "'" +
                        ",'" + (oItem.HRiskRemak_Result==null?"": oItem.HRiskRemak_Result) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";
                    oCN.RunProc(sql_main);
@@ -1148,6 +1247,19 @@
                                oItem.HInstanceStatus = "异常";
                            }
                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult== "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }else if(oItem.HApprovedResult== "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }
                            lsmain.Add(oItem);
                        }
                        catch (Exception e)
@@ -1217,7 +1329,7 @@
                        ",HCheckLevel,HCheckArea,HPhoto_NoSatisfyRequire,HDescription_NoSatisfyRequire,HQuestionType,HRequire_ModifyDate,HEmployeeID_Duty,HEmployee_Duty" +
                        ",HQuestionIsNoModify" +
                        ",HReason_NoModify,HReasonAnalysis,HMethod_Modify" +
                        ",HDate_Achieve,HFile_Evidence,HCloseConfirm,HInstanceStatus" +
                        ",HDate_Achieve,HFile_Evidence,HCloseConfirm,HInstanceStatus,HApprovedResult" +
                        ") " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
@@ -1248,6 +1360,7 @@
                        ",'" + (oItem.HFile_Evidence==null?"": oItem.HFile_Evidence) + "'" +
                        ",'" + (oItem.HCloseConfirm==null?"": oItem.HCloseConfirm) + "'" +
                        ",'" + (oItem.HInstanceStatus==null?"":oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult==null?"":oItem.HApprovedResult) + "'" +
                        ")";
                    oCN.RunProc(sql_main);
@@ -1323,7 +1436,46 @@
                                oItem.HDept_Duty = response.Body.Result[i].FormData["selectField_lxcunmsu"].ToString().Replace("'", "");
                            }
                            //获取实例状态
                            GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
                            if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
                            {
                                return false;
                            }
                            oItem.HInstanceStatus = response1.Body.InstanceStatus;
                            if (oItem.HInstanceStatus == "RUNNING")
                            {
                                oItem.HInstanceStatus = "运行中";
                            }
                            else if (oItem.HInstanceStatus == "TERMINATED")
                            {
                                oItem.HInstanceStatus = "已终止";
                            }
                            else if (oItem.HInstanceStatus == "COMPLETED")
                            {
                                oItem.HInstanceStatus = "已完成";
                            }
                            else if (oItem.HInstanceStatus == "ERROR")
                            {
                                oItem.HInstanceStatus = "异常";
                            }
                            oItem.HApprovedResult = response1.Body.ApprovedResult;
                            if (oItem.HApprovedResult == "agree")
                            {
                                oItem.HApprovedResult = "同意";
                            }
                            else if (oItem.HApprovedResult == "disagree")
                            {
                                oItem.HApprovedResult = "拒绝";
                            }
                            else
                            {
                                oItem.HApprovedResult = "";
                            }
                            List<YD_QRQCWenTiTiJiaoBiaoSub1> sub1List = new List<YD_QRQCWenTiTiJiaoBiaoSub1>();
                            if (keys_main.Contains("tableField_lx4azand"))
@@ -1466,6 +1618,12 @@
                oCN.BeginTran();
                foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
                {
                    ////判断单据 å®žä¾‹çŠ¶æ€æ˜¯å¦ä¸º"已完成"且 å®¡æ‰¹ç»“果为"同意",若是则同步数据,否则不进行同步数据
                    //if (!(oItem.HInstanceStatus == "已完成" && oItem.HApprovedResult == "同意"))
                    //{
                    //    continue;
                    //}
                    string sql_searchRepeat = "select * from DD_QRQCWenTiTiJiaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
                    DataSet ds_searchRepeat = oCN.RunProcReturn(sql_searchRepeat, "DD_QRQCWenTiTiJiaoBiao");
                    if (ds_searchRepeat != null && ds_searchRepeat.Tables[0].Rows.Count > 0)
@@ -1481,7 +1639,8 @@
                    }
                    string sql_main = "insert into DD_QRQCWenTiTiJiaoBiao" +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty) " +
                        "(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty" +
                        ",HInstanceStatus,HApprovedResult) " +
                        "values(" +
                        "'" + oItem.HMakerID + "'" +
                        ",'" + oItem.HMakeDate + "'" +
@@ -1494,6 +1653,8 @@
                        ",'" + (oItem.HQuestionType==null?"": oItem.HQuestionType) + "'" +
                        ",'" + (oItem.HDept_Duty==null?"": oItem.HDept_Duty) + "'" +
                        ",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
                        ",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
                        ")";
                    oCN.RunProc(sql_main);
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ