数据上报调整

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

@@ -27,9 +27,7 @@ var bootstrap = function ($, learun) {
                             return m.Value = $('#' + id).val();
                         }
                     });
-
                     page.refreshRes();
-
                 });
         },
         initData: function () {

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

@@ -66,11 +66,11 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList',
                 headData: [
-                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" },
+                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "left" },
                     //{ label: "序号", name: "SerialNo", width: 100, align: "center" },
-                    { label: "项目名称", name: "ProjectName", width: 300, align: "center" },
+                    { label: "项目名称", name: "ProjectName", width: 300, align: "left" },
                     {
-                        label: "填报周期", name: "FillingCycle", width: 100, align: "center",
+                        label: "填报周期", name: "FillingCycle", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -94,7 +94,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报部门", name: "FillingDept", width: 100, align: "center",
+                        label: "填报部门", name: "FillingDept", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
@@ -107,7 +107,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报人", name: "FillingPeople", width: 150, align: "center",
+                        label: "填报人", name: "FillingPeople", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
@@ -133,7 +133,7 @@ var bootstrap = function ($, learun) {
                     //        }
                     //    }
                     //},
-                    { label: "备注", name: "Demo", width: 300, align: "center" },
+                    { label: "备注", name: "Demo", width: 300, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true

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

@@ -98,10 +98,10 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_Desktop/QualityReport/GetPageList',
                 headData: [
-                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" },
-                    { label: "项目名称", name: "ProjectName", width: 300, align: "center" },
+                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "left" },
+                    { label: "项目名称", name: "ProjectName", width: 300, align: "left" },
                     {
-                        label: "填报部门", name: "FillingDept", width: 100, align: "center",
+                        label: "填报部门", name: "FillingDept", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
@@ -114,16 +114,16 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报人", name: "CreateUserName", width: 150, align: "center"
+                        label: "填报人", name: "CreateUserName", width: 150, align: "left"
                     },
                     {
-                        label: "公式计算结果", name: "Result", width: 150, align: "center"
+                        label: "公式计算结果", name: "Result", width: 150, align: "left"
                     },
                     {
-                        label: "填报时间", name: "ReportTime", width: 150, align: "center"
+                        label: "填报时间", name: "ReportTime", width: 150, align: "left"
                     },
                     {
-                        label: "状态", name: "Status", width: 150, align: "center",
+                        label: "状态", name: "Status", width: 150, align: "left",
                         formatter: function (cellvalue) {
                             if (cellvalue === 0) {
                                 return '<span class=\"label label-warning\">草稿</span>';
@@ -140,8 +140,6 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.State = 3;
-            //param.FillingPeople = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1624438664" Name="Physical Data Model 1" Objects="3402" Symbols="397" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1624526823" Name="Physical Data Model 1" Objects="3399" Symbols="397" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12310,9 +12310,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o654">
 <a:CreationDate>1624437837</a:CreationDate>
-<a:ModificationDate>1624438664</a:ModificationDate>
+<a:ModificationDate>1624526823</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-132599,41678), (-113701,52763))</a:Rect>
+<a:Rect>((-132599,45060), (-113701,52763))</a:Rect>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
@@ -49833,7 +49833,7 @@ B9AF
 <a:Code>QualityReportMain</a:Code>
 <a:CreationDate>1585293428</a:CreationDate>
 <a:Creator>edy</a:Creator>
-<a:ModificationDate>1624437754</a:ModificationDate>
+<a:ModificationDate>1624526773</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <a:Comment>上报主表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -49885,6 +49885,30 @@ B9AF
 <a:DataType>int</a:DataType>
 </o:Column>
 <o:Column Id="o3334">
+<a:ObjectID>E39C5E7B-D32A-41BF-95E5-D7DE6CE78EAB</a:ObjectID>
+<a:Name>Formula</a:Name>
+<a:Code>Formula</a:Code>
+<a:CreationDate>1585293515</a:CreationDate>
+<a:Creator>edy</a:Creator>
+<a:ModificationDate>1624526792</a:ModificationDate>
+<a:Modifier>edy</a:Modifier>
+<a:Comment>公式</a:Comment>
+<a:DataType>nvarchar(200)</a:DataType>
+<a:Length>200</a:Length>
+</o:Column>
+<o:Column Id="o3335">
+<a:ObjectID>FF7099A9-491E-4607-895A-00B6D27074F8</a:ObjectID>
+<a:Name>Result</a:Name>
+<a:Code>Result</a:Code>
+<a:CreationDate>1585293515</a:CreationDate>
+<a:Creator>edy</a:Creator>
+<a:ModificationDate>1624526773</a:ModificationDate>
+<a:Modifier>edy</a:Modifier>
+<a:Comment>公式运算结果</a:Comment>
+<a:DataType>nvarchar(500)</a:DataType>
+<a:Length>500</a:Length>
+</o:Column>
+<o:Column Id="o3336">
 <a:ObjectID>36BBDC31-1D43-4181-BCE2-2D4DA1940C51</a:ObjectID>
 <a:Name>CreateTime</a:Name>
 <a:Code>CreateTime</a:Code>
@@ -49895,7 +49919,7 @@ B9AF
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o3335">
+<o:Column Id="o3337">
 <a:ObjectID>9E220DE0-C5D3-402B-B7F2-56CF1A5C0409</a:ObjectID>
 <a:Name>CreateUserId</a:Name>
 <a:Code>CreateUserId</a:Code>
@@ -49907,7 +49931,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3336">
+<o:Column Id="o3338">
 <a:ObjectID>CECF27C1-8084-4698-8883-BF321FB306AB</a:ObjectID>
 <a:Name>CreateUserName</a:Name>
 <a:Code>CreateUserName</a:Code>
@@ -49921,7 +49945,7 @@ B9AF
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3337">
+<o:Key Id="o3339">
 <a:ObjectID>4B012638-F18E-4F4B-8898-40CD8987FFEC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -49935,10 +49959,10 @@ B9AF
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3337"/>
+<o:Key Ref="o3339"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3337"/>
+<o:Key Ref="o3339"/>
 </c:ClusterObject>
 </o:Table>
 <o:Table Id="o655">
@@ -49947,12 +49971,12 @@ B9AF
 <a:Code>QualityReportChild</a:Code>
 <a:CreationDate>1585293428</a:CreationDate>
 <a:Creator>edy</a:Creator>
-<a:ModificationDate>1624438216</a:ModificationDate>
+<a:ModificationDate>1624521823</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <a:Comment>上报子表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o3338">
+<o:Column Id="o3340">
 <a:ObjectID>E12D9C6C-7A72-4032-844B-4A4FA76AA28F</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -49964,7 +49988,7 @@ B9AF
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o3339">
+<o:Column Id="o3341">
 <a:ObjectID>F4BBFC0A-78D1-444C-91CC-4EDE1BFC8610</a:ObjectID>
 <a:Name>MainId</a:Name>
 <a:Code>MainId</a:Code>
@@ -49976,7 +50000,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3340">
+<o:Column Id="o3342">
 <a:ObjectID>5BE6DE5E-EBA8-4F0A-B26B-FCE44B3EDFCA</a:ObjectID>
 <a:Name>ProjectId</a:Name>
 <a:Code>ProjectId</a:Code>
@@ -49988,7 +50012,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3341">
+<o:Column Id="o3343">
 <a:ObjectID>A747E78F-224D-4857-A689-C2FB1C0D595F</a:ObjectID>
 <a:Name>Value</a:Name>
 <a:Code>Value</a:Code>
@@ -50000,44 +50024,9 @@ B9AF
 <a:DataType>nvarchar(500)</a:DataType>
 <a:Length>500</a:Length>
 </o:Column>
-<o:Column Id="o3342">
-<a:ObjectID>FCAA6753-062E-4D3D-BF23-D4830D66422B</a:ObjectID>
-<a:Name>CreateTime</a:Name>
-<a:Code>CreateTime</a:Code>
-<a:CreationDate>1585295304</a:CreationDate>
-<a:Creator>edy</a:Creator>
-<a:ModificationDate>1624437837</a:ModificationDate>
-<a:Modifier>edy</a:Modifier>
-<a:Comment>创建时间</a:Comment>
-<a:DataType>datetime</a:DataType>
-</o:Column>
-<o:Column Id="o3343">
-<a:ObjectID>0145F75C-F629-4A2E-BACC-A0ABAF85141A</a:ObjectID>
-<a:Name>CreateUserId</a:Name>
-<a:Code>CreateUserId</a:Code>
-<a:CreationDate>1624325491</a:CreationDate>
-<a:Creator>edy</a:Creator>
-<a:ModificationDate>1624437837</a:ModificationDate>
-<a:Modifier>edy</a:Modifier>
-<a:Comment>创建人</a:Comment>
-<a:DataType>nvarchar(50)</a:DataType>
-<a:Length>50</a:Length>
-</o:Column>
-<o:Column Id="o3344">
-<a:ObjectID>E25348BE-B6C0-4FE9-8ED3-C4F05084EF90</a:ObjectID>
-<a:Name>CreateUserName</a:Name>
-<a:Code>CreateUserName</a:Code>
-<a:CreationDate>1624325491</a:CreationDate>
-<a:Creator>edy</a:Creator>
-<a:ModificationDate>1624437837</a:ModificationDate>
-<a:Modifier>edy</a:Modifier>
-<a:Comment>创建人</a:Comment>
-<a:DataType>nvarchar(50)</a:DataType>
-<a:Length>50</a:Length>
-</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3345">
+<o:Key Id="o3344">
 <a:ObjectID>9327A4E6-3127-4744-810A-85F9F8FA2B1E</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -50046,15 +50035,15 @@ B9AF
 <a:ModificationDate>1624437837</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o3338"/>
+<o:Column Ref="o3340"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3345"/>
+<o:Key Ref="o3344"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3345"/>
+<o:Key Ref="o3344"/>
 </c:ClusterObject>
 </o:Table>
 </c:Tables>
@@ -50079,7 +50068,7 @@ B9AF
 <o:Key Ref="o697"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3346">
+<o:ReferenceJoin Id="o3345">
 <a:ObjectID>14D78C43-17A2-48F0-83B4-3DF757D5ABE8</a:ObjectID>
 <a:CreationDate>1552635393</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50114,7 +50103,7 @@ B9AF
 <o:Key Ref="o793"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3347">
+<o:ReferenceJoin Id="o3346">
 <a:ObjectID>FEAECB7B-8E2A-4492-A530-B0062E1511B8</a:ObjectID>
 <a:CreationDate>1552635777</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50149,7 +50138,7 @@ B9AF
 <o:Key Ref="o821"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3348">
+<o:ReferenceJoin Id="o3347">
 <a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
 <a:CreationDate>1553245426</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50184,7 +50173,7 @@ B9AF
 <o:Key Ref="o832"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3349">
+<o:ReferenceJoin Id="o3348">
 <a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
 <a:CreationDate>1553247802</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50218,7 +50207,7 @@ B9AF
 <o:Key Ref="o729"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3350">
+<o:ReferenceJoin Id="o3349">
 <a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
 <a:CreationDate>1553248376</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50253,7 +50242,7 @@ B9AF
 <o:Key Ref="o810"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3351">
+<o:ReferenceJoin Id="o3350">
 <a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
 <a:CreationDate>1553248622</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50287,7 +50276,7 @@ B9AF
 <o:Key Ref="o870"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3352">
+<o:ReferenceJoin Id="o3351">
 <a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
 <a:CreationDate>1553483161</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50321,7 +50310,7 @@ B9AF
 <o:Key Ref="o903"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3353">
+<o:ReferenceJoin Id="o3352">
 <a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
 <a:CreationDate>1555404296</a:CreationDate>
 <a:Creator>admin</a:Creator>
@@ -50338,7 +50327,7 @@ B9AF
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o3354">
+<o:Group Id="o3353">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -50601,7 +50590,7 @@ B9AF
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o3355">
+<o:TargetModel Id="o3354">
 <a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
 <a:Name>Microsoft SQL Server 2008</a:Name>
 <a:Code>MSSQLSRV2008</a:Code>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs

@@ -9,22 +9,22 @@ using System.Text;
 namespace Learun.Application.TwoDevelopment.LR_Desktop
 {
     /// <summary> 
-        /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
-        /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
-        /// 创 建：超级管理员 
-        /// 日 期：2021-06-23 17:12 
-        /// 描 述：上报主表
-        /// </summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-06-23 17:12 
+    /// 描 述：上报主表
+    /// </summary> 
     public class QualityReportMainService : RepositoryFactory
     {
         #region 获取数据 
 
         /// <summary> 
-                /// 获取页面显示列表数据 
-                /// </summary> 
-                /// <param name="pagination">查询参数</param> 
-                /// <param name="queryJson">查询参数</param> 
-                /// <returns></returns> 
+        /// 获取页面显示列表数据 
+        /// </summary> 
+        /// <param name="pagination">查询参数</param> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
         public IEnumerable<QualityReportMainEntity> GetPageList(Pagination pagination, string queryJson)
         {
             try
@@ -53,10 +53,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         }
 
         /// <summary> 
-                /// 获取QualityReportMain表实体数据 
-                /// </summary> 
-                /// <param name="keyValue">主键</param> 
-                /// <returns></returns> 
+        /// 获取QualityReportMain表实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <returns></returns> 
         public QualityReportMainEntity GetQualityReportMainEntity(string keyValue)
         {
             try
@@ -81,9 +81,9 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         #region 提交数据 
 
         /// <summary> 
-                /// 删除实体数据 
-                /// </summary> 
-                /// <param name="keyValue">主键</param> 
+        /// 删除实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
         public void DeleteEntity(string keyValue)
         {
             try
@@ -104,10 +104,10 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         }
 
         /// <summary> 
-                /// 保存实体数据（新增、修改） 
-                /// </summary> 
-                /// <param name="keyValue">主键</param> 
-                /// <param name="entity">实体</param> 
+        /// 保存实体数据（新增、修改） 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <param name="entity">实体</param> 
         public void SaveEntity(string keyValue, QualityReportMainEntity entity)
         {
             try