From 823a0a7641d30642bf4c2a336c3995665de6538a Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 8 Mar 2023 09:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D-=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E5=88=97?= =?UTF-8?q?=E8=A1=A8,=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PsychologyInfo/PsychologyInfoService.cs | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoService.cs index bdb7378d6..2049d65ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoService.cs @@ -66,12 +66,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - var db = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); - strSql.Append(" SELECT t.*,l.F_RealName,p.ReplyContent,p.Url as Urls,p.ReplyUser,p.ReplyTime,s.StuName,s.deptNo,s.majorno,s.classno,s.GenderNo,s.IdentityCardNo,s.IsSingle FROM PsychologyInfo t "); + strSql.Append(" SELECT t.*,p.ReplyContent,p.Url as Urls,p.ReplyUser,p.ReplyTime FROM PsychologyInfo t "); strSql.Append(" left join PsychologyReplyInfo p on p.PsychologyInfoid = t.id AND p.State = t.State "); - strSql.Append(" left join StuInfoBasic s on s.StuNo = t.StuNo "); - strSql.Append($" left join {db}.dbo.LR_Base_User l on l.F_account =p.ReplyUser "); strSql.Append(" where 1=1 "); var queryParam = queryJson.ToJObject(); var dp = new DynamicParameters(new { }); @@ -80,49 +77,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); strSql.Append(" AND t.StuNo = @StuNo "); } - if (!queryParam["StuName"].IsEmpty()) - { - dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); - strSql.Append(" AND s.StuName = @StuName "); - } - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND s.DeptNo = @DeptNo "); - } - if (!queryParam["MajorNo"].IsEmpty()) - { - dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); - strSql.Append(" AND s.MajorNo = @MajorNo "); - } - if (!queryParam["ClassNo"].IsEmpty()) - { - dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); - strSql.Append(" AND s.ClassNo = @ClassNo "); - } - if (!queryParam["IdentityCardNo"].IsEmpty()) - { - dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String); - strSql.Append(" AND t.IdentityCardNo like @IdentityCardNo "); - } - if (!queryParam["ReplyContent"].IsEmpty()) - { - dp.Add("ReplyContent", "%" + queryParam["ReplyContent"].ToString() + "%", DbType.String); - strSql.Append(" AND t.ReplyContent like @ReplyContent "); - } - if (!queryParam["RealName"].IsEmpty()) - { - dp.Add("RealName", "%" + queryParam["RealName"].ToString() + "%", DbType.String); - strSql.Append(" AND l.F_RealName like @RealName "); - } if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) { dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) "); } - - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)