Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js

@@ -193,7 +193,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = ' AND (FillingPeople is not null and len(FillingPeople)>0) and (Formula is not null and len(Formula)>0) and IsFlag=0 and [State]<>-1';
+            param.SqlParameter = ' AND (FillingPeople is not null and len(FillingPeople)>0) and (Formula is not null and len(Formula)>0) and IsFlag=0 and [State]=2';
             param.FillingPeople = learun.clientdata.get(['userinfo']).userId;
 
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js

@@ -159,7 +159,7 @@ var bootstrap = function ($, learun) {
                             if (cellvalue === 0) {
                                 return '<span class=\"label label-warning\">草稿</span>';
                             } else if (cellvalue === 1) {
-                                return '<span class=\"label label-success\">完成</span>';
+                                return '<span class=\"label label-success\">已提交</span>';
                             } else if (cellvalue === 99) {
                                 return '<span class=\"label label-default\">作废</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs

@@ -222,7 +222,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(x => x.IsFlag == 0 && x.State != -1);
+                return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(x => x.IsFlag == 0 && x.State == 2);
             }
             catch (Exception ex)
             {