Browse Source

修复资产、录入成绩定制化需求

北屯中职分支
liangkun 1 year ago
parent
commit
1c560c4416
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs View File

@@ -379,13 +379,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
/// 月折旧率
/// </summary>
[Column("MONTHLYDEPRECIATIONRATE")]
public string MonthlyDepreciationRate { get; set; }
public decimal? MonthlyDepreciationRate { get; set; }

/// <summary>
/// 净值
/// </summary>
[Column("NETWORTH")]
public string NetWorth { get; set; }
public decimal? NetWorth { get; set; }

/// <summary>
/// 车辆行驶证所有人


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs View File

@@ -489,7 +489,7 @@ order by bb.ScoreId";
var strSql = new StringBuilder();
strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from StuScoreNotPass s ");
strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId ");
strSql.Append(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' ");
strSql.Append(" where s.LessonSortNo='1' ");
if (userType == "教师")
{
strSql.Append(" and s.EmpNo='" + userAccount + "' ");


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs View File

@@ -465,7 +465,7 @@ order by bb.ScoreId";
var strSql = new StringBuilder();
strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from StuScoreNotPassTwo s ");
strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId ");
strSql.Append(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' ");
strSql.Append(" where s.LessonSortNo='1' ");
if (userType == "教师")
{
strSql.Append(" and s.EmpNo='" + userAccount + "' ");


Loading…
Cancel
Save