Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

必选修规则

Browse Source
master
xiaochanghai 11 months ago
parent fa1dcab1aa
commit a9a2ae32e8
11 changed files with 224 additions and 94 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 143
      Model/Tiobon.Web.pdm
  2. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 10
      Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs
  4. 10
      Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs
  5. 15
      Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRule.Dto.EditInput.cs
  6. 15
      Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRule.Dto.InsertInput.cs
  7. 10
      Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs
  8. 8
      Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleStaff.cs
  9. 3
      Tiobon.Core.Model/View/Ghre/Ghre_StudyRule.Dto.View.cs
  10. 84
      Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
  11. 10
      Tiobon.Core/Tiobon.Core.Model.xml

143
Model/Tiobon.Web.pdm
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1721373753" Name="Tiobon" Objects="7335" Symbols="307" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1721615374" Name="Tiobon" Objects="7316" Symbols="307" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -120662,10 +120662,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>ZoneId</a:Code>
<a:CreationDate>1721353940</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721371875</a:ModificationDate>
<a:ModificationDate>1721611383</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>厂区</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7505">
<a:ObjectID>DF4CA9F0-D489-47D9-BC2F-15A2CA61024B</a:ObjectID>
@ -120673,10 +120673,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>DeptId</a:Code>
<a:CreationDate>1721353940</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721371875</a:ModificationDate>
<a:ModificationDate>1721611383</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>部门</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7506">
<a:ObjectID>11CD542D-061E-4B85-A96B-7A0543F3C4AE</a:ObjectID>
@ -120684,10 +120684,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>TitleId</a:Code>
<a:CreationDate>1721353940</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721371875</a:ModificationDate>
<a:ModificationDate>1721611383</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>职称</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7507">
<a:ObjectID>AE698472-4094-467D-96DC-5B3579FBFAB9</a:ObjectID>
@ -120695,10 +120695,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>GradeId</a:Code>
<a:CreationDate>1721353940</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721371875</a:ModificationDate>
<a:ModificationDate>1721611383</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>职等</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7508">
<a:ObjectID>AF5F0E34-DA3F-4286-A4EC-88F51CDA9EF5</a:ObjectID>
@ -120706,10 +120706,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>JobId</a:Code>
<a:CreationDate>1721354134</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721371875</a:ModificationDate>
<a:ModificationDate>1721610607</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>岗位</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7509">
<a:ObjectID>8F74C8FF-6DCB-4BE1-B049-0BDD3D5D8FC9</a:ObjectID>
@ -121444,7 +121444,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>Ghre_StudyRuleStaff</a:Code>
<a:CreationDate>1721372451</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721372642</a:ModificationDate>
<a:ModificationDate>1721615374</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>必选修规则人员</a:Comment>
<c:Columns>
@ -121605,6 +121605,21 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o7577">
<a:ObjectID>BEF0B3E2-5C5F-4A6E-A696-23BE258E5967</a:ObjectID>
<a:Name>员工姓名</a:Name>
<a:Code>StaffName</a:Code>
<a:CreationDate>1721614963</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1721615374</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>员工姓名</a:Comment>
<a:DataType>nvarchar(32)</a:DataType>
<a:Length>32</a:Length>
<c:Domain>
<o:PhysicalDomain Ref="o564"/>
</c:Domain>
</o:Column>
<o:Column Id="o7578">
<a:ObjectID>E04C7821-5C70-4181-A47A-CB6781A4EA94</a:ObjectID>
<a:Name>备注</a:Name>
<a:Code>RemarkSz</a:Code>
@ -121619,7 +121634,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:PhysicalDomain Ref="o564"/>
</c:Domain>
</o:Column>
<o:Column Id="o7578">
<o:Column Id="o7579">
<a:ObjectID>E963DF7D-5FF1-46E5-BFD1-C77FBC755D50</a:ObjectID>
<a:Name>默认标志</a:Name>
<a:Code>IsDefault</a:Code>
@ -121634,7 +121649,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:PhysicalDomain Ref="o566"/>
</c:Domain>
</o:Column>
<o:Column Id="o7579">
<o:Column Id="o7580">
<a:ObjectID>8EC54578-BC99-4FA2-AA3E-49C78AD49294</a:ObjectID>
<a:Name>删除标志</a:Name>
<a:Code>IsEnable</a:Code>
@ -121649,7 +121664,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:PhysicalDomain Ref="o566"/>
</c:Domain>
</o:Column>
<o:Column Id="o7580">
<o:Column Id="o7581">
<a:ObjectID>20F23FED-B864-48D9-A5F2-62530E6B6B6D</a:ObjectID>
<a:Name>预留字段1</a:Name>
<a:Code>Reverse1</a:Code>
@ -121661,7 +121676,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7581">
<o:Column Id="o7582">
<a:ObjectID>4D83EE02-C7B8-4454-9961-5D4317D0393D</a:ObjectID>
<a:Name>预留字段2</a:Name>
<a:Code>Reverse2</a:Code>
@ -121673,7 +121688,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7582">
<o:Column Id="o7583">
<a:ObjectID>35840EFC-0D77-4B15-8DCA-C163FC95D7F0</a:ObjectID>
<a:Name>预留字段3</a:Name>
<a:Code>Reverse3</a:Code>
@ -121685,7 +121700,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7583">
<o:Column Id="o7584">
<a:ObjectID>58515022-4E1B-4716-BCE9-0452E0DF1EC1</a:ObjectID>
<a:Name>预留字段4</a:Name>
<a:Code>Reverse4</a:Code>
@ -121697,7 +121712,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7584">
<o:Column Id="o7585">
<a:ObjectID>23D6B0F2-E0BB-48E1-B6C7-02CD99506ECF</a:ObjectID>
<a:Name>预留字段5</a:Name>
<a:Code>Reverse5</a:Code>
@ -121709,7 +121724,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7585">
<o:Column Id="o7586">
<a:ObjectID>2387FA8F-20B2-4370-B3CB-D4B3DEC74BF4</a:ObjectID>
<a:Name>预留字段6</a:Name>
<a:Code>Reverse6</a:Code>
@ -121721,7 +121736,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7586">
<o:Column Id="o7587">
<a:ObjectID>73BE3393-7BFC-4ED3-9421-1B079B700C59</a:ObjectID>
<a:Name>预留字段7</a:Name>
<a:Code>Reverse7</a:Code>
@ -121733,7 +121748,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7587">
<o:Column Id="o7588">
<a:ObjectID>3382A8F6-1F0B-45ED-9048-D60BD40A3ACA</a:ObjectID>
<a:Name>预留字段8</a:Name>
<a:Code>Reverse8</a:Code>
@ -121745,7 +121760,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7588">
<o:Column Id="o7589">
<a:ObjectID>2D7C8BCC-C8A9-42B2-AA94-02AC70668E77</a:ObjectID>
<a:Name>预留字段9</a:Name>
<a:Code>Reverse9</a:Code>
@ -121757,7 +121772,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7589">
<o:Column Id="o7590">
<a:ObjectID>E1095425-D8C3-47FD-AE78-6FC3AF87EE98</a:ObjectID>
<a:Name>预留字段10</a:Name>
<a:Code>Reverse10</a:Code>
@ -121769,7 +121784,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o7590">
<o:Column Id="o7591">
<a:ObjectID>3D1EA6FC-A74C-45BB-9AEA-A60F4584D106</a:ObjectID>
<a:Name>预留字段I1</a:Name>
<a:Code>ReverseI1</a:Code>
@ -121781,7 +121796,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DefaultValue>0</a:DefaultValue>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o7591">
<o:Column Id="o7592">
<a:ObjectID>EACF32DF-891A-4372-9E13-9A98AE126EED</a:ObjectID>
<a:Name>预留字段I2</a:Name>
<a:Code>ReverseI2</a:Code>
@ -121795,7 +121810,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o7592">
<o:Key Id="o7593">
<a:ObjectID>2A211835-FB66-43E3-AA9F-BF663C744603</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@ -121809,10 +121824,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o7592"/>
<o:Key Ref="o7593"/>
</c:PrimaryKey>
<c:ClusterObject>
<o:Key Ref="o7592"/>
<o:Key Ref="o7593"/>
</c:ClusterObject>
</o:Table>
</c:Tables>
@ -121836,7 +121851,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6448"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7593">
<o:ReferenceJoin Id="o7594">
<a:ObjectID>7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2</a:ObjectID>
<a:CreationDate>1714101292</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -121870,7 +121885,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6419"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7594">
<o:ReferenceJoin Id="o7595">
<a:ObjectID>D23C452C-4BB6-4C2A-AB2E-E8434D958A77</a:ObjectID>
<a:CreationDate>1714101335</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -121904,7 +121919,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6419"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7595">
<o:ReferenceJoin Id="o7596">
<a:ObjectID>D4016F9D-5631-4F9E-A70D-D42133A4EBB7</a:ObjectID>
<a:CreationDate>1714107872</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -121938,7 +121953,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6695"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7596">
<o:ReferenceJoin Id="o7597">
<a:ObjectID>BEBA3346-CCC6-41D9-B95B-12B8F81188BF</a:ObjectID>
<a:CreationDate>1714108449</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -121972,7 +121987,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6772"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7597">
<o:ReferenceJoin Id="o7598">
<a:ObjectID>FC69BEF9-F863-4A65-903E-CB2850197526</a:ObjectID>
<a:CreationDate>1714109221</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122006,7 +122021,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6813"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7598">
<o:ReferenceJoin Id="o7599">
<a:ObjectID>ACE0AB02-0D27-4F1C-BF71-738C20DF96C2</a:ObjectID>
<a:CreationDate>1714120556</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122040,7 +122055,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6652"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7599">
<o:ReferenceJoin Id="o7600">
<a:ObjectID>B95672ED-9976-4742-9FFC-52B326620682</a:ObjectID>
<a:CreationDate>1715565535</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122074,7 +122089,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6652"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7600">
<o:ReferenceJoin Id="o7601">
<a:ObjectID>B6E89235-A6E0-460D-9228-DCA8C58EE2AD</a:ObjectID>
<a:CreationDate>1715570661</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122108,7 +122123,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6947"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7601">
<o:ReferenceJoin Id="o7602">
<a:ObjectID>5D4938F3-7934-4F74-891C-97DC9DC47B1B</a:ObjectID>
<a:CreationDate>1716798640</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122142,7 +122157,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6772"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7602">
<o:ReferenceJoin Id="o7603">
<a:ObjectID>179079CB-7169-4B19-A07A-A61C331F59CD</a:ObjectID>
<a:CreationDate>1716876897</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122176,7 +122191,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6772"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7603">
<o:ReferenceJoin Id="o7604">
<a:ObjectID>DD965546-2361-4301-82D7-446B823BDCFD</a:ObjectID>
<a:CreationDate>1717481682</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122210,7 +122225,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7074"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7604">
<o:ReferenceJoin Id="o7605">
<a:ObjectID>E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC</a:ObjectID>
<a:CreationDate>1717726229</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122244,7 +122259,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7074"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7605">
<o:ReferenceJoin Id="o7606">
<a:ObjectID>8C71D6B9-780B-4547-ADFD-986E619F4DCD</a:ObjectID>
<a:CreationDate>1719381914</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122278,7 +122293,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7113"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7606">
<o:ReferenceJoin Id="o7607">
<a:ObjectID>EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE</a:ObjectID>
<a:CreationDate>1719468257</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122312,7 +122327,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6730"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7607">
<o:ReferenceJoin Id="o7608">
<a:ObjectID>ACF1454B-2C3F-40E5-ADC5-4A48787EB937</a:ObjectID>
<a:CreationDate>1720488320</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122346,7 +122361,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7526"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7608">
<o:ReferenceJoin Id="o7609">
<a:ObjectID>55351100-6B8C-411A-838F-ADF17D7249C7</a:ObjectID>
<a:CreationDate>1721372650</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122380,7 +122395,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7458"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7609">
<o:ReferenceJoin Id="o7610">
<a:ObjectID>CE1833FA-A783-4FAC-87BF-AA0FF8008532</a:ObjectID>
<a:CreationDate>1721280283</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122414,7 +122429,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7526"/>
</c:ParentKey>
<c:Joins>
<o:ReferenceJoin Id="o7610">
<o:ReferenceJoin Id="o7611">
<a:ObjectID>18F2EFF3-BD41-4F96-96C8-D8B15C7E2644</a:ObjectID>
<a:CreationDate>1721372603</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@ -122436,7 +122451,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:PhysicalDiagram Ref="o4"/>
</c:DefaultDiagram>
<c:Users>
<o:User Id="o7611">
<o:User Id="o7612">
<a:ObjectID>A1DD77B6-E48E-4C9D-947D-D42E3C5240C2</a:ObjectID>
<a:Name>dbo</a:Name>
<a:Code>dbo</a:Code>
@ -122449,7 +122464,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</a:ExtendedAttributesText>
<c:ExtendedCollections>
<o:ExtendedCollection Id="o7612">
<o:ExtendedCollection Id="o7613">
<a:ObjectID>C012A467-0031-4F3C-9D9D-13408491E147</a:ObjectID>
<a:ExtendedBaseCollection.CollectionName>DefaultSchema</a:ExtendedBaseCollection.CollectionName>
<a:CreationDate>1597196432</a:CreationDate>
@ -122457,12 +122472,12 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:ModificationDate>1597196433</a:ModificationDate>
<a:Modifier>ttsoftxch</a:Modifier>
<c:Content>
<o:User Ref="o7613"/>
<o:User Ref="o7614"/>
</c:Content>
</o:ExtendedCollection>
</c:ExtendedCollections>
</o:User>
<o:User Id="o7613">
<o:User Id="o7614">
<a:ObjectID>41D2B655-5319-49C5-9BA6-133BB8B097CA</a:ObjectID>
<a:Name>dbo</a:Name>
<a:Code>dbo</a:Code>
@ -122474,7 +122489,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:User>
</c:Users>
<c:Domains>
<o:PhysicalDomain Id="o7614">
<o:PhysicalDomain Id="o7615">
<a:ObjectID>2153E033-C4DC-4F90-B2F4-3B0F44BD33D5</a:ObjectID>
<a:Name>文本</a:Name>
<a:Code>TEXT</a:Code>
@ -122484,7 +122499,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Modifier>ttsoftxch</a:Modifier>
<a:DataType>text</a:DataType>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o7615">
<o:PhysicalDomain Id="o7616">
<a:ObjectID>AC8799D0-82CA-4B70-ADAC-18D8797720A9</a:ObjectID>
<a:Name>图片</a:Name>
<a:Code>IMAGE</a:Code>
@ -122494,7 +122509,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Modifier>Administrator</a:Modifier>
<a:DataType>image</a:DataType>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o7616">
<o:PhysicalDomain Id="o7617">
<a:ObjectID>DEC04470-B84A-413E-9B2A-C265C5506182</a:ObjectID>
<a:Name>加密</a:Name>
<a:Code>ENCRYPT_STRING</a:Code>
@ -122562,7 +122577,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(4000)</a:DataType>
<a:Length>4000</a:Length>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o7617">
<o:PhysicalDomain Id="o7618">
<a:ObjectID>703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30</a:ObjectID>
<a:Name>短字符串</a:Name>
<a:Code>SHORT_STRING</a:Code>
@ -122573,7 +122588,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(64)</a:DataType>
<a:Length>64</a:Length>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o7618">
<o:PhysicalDomain Id="o7619">
<a:ObjectID>89A476D2-A1C0-428C-9875-26A50B7AFE1A</a:ObjectID>
<a:Name>长字符串</a:Name>
<a:Code>LONG_STRING</a:Code>
@ -122590,12 +122605,12 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>REMARK</a:Code>
<a:CreationDate>1207633883</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1656491623</a:ModificationDate>
<a:Modifier>xiaoc</a:Modifier>
<a:ModificationDate>1721615374</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:DataType>varchar(2000)</a:DataType>
<a:Length>2000</a:Length>
<c:PhysicalDomain.Owner>
<o:User Ref="o7613"/>
<o:User Ref="o7614"/>
</c:PhysicalDomain.Owner>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o566">
@ -122673,7 +122688,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length>
</o:PhysicalDomain>
<o:PhysicalDomain Id="o7619">
<o:PhysicalDomain Id="o7620">
<a:ObjectID>CB2F08D6-BE17-4046-B94A-4FD00EDA9015</a:ObjectID>
<a:Name>文件</a:Name>
<a:Code>FILE</a:Code>
@ -122696,7 +122711,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:PhysicalDomain>
</c:Domains>
<c:DefaultGroups>
<o:Group Id="o7620">
<o:Group Id="o7621">
<a:ObjectID>B41C21E8-76E9-4031-8EF0-34743E5525C5</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@ -122705,13 +122720,13 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:ModificationDate>1597196433</a:ModificationDate>
<a:Modifier>ttsoftxch</a:Modifier>
<c:Group.Users>
<o:User Ref="o7611"/>
<o:User Ref="o7613"/>
<o:User Ref="o7612"/>
<o:User Ref="o7614"/>
</c:Group.Users>
</o:Group>
</c:DefaultGroups>
<c:TargetModels>
<o:TargetModel Id="o7621">
<o:TargetModel Id="o7622">
<a:ObjectID>02EF92C9-49BF-45C7-934A-23BA290D5595</a:ObjectID>
<a:Name>Microsoft SQL Server 2008</a:Name>
<a:Code>MSSQLSRV2008</a:Code>

