Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs

@@ -11,6 +11,8 @@ using Stimulsoft.Base.Drawing;
 using Stimulsoft.Report;
 using Stimulsoft.Report.Dialogs;
 using Stimulsoft.Report.Components;
+using Stimulsoft.Report.Engine;
+using Stimulsoft.Report.Export;
 using Stimulsoft.Report.Mvc;
 
 namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
@@ -57,13 +59,23 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
             StiReport report = new StiReport();
             report.Load(Server.MapPath("~/Areas/LogisticsManagement/Views/ADR_Record/Report.mrt"));
-            //report.
+            
             var data = aDR_RecordIBLL.GetList("{}");
             report.RegData(Util.DataBase.DataConvert.ToDataTable(data));
+            report.Compile();
+            report["MondayDate"] = "9月14日";
+            report["Monday"] = "星期一";
+            report.Render();
+            ////Variant 1
+            //StiPdfExportService pdfExport = new StiPdfExportService();
+            //pdfExport.ExportPdf(report, "document.pdf");
+            ////Variant 2
+            //report.ExportDocument(StiExportFormat.Pdf, "document.pdf");
             return StiMvcViewer.GetReportResult(report);
         }
         public ActionResult ViewerReport()
         {
+            //return StiMvcViewer.GetScriptsResult();
             return StiMvcViewer.ViewerEventResult();
 
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Report.mrt

@@ -24,8 +24,9 @@
     <Relations isList="true" count="0" />
     <Report isRef="0" />
     <Resources isList="true" count="0" />
-    <Variables isList="true" count="1">
-      <value>,Monday,Monday,Monday,System.String,,True,False,False,False</value>
+    <Variables isList="true" count="2">
+      <value>,Monday,Monday,Monday,System.String,,False,False,False,False</value>
+      <value>,MondayDate,MondayDate,MondayDate,System.String,,False,False,False,False</value>
     </Variables>
   </Dictionary>
   <EngineVersion>EngineV2</EngineVersion>
@@ -36,98 +37,141 @@
     <Page1 Ref="3" type="Page" isKey="true">
       <Border>None;Black;2;Solid;False;4;Black</Border>
       <Brush>Transparent</Brush>
-      <Components isList="true" count="10">
+      <Components isList="true" count="11">
         <PageHeaderBand1 Ref="4" type="PageHeaderBand" isKey="true">
           <Border>All;Black;1;Solid;False;4;Black</Border>
           <Brush>Transparent</Brush>
           <ClientRectangle>0,0.4,19,2</ClientRectangle>
-          <Components isList="true" count="23">
-            <Shape3 Ref="5" type="Shape" isKey="true">
-              <BorderColor>Black</BorderColor>
+          <Components isList="true" count="19">
+            <Image1 Ref="5" type="Image" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>2.8,0,2.2,2</ClientRectangle>
+              <ClientRectangle>0.01,0.01,5,2</ClientRectangle>
               <Conditions isList="true" count="0" />
-              <Name>Shape3</Name>
-              <Page isRef="3" />
-              <Parent isRef="4" />
-              <ShapeType Ref="6" type="Stimulsoft.Report.Components.ShapeTypes.StiDiagonalDownLineShapeType" isKey="true" />
-            </Shape3>
-            <Text4 Ref="7" type="Text" isKey="true">
-              <Brush>Transparent</Brush>
-              <ClientRectangle>3.8,0.2,1,1</ClientRectangle>
-              <Conditions isList="true" count="0" />
-              <Font>Arial,10</Font>
+              <ImageBytes>/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAABkAAD/4QMqaHR0cDov
+L25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENl
+aGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4
+OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzE0MiA3OS4xNjA5MjQsIDIwMTcvMDcvMTMtMDE6
+MDY6MzkgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5
+OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHht
+bG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6
+Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUu
+Y29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBo
+b3Rvc2hvcCBDQyAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkUxQjdBRkNG
+NjQyMTFFQUJBN0FENDBDQjE5N0FBOUUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkUxQjdB
+RkRGNjQyMTFFQUJBN0FENDBDQjE5N0FBOUUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5z
+dGFuY2VJRD0ieG1wLmlpZDpCRTFCN0FGQUY2NDIxMUVBQkE3QUQ0MENCMTk3QUE5RSIgc3RSZWY6
+ZG9jdW1lbnRJRD0ieG1wLmRpZDpCRTFCN0FGQkY2NDIxMUVBQkE3QUQ0MENCMTk3QUE5RSIvPiA8
+L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0i
+ciI/Pv/uAA5BZG9iZQBkwAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
+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
+9sy2sdUwK4+KeX979Zo8hckQf//Z</ImageBytes>
               <Margins>0,0,0,0</Margins>
-              <Name>Text4</Name>
+              <Name>Image1</Name>
               <Page isRef="3" />
               <Parent isRef="4" />
-              <Text>日   期</Text>
-              <TextBrush>Black</TextBrush>
-              <TextOptions>,,,,,Angle=-50</TextOptions>
-              <Type>Expression</Type>
-            </Text4>
-            <Text3 Ref="8" type="Text" isKey="true">
+              <Stretch>True</Stretch>
+            </Image1>
+            <Text1 Ref="6" type="Text" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>1.8,0.2,2.2,1</ClientRectangle>
+              <ClientRectangle>5.2,1.2,1.6,0.4</ClientRectangle>
               <Conditions isList="true" count="0" />
-              <Font>Arial,10</Font>
+              <Font>Arial,8</Font>
               <Margins>0,0,0,0</Margins>
-              <Name>Text3</Name>
+              <Name>Text1</Name>
               <Page isRef="3" />
               <Parent isRef="4" />
-              <Text>打卡结果</Text>
+              <Text>{Monday}</Text>
               <TextBrush>Black</TextBrush>
-              <TextOptions>,,,,,Angle=-30</TextOptions>
-              <Type>Expression</Type>
-            </Text3>
-            <Text2 Ref="9" type="Text" isKey="true">
+            </Text1>
+            <Text2 Ref="7" type="Text" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>0.16,0.27,2.2,1</ClientRectangle>
+              <ClientRectangle>5.2,0.2,1.6,0.6</ClientRectangle>
               <Conditions isList="true" count="0" />
-              <Font>Arial,10</Font>
+              <Font>Arial,8</Font>
               <Margins>0,0,0,0</Margins>
               <Name>Text2</Name>
               <Page isRef="3" />
               <Parent isRef="4" />
-              <Text>考勤类型</Text>
+              <Text>{MondayDate}</Text>
               <TextBrush>Black</TextBrush>
-              <TextOptions>,,,,,Angle=-28</TextOptions>
-              <Type>Expression</Type>
             </Text2>
-            <Text1 Ref="10" type="Text" isKey="true">
-              <Brush>Transparent</Brush>
-              <ClientRectangle>0.6,1.55,1.6,0.4</ClientRectangle>
-              <Conditions isList="true" count="0" />
-              <Font>Arial,10</Font>
-              <Margins>0,0,0,0</Margins>
-              <Name>Text1</Name>
-              <Page isRef="3" />
-              <Parent isRef="4" />
-              <Text>人   员</Text>
-              <TextBrush>Black</TextBrush>
-              <Type>Expression</Type>
-            </Text1>
-            <Shape2 Ref="11" type="Shape" isKey="true">
-              <BorderColor>Black</BorderColor>
-              <Brush>EmptyBrush</Brush>
-              <ClientRectangle>0.8,0,4.2,2</ClientRectangle>
-              <Conditions isList="true" count="0" />
-              <Name>Shape2</Name>
-              <Page isRef="3" />
-              <Parent isRef="4" />
-              <ShapeType Ref="12" type="Stimulsoft.Report.Components.ShapeTypes.StiDiagonalDownLineShapeType" isKey="true" />
-            </Shape2>
-            <Shape1 Ref="13" type="Shape" isKey="true">
-              <BorderColor>Black</BorderColor>
-              <Brush>Transparent</Brush>
-              <ClientRectangle>0,1,5,1</ClientRectangle>
-              <Conditions isList="true" count="0" />
-              <Name>Shape1</Name>
-              <Page isRef="3" />
-              <Parent isRef="4" />
-              <ShapeType Ref="14" type="Stimulsoft.Report.Components.ShapeTypes.StiDiagonalDownLineShapeType" isKey="true" />
-            </Shape1>
-            <StartPointPrimitive1 Ref="15" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive1 Ref="8" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>5,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive1</Name>
@@ -135,7 +179,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>6f1bc255e6204946825c21d6e7a14efa</ReferenceToGuid>
             </StartPointPrimitive1>
-            <EndPointPrimitive1 Ref="16" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive1 Ref="9" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>5,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive1</Name>
@@ -143,7 +187,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>6f1bc255e6204946825c21d6e7a14efa</ReferenceToGuid>
             </EndPointPrimitive1>
-            <StartPointPrimitive8 Ref="17" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive8 Ref="10" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>17,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive8</Name>
@@ -151,7 +195,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>ef3e0b0ec7af4e37bfe8a43076b7cd30</ReferenceToGuid>
             </StartPointPrimitive8>
-            <EndPointPrimitive8 Ref="18" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive8 Ref="11" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>19,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive8</Name>
@@ -159,7 +203,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>ef3e0b0ec7af4e37bfe8a43076b7cd30</ReferenceToGuid>
             </EndPointPrimitive8>
-            <StartPointPrimitive7 Ref="19" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive7 Ref="12" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>15,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive7</Name>
@@ -167,7 +211,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>2d746f4748134ce0a58f133581ce35de</ReferenceToGuid>
             </StartPointPrimitive7>
-            <EndPointPrimitive7 Ref="20" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive7 Ref="13" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>17,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive7</Name>
@@ -175,7 +219,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>2d746f4748134ce0a58f133581ce35de</ReferenceToGuid>
             </EndPointPrimitive7>
-            <StartPointPrimitive6 Ref="21" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive6 Ref="14" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>13,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive6</Name>
@@ -183,7 +227,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>3ea18cee2e5845f2bffa9729b80e5f29</ReferenceToGuid>
             </StartPointPrimitive6>
-            <EndPointPrimitive6 Ref="22" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive6 Ref="15" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>15,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive6</Name>
@@ -191,7 +235,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>3ea18cee2e5845f2bffa9729b80e5f29</ReferenceToGuid>
             </EndPointPrimitive6>
-            <StartPointPrimitive5 Ref="23" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive5 Ref="16" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>11,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive5</Name>
@@ -199,7 +243,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>d1cab23d65cb4cbf87889dc2f5fb4900</ReferenceToGuid>
             </StartPointPrimitive5>
-            <EndPointPrimitive5 Ref="24" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive5 Ref="17" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>13,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive5</Name>
@@ -207,7 +251,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>d1cab23d65cb4cbf87889dc2f5fb4900</ReferenceToGuid>
             </EndPointPrimitive5>
-            <StartPointPrimitive4 Ref="25" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive4 Ref="18" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>9,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive4</Name>
@@ -215,7 +259,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>82a36abe322c4390958d192e59591218</ReferenceToGuid>
             </StartPointPrimitive4>
-            <EndPointPrimitive4 Ref="26" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive4 Ref="19" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>11,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive4</Name>
@@ -223,7 +267,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>82a36abe322c4390958d192e59591218</ReferenceToGuid>
             </EndPointPrimitive4>
-            <StartPointPrimitive3 Ref="27" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive3 Ref="20" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>7,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive3</Name>
@@ -231,7 +275,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>3b9fa7de8f11436484b1a16553af09c9</ReferenceToGuid>
             </StartPointPrimitive3>
-            <EndPointPrimitive3 Ref="28" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive3 Ref="21" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>9,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive3</Name>
@@ -239,7 +283,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>3b9fa7de8f11436484b1a16553af09c9</ReferenceToGuid>
             </EndPointPrimitive3>
-            <StartPointPrimitive2 Ref="29" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
+            <StartPointPrimitive2 Ref="22" type="Stimulsoft.Report.Components.StiStartPointPrimitive" isKey="true">
               <ClientRectangle>5,0,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>StartPointPrimitive2</Name>
@@ -247,7 +291,7 @@
               <Parent isRef="4" />
               <ReferenceToGuid>85559f8f8dd547cf9f94f6bcba15184e</ReferenceToGuid>
             </StartPointPrimitive2>
-            <EndPointPrimitive2 Ref="30" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
+            <EndPointPrimitive2 Ref="23" type="Stimulsoft.Report.Components.StiEndPointPrimitive" isKey="true">
               <ClientRectangle>7,2,0,0</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Name>EndPointPrimitive2</Name>
@@ -261,44 +305,44 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </PageHeaderBand1>
-        <DataBand1 Ref="31" type="DataBand" isKey="true">
+        <DataBand1 Ref="24" type="DataBand" isKey="true">
           <Brush>Transparent</Brush>
           <BusinessObjectGuid isNull="true" />
-          <ClientRectangle>0,3.2,19,0.8</ClientRectangle>
+          <ClientRectangle>0,3.2,19,2</ClientRectangle>
           <Components isList="true" count="3">
-            <Text5 Ref="32" type="Text" isKey="true">
+            <Text5 Ref="25" type="Text" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>0,0,1.6,0.6</ClientRectangle>
+              <ClientRectangle>0,0.4,2.4,0.6</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Font>Arial,8</Font>
               <Margins>0,0,0,0</Margins>
               <Name>Text5</Name>
               <Page isRef="3" />
-              <Parent isRef="31" />
+              <Parent isRef="24" />
               <Text>{数据源1.UserName}</Text>
               <TextBrush>Black</TextBrush>
             </Text5>
-            <Text6 Ref="33" type="Text" isKey="true">
+            <Text6 Ref="26" type="Text" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>1.8,0,1.6,0.6</ClientRectangle>
+              <ClientRectangle>0,1.2,2.4,0.6</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Font>Arial,8</Font>
               <Margins>0,0,0,0</Margins>
               <Name>Text6</Name>
               <Page isRef="3" />
-              <Parent isRef="31" />
+              <Parent isRef="24" />
               <Text>{数据源1.Department}</Text>
               <TextBrush>Black</TextBrush>
             </Text6>
-            <Text7 Ref="34" type="Text" isKey="true">
+            <Text7 Ref="27" type="Text" isKey="true">
               <Brush>Transparent</Brush>
-              <ClientRectangle>3.6,0,1.6,0.6</ClientRectangle>
+              <ClientRectangle>3.2,0.4,1.6,0.6</ClientRectangle>
               <Conditions isList="true" count="0" />
               <Font>Arial,8</Font>
               <Margins>0,0,0,0</Margins>
               <Name>Text7</Name>
               <Page isRef="3" />
-              <Parent isRef="31" />
+              <Parent isRef="24" />
               <Text>{数据源1.ADType}</Text>
               <TextBrush>Black</TextBrush>
             </Text7>
@@ -312,22 +356,22 @@
           <Parent isRef="3" />
           <Sort isList="true" count="0" />
         </DataBand1>
-        <VerticalLinePrimitive1 Ref="35" type="VerticalLinePrimitive" isKey="true">
+        <VerticalLinePrimitive1 Ref="28" type="VerticalLinePrimitive" isKey="true">
           <ClientRectangle>5,0.4,0.0254,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
-          <EndCap Ref="36" type="Cap" isKey="true">
+          <EndCap Ref="29" type="Cap" isKey="true">
             <Color>Black</Color>
           </EndCap>
           <Guid>6f1bc255e6204946825c21d6e7a14efa</Guid>
           <Name>VerticalLinePrimitive1</Name>
           <Page isRef="3" />
           <Parent isRef="3" />
-          <StartCap Ref="37" type="Cap" isKey="true">
+          <StartCap Ref="30" type="Cap" isKey="true">
             <Color>Black</Color>
           </StartCap>
         </VerticalLinePrimitive1>
-        <RectanglePrimitive7 Ref="38" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive7 Ref="31" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>17,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -336,7 +380,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive7>
-        <RectanglePrimitive6 Ref="39" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive6 Ref="32" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>15,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -345,7 +389,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive6>
-        <RectanglePrimitive5 Ref="40" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive5 Ref="33" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>13,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -354,7 +398,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive5>
-        <RectanglePrimitive4 Ref="41" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive4 Ref="34" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>11,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -363,7 +407,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive4>
-        <RectanglePrimitive3 Ref="42" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive3 Ref="35" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>9,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -372,7 +416,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive3>
-        <RectanglePrimitive2 Ref="43" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive2 Ref="36" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>7,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -381,7 +425,7 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive2>
-        <RectanglePrimitive1 Ref="44" type="RectanglePrimitive" isKey="true">
+        <RectanglePrimitive1 Ref="37" type="RectanglePrimitive" isKey="true">
           <ClientRectangle>5,0.4,2,2</ClientRectangle>
           <Color>Black</Color>
           <Conditions isList="true" count="0" />
@@ -390,6 +434,133 @@
           <Page isRef="3" />
           <Parent isRef="3" />
         </RectanglePrimitive1>
+        <CrossTab1 Ref="38" type="Stimulsoft.Report.CrossTab.StiCrossTab" isKey="true">
+          <Brush>Transparent</Brush>
+          <ClientRectangle>0.2,6.4,10.4,3.2</ClientRectangle>
+          <Components isList="true" count="7">
+            <CrossTab1_RowTotal1 Ref="39" type="CrossRowTotal" isKey="true">
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>[255:255:255]</Brush>
+              <ClientRectangle>0,1.3,1.6,0.4</ClientRectangle>
+              <Conditions isList="true" count="0" />
+              <Font>Arial,8</Font>
+              <Guid>088261aeb6754baa8051a32ddf350bba</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_RowTotal1</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>Total</Text>
+              <TextBrush>Black</TextBrush>
+            </CrossTab1_RowTotal1>
+            <CrossTab1_Row1_Title Ref="40" type="CrossTitle" isKey="true">
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>White</Brush>
+              <ClientRectangle>0,0.45,1.6,0.4</ClientRectangle>
+              <Font>Arial,8</Font>
+              <Guid>565eb2dfdfaf401c9318ea775028f75e</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_Row1_Title</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>UserName</Text>
+              <TextBrush>[105:105:105]</TextBrush>
+              <TypeOfComponent>Row:CrossTab1_Row1</TypeOfComponent>
+            </CrossTab1_Row1_Title>
+            <CrossTab1_ColTotal1 Ref="41" type="CrossColumnTotal" isKey="true">
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>[255:255:255]</Brush>
+              <ClientRectangle>3.25,0.45,0.8,0.4</ClientRectangle>
+              <Conditions isList="true" count="0" />
+              <Font>Arial,8</Font>
+              <Guid>6f4f22da318548889f03c823399cb0a6</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_ColTotal1</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>Total</Text>
+              <TextBrush>Black</TextBrush>
+            </CrossTab1_ColTotal1>
+            <CrossTab1_LeftTitle Ref="42" type="CrossTitle" isKey="true">
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>White</Brush>
+              <ClientRectangle>0,0,1.6,0.4</ClientRectangle>
+              <Font>Arial,8</Font>
+              <Guid>9650f906446e4e3e8026497cded9f471</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_LeftTitle</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>数据源1</Text>
+              <TextBrush>[105:105:105]</TextBrush>
+              <TypeOfComponent>LeftTitle</TypeOfComponent>
+            </CrossTab1_LeftTitle>
+            <CrossTab1_RightTitle Ref="43" type="CrossTitle" isKey="true">
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>White</Brush>
+              <ClientRectangle>1.65,0,2.4,0.4</ClientRectangle>
+              <Font>Arial,8</Font>
+              <Guid>4f0b5274279f4cba9007f5ee40ac306e</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_RightTitle</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>ClockTime</Text>
+              <TextBrush>[105:105:105]</TextBrush>
+              <TypeOfComponent>RightTitle</TypeOfComponent>
+            </CrossTab1_RightTitle>
+            <CrossTab1_Row1 Ref="44" type="CrossRow" isKey="true">
+              <Alias>UserName</Alias>
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>White</Brush>
+              <ClientRectangle>0,0.9,1.6,0.4</ClientRectangle>
+              <Conditions isList="true" count="0" />
+              <DisplayValue>{数据源1.UserName}</DisplayValue>
+              <Font>Arial,8</Font>
+              <Guid>59b5d26bd453438d937c49938f2708d0</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_Row1</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>UserName</Text>
+              <TextBrush>[105:105:105]</TextBrush>
+              <TotalGuid>088261aeb6754baa8051a32ddf350bba</TotalGuid>
+              <Value>{数据源1.UserName}</Value>
+            </CrossTab1_Row1>
+            <CrossTab1_Column1 Ref="45" type="CrossColumn" isKey="true">
+              <Alias>ClockTime</Alias>
+              <Border>All;[155:155:155];1;Solid;False;4;Black</Border>
+              <Brush>White</Brush>
+              <ClientRectangle>1.65,0.45,1.6,0.4</ClientRectangle>
+              <Conditions isList="true" count="0" />
+              <DisplayValue>{数据源1.ClockTime}</DisplayValue>
+              <Font>Arial,8</Font>
+              <Guid>75b732277ab94168b2782c3e24028eff</Guid>
+              <Margins>0,0,0,0</Margins>
+              <Name>CrossTab1_Column1</Name>
+              <Page isRef="3" />
+              <Parent isRef="38" />
+              <Restrictions>AllowMove, AllowResize, AllowSelect, AllowChange</Restrictions>
+              <Text>ClockTime</Text>
+              <TextBrush>[105:105:105]</TextBrush>
+              <TotalGuid>6f4f22da318548889f03c823399cb0a6</TotalGuid>
+              <Value>{数据源1.ClockTime}</Value>
+            </CrossTab1_Column1>
+          </Components>
+          <Conditions isList="true" count="0" />
+          <DataSourceName>数据源1</DataSourceName>
+          <EmptyValue />
+          <Filters isList="true" count="0" />
+          <Name>CrossTab1</Name>
+          <Page isRef="3" />
+          <Parent isRef="3" />
+          <Sort isList="true" count="0" />
+        </CrossTab1>
       </Components>
       <Conditions isList="true" count="0" />
       <Guid>403b1f2049dd4a979599f69c93987a2d</Guid>
@@ -412,10 +583,10 @@
     <value>Stimulsoft.Report.Dll</value>
   </ReferencedAssemblies>
   <ReportAlias>Report</ReportAlias>
-  <ReportChanged>9/15/2020 6:16:52 PM</ReportChanged>
+  <ReportChanged>9/16/2020 6:05:56 PM</ReportChanged>
   <ReportCreated>9/15/2020 2:53:21 PM</ReportCreated>
   <ReportFile>C:\Users\Administrator\AppData\Local\Stimulsoft\Report.mrt</ReportFile>
-  <ReportGuid>9353191743424e309330680d085a8f51</ReportGuid>
+  <ReportGuid>1b6710c8297141e6a9d07f145eae800f</ReportGuid>
   <ReportName>Report</ReportName>
   <ReportUnit>Centimeters</ReportUnit>
   <ReportVersion>2020.2.1.0</ReportVersion>

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -212,8 +212,8 @@
       <HintPath>..\packages\System.IO.Packaging.4.4.0\lib\net46\System.IO.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>

Learun.Framework.Ultimate V7/Learun.Application.Web/Web.config

@@ -82,7 +82,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -138,7 +138,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Host.SystemWeb" publicKeyToken="31bf3856ad364e35" culture="neutral" />

Learun.Framework.Ultimate V7/Learun.Application.Web/document.pdf

@@ -0,0 +1,6 @@
+2
+2
+1
+1
+1
+

Learun.Framework.Ultimate V7/Learun.Application.Web/packages.config

@@ -4,7 +4,6 @@
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.8.1" targetFramework="net462" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
-  <package id="EntityFramework.zh-Hans" version="6.2.0" targetFramework="net462" />
   <package id="ExcelNumberFormat" version="1.0.3" targetFramework="net45" />
   <package id="FastMember.Signed" version="1.3.0" targetFramework="net45" />
   <package id="Hangfire" version="1.7.3" targetFramework="net45" />
@@ -50,7 +49,7 @@
   <package id="System.IO.Packaging" version="4.4.0" targetFramework="net462" />
   <package id="System.Linq" version="4.3.0" targetFramework="net462" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net462" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net462" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs

@@ -100,9 +100,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
+                var baseDataName = this.BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT * ");
-                strSql.Append("  FROM ADR_Record t ");
+                strSql.Append(@"SELECT t.ID,
+                                       emp.F_RealName as UserName,
+                                       t.UserNo,
+                                       d.F_FullName as  Department ,
+                                       c.F_ItemName as ADType,
+                                       t.ADTime,
+                                       t.ClockTime,
+                                       t.ClockStatus,
+                                       t.ClockPlace,
+                                       t.ADYear,
+                                       t.ADMonth,
+                                       t.ADDay,
+                                       t.ADPhoto
+                             ");
+                strSql.Append($"  FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account ");
+                strSql.Append($"  left join {baseDataName}.dbo.LR_Base_Department d ON t.UserNo=emp.F_DepartmentId ");
+                strSql.Append($" left join (select b.F_ItemValue,b.F_ItemName,b.F_SortCode from  {baseDataName}.[dbo].[LR_Base_DataItem] a left join {baseDataName}.[dbo].[LR_Base_DataItemDetail] b on a.F_ItemId=b.F_ItemId where a.F_ItemCode='ADType') c on t.ADType=c.F_ItemValue ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -111,19 +127,21 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND ( t.ADTime >= @startTime AND t.ADTime <= @endTime ) ");
+                    strSql.Append(" AND ( t.ClockTime >= @startTime AND t.ClockTime <= @endTime ) ");
                 }
                 if (!queryParam["UserName"].IsEmpty())
                 {
                     dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.UserName Like @UserName ");
+                    strSql.Append(" AND emp.F_RealName Like @UserName ");
                 }
                 if (!queryParam["Department"].IsEmpty())
                 {
                     dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
-                    strSql.Append(" AND t.Department = @Department ");
+                    strSql.Append(" AND emp.F_DepartmentId = @Department ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(), dp);
+
+                strSql.Append(" order by t.UserNo,c.F_SortCode,t.ClockTime ");
+                return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(),dp);
             }
             catch (Exception ex)
             {