成检时责任人增加根据打卡的工种判断

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -476,25 +476,54 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 //DataSet ds2 = con.GetSqlResultToDs(sqlString, paras);
                 //ds2.Tables[0].TableName = "TDataDictionary";
 
-                sqlString = "select procedureid,jobsid from TP_PC_DefectProcedureJobs where TP_PC_DefectProcedureJobs.Defectid=:Defectid";
+                string classessettingids = "";
 
-                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
-                           {
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                {
+                    classessettingids = classessettingids + ds.Tables[0].Rows[i]["classessettingid"] + ",";
+
+                }
+                if (classessettingids.Length > 0)
+                {
+                    classessettingids = classessettingids.Substring(0, classessettingids.Length - 1);
+
+
+                    sqlString = "select j.procedureid,j.jobsid from TP_PC_DefectProcedureJobs j where j.Defectid=:Defectid " +
+                    " and exists (SELECT * FROM tp_pc_classesdetail c where c.classessettingid IN(" + classessettingids + ") and c.ujobsid = j.jobsid ) ";
+                    //sqlString = "select j.procedureid,j.jobsid from TP_PC_DefectProcedureJobs j where j.Defectid=:Defectid ";
+
+                    paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+                               {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":Defectid",defectid),
-                            };
-                DataSet ds3 = con.GetSqlResultToDs(sqlString, paras);
-                ds3.Tables[0].TableName = "TP_PC_DefectProcedureJobs";
-                if (!dsReturn.Tables.Contains("TProcedure"))
+                                };
+                    DataSet ds3 = con.GetSqlResultToDs(sqlString, paras);
+                    ds3.Tables[0].TableName = "TP_PC_DefectProcedureJobs";
+
+                    if (!dsReturn.Tables.Contains("TP_PC_DefectProcedureJobs"))
+                    {
+                        dsReturn.Tables.Add(ds3.Tables[0].Copy());
+                    }
+                }
+                else
                 {
-                    dsReturn.Tables.Add(ds.Tables[0].Copy());
+                    sqlString = "select j.procedureid,j.jobsid from TP_PC_DefectProcedureJobs j where j.Defectid=:Defectid ";
+
+                    paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
+                               {
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":Defectid",defectid),
+                                };
+                    DataSet ds3 = con.GetSqlResultToDs(sqlString, paras);
+                    ds3.Tables[0].TableName = "TP_PC_DefectProcedureJobs";
+
+                    if (!dsReturn.Tables.Contains("TP_PC_DefectProcedureJobs"))
+                    {
+                        dsReturn.Tables.Add(ds3.Tables[0].Copy());
+                    }
                 }
-                //if (!dsReturn.Tables.Contains("TDataDictionary"))
-                //{
-                //    dsReturn.Tables.Add(ds2.Tables[0].Copy());
-                //}
-                if (!dsReturn.Tables.Contains("TP_PC_DefectProcedureJobs"))
+
+                if (!dsReturn.Tables.Contains("TProcedure"))
                 {
-                    dsReturn.Tables.Add(ds3.Tables[0].Copy());
+                    dsReturn.Tables.Add(ds.Tables[0].Copy());
                 }
                 return dsReturn;
             }