10
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -3920,6 +3920,11 @@
人员
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaffBase.StaffName">
<summary>
员工姓名
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaffBase.RemarkSz">
<summary>
备注
@ -9276,6 +9281,11 @@
人员
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaff.StaffName">
<summary>
员工姓名
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaff.RemarkSz">
<summary>
备注

10
Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs
Unescape View File

@ -51,27 +51,27 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 厂区
/// </summary>
public long? ZoneId { get; set; }
public int? ZoneId { get; set; }
/// <summary>
/// 部门
/// </summary>
public long? DeptId { get; set; }
public int? DeptId { get; set; }
/// <summary>
/// 职称
/// </summary>
public long? TitleId { get; set; }
public int? TitleId { get; set; }
/// <summary>
/// 职等
/// </summary>
public long? GradeId { get; set; }
public int? GradeId { get; set; }
/// <summary>
/// 岗位
/// </summary>
public long? JobId { get; set; }
public int? JobId { get; set; }
/// <summary>
/// 年度

10
Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs
Unescape View File

@ -13,7 +13,7 @@
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　作者：SimonHsiao │
*└──────────────────────────────────┘
*/
*/
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
@ -34,7 +34,13 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 人员
/// </summary>
public long? StaffId { get; set; }
public int? StaffId { get; set; }
/// <summary>
/// 员工姓名
/// </summary>
[Display(Name = "StaffName"), Description("员工姓名"), MaxLength(2000, ErrorMessage = "员工姓名 不能超过 32 个字符")]
public string StaffName { get; set; }
/// <summary>
/// 备注

