提交所有文件

2026-09-19 14:12:58 +08:00
parent 20e88479b1
commit 7b922290bb
62 changed files with 11832 additions and 131 deletions
@@ -132,6 +132,7 @@ namespace GThinking.N_XLXSBJ
        #region 自定义函数
        private string GetSql()
        {
+            base.InitEntityByCondition();
            string[] sYFJZQHs = txtYFJZQHList.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
            StringBuilder strSQL = new StringBuilder();
            strSQL.AppendLine(" select A.XZQH_XZQHID as XLXSBJDQYFB_XZQHID,");
@@ -155,6 +156,19 @@ namespace GThinking.N_XLXSBJ
            {
                strSQL.AppendLine("  where 1<>1");
            }
+            string sSF = CurQueryEntity.FieldByName("SF").Value.Trim();
+            if (!string.IsNullOrEmpty(sSF))
+            {
+                strSQL.AppendLine(string.Format("  and XZQH_PROVINCE like '%{0}%' ",sSF));
+            }
+
+            string sCS = CurQueryEntity.FieldByName("CS").Value.Trim();
+            if (!string.IsNullOrEmpty(sCS))
+            {
+                strSQL.AppendLine(string.Format("  and XZQH_CITY like '%{0}%' ", sCS));
+            }
+
+
            strSQL.AppendLine("  group by A.XZQH_XZQHID, A.XZQH_PROVINCE, A.XZQH_CITY");
            strSQL.AppendLine("  order by A.XZQH_PROVINCE, A.XZQH_CITY");
            return strSQL.ToString();