lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2025-04-01 11:15:18 +08:00
parent 36513a17e1 0a71c7d118
commit 1d8c520e3c
88 changed files with 5403 additions and 1854 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+4 -2
View File
@@ -91,7 +91,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1' ";
where Project.ProjectState ='1'
)f WHERE 1=1 ";
#region 总数
var strSqlSum = @"select Count(*)as allCount from(
@@ -129,7 +130,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1'" ;
WHERE Project.ProjectState ='1'
)f WHERE 1=1 " ;
#endregion
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
+2 -2
View File
@@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString());
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "1");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CreateDate >= datetime1);
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0");
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0" && x.State != "1");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CreateDate >= datetime1);
SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx
+1 -1
View File
@@ -53,7 +53,7 @@
<asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="State" DataField="State" SortField="State"
<f:RenderField Width="90px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = "";
string strSql = "and state <> '1'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));