15
Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRule.Dto.EditInput.cs
Unescape View File

@ -15,13 +15,12 @@
*└──────────────────────────────────┘
*/
namespace Tiobon.Core.Model.Models
{
namespace Tiobon.Core.Model.Models;
/// <summary>
/// 必选修规则 (Dto.EditInput)
/// </summary>
public class EditGhre_StudyRuleInput : Ghre_StudyRuleBase
{
}
/// <summary>
/// 必选修规则 (Dto.EditInput)
/// </summary>
public class EditGhre_StudyRuleInput : Ghre_StudyRuleBase
{
public List<int> Staffs { get; set; }
}

15
Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRule.Dto.InsertInput.cs
Unescape View File

@ -15,13 +15,12 @@
*└──────────────────────────────────┘
*/
namespace Tiobon.Core.Model.Models
{
namespace Tiobon.Core.Model.Models;
/// <summary>
/// 必选修规则 (Dto.InsertInput)
/// </summary>
public class InsertGhre_StudyRuleInput : Ghre_StudyRuleBase
{
}
/// <summary>
/// 必选修规则 (Dto.InsertInput)
/// </summary>
public class InsertGhre_StudyRuleInput : Ghre_StudyRuleBase
{
public List<int> Staffs { get; set; }
}

10
Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs
Unescape View File

@ -53,27 +53,27 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 厂区
/// </summary>
public long? ZoneId { get; set; }
public int? ZoneId { get; set; }
/// <summary>
/// 部门
/// </summary>
public long? DeptId { get; set; }
public int? DeptId { get; set; }
/// <summary>
/// 职称
/// </summary>
public long? TitleId { get; set; }
public int? TitleId { get; set; }
/// <summary>
/// 职等
/// </summary>
public long? GradeId { get; set; }
public int? GradeId { get; set; }
/// <summary>
/// 岗位
/// </summary>
public long? JobId { get; set; }
public int? JobId { get; set; }
/// <summary>
/// 年度

8
Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleStaff.cs
Unescape View File

@ -36,7 +36,13 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 人员
/// </summary>
public long? StaffId { get; set; }
public int? StaffId { get; set; }
/// <summary>
/// 员工姓名
/// </summary>
[Display(Name = "StaffName"), Description("员工姓名"), MaxLength(2000, ErrorMessage = "员工姓名 不能超过 32 个字符")]
public string StaffName { get; set; }
/// <summary>
/// 备注

3
Tiobon.Core.Model/View/Ghre/Ghre_StudyRule.Dto.View.cs
Unescape View File

@ -42,4 +42,7 @@ public class Ghre_StudyRuleDto : Ghre_StudyRule
public string JobName { get; set; }
public string RuleTypeLabel { get; set; }
public string TrainTypeLabel { get; set; }
public string StaffNames { get; set; }
public List<int> Staffs { get; set; }
}

84
Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
Unescape View File

@ -8,6 +8,8 @@ using Newtonsoft.Json.Linq;
using Tiobon.Core.Common;
using Tiobon.Core.Model;
using Newtonsoft.Json;
using Tiobon.Core.Common.Helper;
using Org.BouncyCastle.Crypto;
namespace Tiobon.Core.Services;
@ -19,15 +21,19 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
private readonly IBaseRepository<Ghre_StudyRule> _dal;
private readonly IGhre_CourseServices _ghre_CourseServices;
private readonly IGhre_CourseSceneServices _ghre_CourseSceneServices;
private readonly IGhre_StudyRuleStaffServices _ghre_StudyRuleStaffServices;
public Ghre_StudyRuleServices(ICaching caching,
IGhre_CourseServices ghre_CourseServices,
IGhre_CourseSceneServices ghre_CourseSceneServices, IBaseRepository<Ghre_StudyRule> dal)
IGhre_CourseSceneServices ghre_CourseSceneServices,
IGhre_StudyRuleStaffServices ghre_StudyRuleStaffServices,
IBaseRepository<Ghre_StudyRule> dal)
{
this._dal = dal;
base.BaseDal = dal;
base._caching = caching;
_ghre_CourseServices = ghre_CourseServices;
_ghre_CourseSceneServices = ghre_CourseSceneServices;
_ghre_StudyRuleStaffServices = ghre_StudyRuleStaffServices;
}
@ -121,7 +127,83 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
var entitys = await Db.Ado.SqlQueryAsync<Ghre_StudyRuleDto>(sql);
var ids = entitys.Select(x => x.Id).ToList();
var staffs = await _ghre_StudyRuleStaffServices.Query(x => x.StudyRuleId != null && ids.Contains(x.StudyRuleId.Value));
entitys.ForEach(x =>
{
x.StaffNames = string.Join(",", staffs.Where(o => o.StudyRuleId == x.Id).Select(o => o.StaffName));
});
return new ServicePageResult<Ghre_StudyRuleDto>(filter.pageNum, total, filter.pageSize, entitys);
}
public override async Task<long> Add(InsertGhre_StudyRuleInput entity)
{
var result = await base.Add(entity);
if (entity.Staffs != null && entity.Staffs.Any())
{
var insertStaffs = entity.Staffs.Select(x => new InsertGhre_StudyRuleStaffInput
{
StaffId = x,
StudyRuleId = result
}).ToList();
await _ghre_StudyRuleStaffServices.Add(insertStaffs);
}
string sql = @"UPDATE A
SET A.StaffName = B.StaffName
FROM Ghre_StudyRuleStaff A LEFT JOIN Ghra_Staff B ON A.StaffId = B.StaffID
WHERE A.StaffName IS NULL";
await Db.Ado.ExecuteCommandAsync(sql);
return result;
}
public override async Task<bool> Update(long Id, EditGhre_StudyRuleInput editModel)
{
var result = await base.Update(Id, editModel);
await _ghre_StudyRuleStaffServices.Delete(x => x.StudyRuleId == Id);
if (editModel.Staffs != null && editModel.Staffs.Any())
{
var insertStaffs = editModel.Staffs.Select(x => new InsertGhre_StudyRuleStaffInput
{
StaffId = x,
StudyRuleId = Id
}).ToList();
await _ghre_StudyRuleStaffServices.Add(insertStaffs);
}
string sql = @"UPDATE A
SET A.StaffName = B.StaffName
FROM Ghre_StudyRuleStaff A LEFT JOIN Ghra_Staff B ON A.StaffId = B.StaffID
WHERE A.StaffName IS NULL";
await Db.Ado.ExecuteCommandAsync(sql);
return result;
}
public override async Task<ServiceFormResult<Ghre_StudyRuleDto>> QueryForm(QueryForm body)
{
var result = await base.QueryForm(body);
if (result.result.DT_TableDataT1.Any())
{
var staffs = await _ghre_StudyRuleStaffServices.Query(x => x.StudyRuleId != null && x.StudyRuleId == result.result.DT_TableDataT1[0].Id);
var DT_TableDataT1 = result.result.DT_TableDataT1;
DT_TableDataT1.ForEach(t =>
{
t.Staffs = staffs.Where(x => x.StaffId != null).Select(x => x.StaffId.Value).ToList();
});
result.result.DT_TableDataT1 = DT_TableDataT1;
}
return result;
}
}

10
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -3920,6 +3920,11 @@
人员
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaffBase.StaffName">
<summary>
员工姓名
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaffBase.RemarkSz">
<summary>
备注
@ -9276,6 +9281,11 @@
人员
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaff.StaffName">
<summary>
员工姓名
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleStaff.RemarkSz">
<summary>
备注

Write Preview
Loading…
Cancel
Save