提交说明10/9

This commit is contained in:
2026-10-09 10:30:49 +08:00
parent f216ceb835
commit 0c0e9750e2
39 changed files with 3733 additions and 258 deletions
+22
View File
@@ -49,6 +49,7 @@ namespace GThinking.N_XLXSBJ
else
CurQueryEntity.FieldByName("JGBID").Value = GetDefaultJGBID();
CurQueryEntity.FieldByName("YZZWSZ").Value = "False";
CurQueryEntity.FieldByName("YZZYSZ").Value = "False";
CurQueryEntity.FieldByName("RDT").Value = "False";
CurQueryEntity.FieldByName("XLXHIDJQPP").Value = "True";
if (!PageParam.GetRTrimString("YCLQDCXWSZ").Equals(""))
@@ -415,6 +416,23 @@ namespace GThinking.N_XLXSBJ
}
}
if (CurQueryEntity.FieldByName("YZZYSZ").Value.Trim().ToUpper().Equals("TRUE"))
{
if (dsTJYS1.Tables[0].Rows.Count > 0)
{
sSQL.AppendLine(" and (");
for (int i = 0; i < dsTJYS1.Tables[0].Rows.Count; i++)
{
if (i == 0)
sSQL.AppendLine(string.Format(" (YZZA.XLXSBJDYZZA_YZID='{0}' and YZZA.XLXSBJDYZZA_YZZ<>0) ", dsTJYS1.Tables[0].Rows[i][0].ToString().Trim()));
else
sSQL.AppendLine(string.Format(" or (YZZA.XLXSBJDYZZA_YZID='{0}' and YZZA.XLXSBJDYZZA_YZZ<>0) ", dsTJYS1.Tables[0].Rows[i][0].ToString().Trim()));
}
sSQL.AppendLine(" )");
}
}
sSQL.AppendLine(" group by YZZA.XLXSBJDYZZA_XLXHID, YZZA.XLXSBJDYZZA_XLGGID, YZZA.XLXSBJDYZZA_XLBZID,YZZA.XLXSBJDYZZA_DYDJID,XLXSBJDYZZA_TJDH,AA.XLXSBJTJXHML_CPMLID,BB.XLXSBJTJXHML_CPMLID ");
if (CurQueryEntity.FieldByName("YCLQDCXWSZ").Value.Trim().ToUpper().Equals("TRUE"))
sSQL.AppendLine(" ,YZZA.XLXSCLQD_XH ");
@@ -1130,6 +1148,10 @@ namespace GThinking.N_XLXSBJ
{
sSQL.Add(string.Format(" and (XLXSBJDYZZA_YZID='{0}' and XLXSBJDYZZA_YZZ=0) ", sYZValue[k].Split('|')[0].Trim()));
}
if (CurQueryEntity.FieldByName("YZZYSZ").Value.Trim().ToUpper().Equals("TRUE"))
{
sSQL.Add(string.Format(" and (XLXSBJDYZZA_YZID='{0}' and XLXSBJDYZZA_YZZ<>0) ", sYZValue[k].Split('|')[0].Trim()));
}
if (!CurQueryEntity.FieldByName("CPMLID").Value.Equals(""))
{
if (CurQueryEntity.FieldByName("CPMLID").Value.Equals("空"))