1、单位数据清理合并功能；

2、单位新增编辑功能调整，补充英文名称等； 3、建筑企业单位资质字典；
2025-09-02 10:48:28 +08:00
parent ce304ec7d9
commit 6ccc14a8be
54 changed files with 3964 additions and 2471 deletions
@@ -58,14 +58,14 @@ namespace FineUIPro.Web.ProjectData
        {
            if (!string.IsNullOrEmpty(this.ProjectId))
            {
-                string strSql = @"SELECT UnitId,UnitCode,UnitName,ProjectRange,Address,UnitType.UnitTypeName"
+                string strSql = @"SELECT UnitId,UnitCode,UnitName,ShortUnitName,ProjectRange,Address,UnitType.UnitTypeName"
                                + @" FROM Base_Unit AS Unit LEFT JOIN Base_UnitType AS UnitType ON Unit.UnitTypeId =UnitType.UnitTypeId"
                                + @" WHERE  UnitId NOT IN (SELECT UnitId FROM Project_ProjectUnit WHERE ProjectId =@ProjectId) ";
                List<SqlParameter> listStr = new List<SqlParameter>();
                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
                if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
                {
-                    strSql += " AND Unit.UnitName LIKE @UnitName";
+                    strSql += " AND (Unit.UnitName LIKE @UnitName or Unit.UnitCode LIKE @UnitName or Unit.ShortUnitName LIKE @UnitName)";
                    listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
                }