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

培训需求

Browse Source
master
xiaochanghai 9 months ago
parent deb51ca9f8
commit 2deb67daea
10 changed files with 352 additions and 62 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. 170
      Model/Tiobon.Web.pdm
  2. 4
      Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs
  3. 60
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  4. 2
      Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs
  5. 34
      Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
  6. 1
      Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs
  7. 36
      Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
  8. 5
      Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs
  9. 40
      Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
  10. 60
      Tiobon.Core/Tiobon.Core.Model.xml

170
Model/Tiobon.Web.pdm
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1725949523" Name="Tiobon" Objects="7476" Symbols="314" 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="1726118240" Name="Tiobon" Objects="7480" Symbols="312" 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 --> <!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -104591,7 +104591,7 @@ CheckRequested=Yes</a:PackageOptionsText>
<a:Code>SystemManager11</a:Code> <a:Code>SystemManager11</a:Code>
<a:CreationDate>1713342619</a:CreationDate> <a:CreationDate>1713342619</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1725949523</a:ModificationDate> <a:ModificationDate>1726118240</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:DisplayPreferences>[DisplayPreferences] <a:DisplayPreferences>[DisplayPreferences]
@ -123189,7 +123189,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>Ghre_Request</a:Code> <a:Code>Ghre_Request</a:Code>
<a:CreationDate>1725601887</a:CreationDate> <a:CreationDate>1725601887</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1725949495</a:ModificationDate> <a:ModificationDate>1726118109</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:Comment>培训需求</a:Comment> <a:Comment>培训需求</a:Comment>
<c:Columns> <c:Columns>
@ -123701,6 +123701,74 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Length>2000</a:Length> <a:Length>2000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7743"> <o:Column Id="o7743">
<a:ObjectID>9962AE20-8143-49FE-AF4E-1D9285089331</a:ObjectID>
<a:Name>同意人</a:Name>
<a:Code>AgreeUserId</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118231</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>同意人</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o7744">
<a:ObjectID>6F7B9F42-3721-4BDB-97B2-6C57CF5D0B74</a:ObjectID>
<a:Name>同意时间</a:Name>
<a:Code>AgreeTime</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118231</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>同意时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o7745">
<a:ObjectID>519A31E4-44FB-439A-926C-F164E9224204</a:ObjectID>
<a:Name>同意理由</a:Name>
<a:Code>AgreeReason</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118231</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>同意理由</a:Comment>
<a:DataType>nvarchar(2000)</a:DataType>
<a:Length>2000</a:Length>
</o:Column>
<o:Column Id="o7746">
<a:ObjectID>BADAFBF4-2C0F-4EAA-B8A5-B34FB40E171F</a:ObjectID>
<a:Name>拒绝人</a:Name>
<a:Code>RefuseUserId</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118200</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>拒绝人</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o7747">
<a:ObjectID>63390978-FC60-4F8F-8997-1AC99FE68CA3</a:ObjectID>
<a:Name>拒绝时间</a:Name>
<a:Code>RefuseTime</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118200</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>拒绝时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o7748">
<a:ObjectID>A58C50B5-829E-468A-8093-5B404F2BD040</a:ObjectID>
<a:Name>拒绝理由</a:Name>
<a:Code>RefuseReason</a:Code>
<a:CreationDate>1726107836</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1726118200</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>拒绝理由</a:Comment>
<a:DataType>nvarchar(2000)</a:DataType>
<a:Length>2000</a:Length>
</o:Column>
<o:Column Id="o7749">
<a:ObjectID>EADE602A-E3DB-4538-9DC6-F3E7E35AA914</a:ObjectID> <a:ObjectID>EADE602A-E3DB-4538-9DC6-F3E7E35AA914</a:ObjectID>
<a:Name>预留字段1</a:Name> <a:Name>预留字段1</a:Name>
<a:Code>Reverse1</a:Code> <a:Code>Reverse1</a:Code>
@ -123712,7 +123780,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7744"> <o:Column Id="o7750">
<a:ObjectID>64A9C288-7C6E-41DE-B71B-6E45A636FFDC</a:ObjectID> <a:ObjectID>64A9C288-7C6E-41DE-B71B-6E45A636FFDC</a:ObjectID>
<a:Name>预留字段2</a:Name> <a:Name>预留字段2</a:Name>
<a:Code>Reverse2</a:Code> <a:Code>Reverse2</a:Code>
@ -123724,7 +123792,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7745"> <o:Column Id="o7751">
<a:ObjectID>1EF93DDC-749A-494B-AE41-EB5383983DEA</a:ObjectID> <a:ObjectID>1EF93DDC-749A-494B-AE41-EB5383983DEA</a:ObjectID>
<a:Name>预留字段3</a:Name> <a:Name>预留字段3</a:Name>
<a:Code>Reverse3</a:Code> <a:Code>Reverse3</a:Code>
@ -123736,7 +123804,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7746"> <o:Column Id="o7752">
<a:ObjectID>79BCAF24-90F1-4D18-BB23-5F79ABBABF49</a:ObjectID> <a:ObjectID>79BCAF24-90F1-4D18-BB23-5F79ABBABF49</a:ObjectID>
<a:Name>预留字段4</a:Name> <a:Name>预留字段4</a:Name>
<a:Code>Reverse4</a:Code> <a:Code>Reverse4</a:Code>
@ -123748,7 +123816,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7747"> <o:Column Id="o7753">
<a:ObjectID>B31BA803-5B42-4852-B99B-F71E4FB05E68</a:ObjectID> <a:ObjectID>B31BA803-5B42-4852-B99B-F71E4FB05E68</a:ObjectID>
<a:Name>预留字段5</a:Name> <a:Name>预留字段5</a:Name>
<a:Code>Reverse5</a:Code> <a:Code>Reverse5</a:Code>
@ -123760,7 +123828,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7748"> <o:Column Id="o7754">
<a:ObjectID>2DF2FAC6-C04C-4E02-9475-D85588C730CA</a:ObjectID> <a:ObjectID>2DF2FAC6-C04C-4E02-9475-D85588C730CA</a:ObjectID>
<a:Name>预留字段6</a:Name> <a:Name>预留字段6</a:Name>
<a:Code>Reverse6</a:Code> <a:Code>Reverse6</a:Code>
@ -123772,7 +123840,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7749"> <o:Column Id="o7755">
<a:ObjectID>B2DD1AAE-02D8-4C52-A54F-EAA20D26116E</a:ObjectID> <a:ObjectID>B2DD1AAE-02D8-4C52-A54F-EAA20D26116E</a:ObjectID>
<a:Name>预留字段7</a:Name> <a:Name>预留字段7</a:Name>
<a:Code>Reverse7</a:Code> <a:Code>Reverse7</a:Code>
@ -123784,7 +123852,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7750"> <o:Column Id="o7756">
<a:ObjectID>9C65DF57-2D56-4B14-9071-42B0AB2F3064</a:ObjectID> <a:ObjectID>9C65DF57-2D56-4B14-9071-42B0AB2F3064</a:ObjectID>
<a:Name>预留字段8</a:Name> <a:Name>预留字段8</a:Name>
<a:Code>Reverse8</a:Code> <a:Code>Reverse8</a:Code>
@ -123796,7 +123864,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7751"> <o:Column Id="o7757">
<a:ObjectID>2B14DC76-7D19-4A76-A34B-B191511EFA74</a:ObjectID> <a:ObjectID>2B14DC76-7D19-4A76-A34B-B191511EFA74</a:ObjectID>
<a:Name>预留字段9</a:Name> <a:Name>预留字段9</a:Name>
<a:Code>Reverse9</a:Code> <a:Code>Reverse9</a:Code>
@ -123808,7 +123876,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7752"> <o:Column Id="o7758">
<a:ObjectID>0A8DC580-6DF2-457C-8A23-9B28825CEB36</a:ObjectID> <a:ObjectID>0A8DC580-6DF2-457C-8A23-9B28825CEB36</a:ObjectID>
<a:Name>预留字段10</a:Name> <a:Name>预留字段10</a:Name>
<a:Code>Reverse10</a:Code> <a:Code>Reverse10</a:Code>
@ -123820,7 +123888,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>nvarchar(1000)</a:DataType> <a:DataType>nvarchar(1000)</a:DataType>
<a:Length>1000</a:Length> <a:Length>1000</a:Length>
</o:Column> </o:Column>
<o:Column Id="o7753"> <o:Column Id="o7759">
<a:ObjectID>7631A223-D8AD-4EDD-8E48-8B32F4966A94</a:ObjectID> <a:ObjectID>7631A223-D8AD-4EDD-8E48-8B32F4966A94</a:ObjectID>
<a:Name>预留字段I1</a:Name> <a:Name>预留字段I1</a:Name>
<a:Code>ReverseI1</a:Code> <a:Code>ReverseI1</a:Code>
@ -123832,7 +123900,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DefaultValue>0</a:DefaultValue> <a:DefaultValue>0</a:DefaultValue>
<a:DataType>int</a:DataType> <a:DataType>int</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o7754"> <o:Column Id="o7760">
<a:ObjectID>332CDAB6-C6CC-48BB-A1DE-1E3352BD3BFF</a:ObjectID> <a:ObjectID>332CDAB6-C6CC-48BB-A1DE-1E3352BD3BFF</a:ObjectID>
<a:Name>预留字段I2</a:Name> <a:Name>预留字段I2</a:Name>
<a:Code>ReverseI2</a:Code> <a:Code>ReverseI2</a:Code>
@ -123846,7 +123914,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o7755"> <o:Key Id="o7761">
<a:ObjectID>081CBB58-53E2-472A-8704-04FF1B29D1E6</a:ObjectID> <a:ObjectID>081CBB58-53E2-472A-8704-04FF1B29D1E6</a:ObjectID>
<a:Name>Key_1</a:Name> <a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code> <a:Code>Key_1</a:Code>
@ -123860,10 +123928,10 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o7755"/> <o:Key Ref="o7761"/>
</c:PrimaryKey> </c:PrimaryKey>
<c:ClusterObject> <c:ClusterObject>
<o:Key Ref="o7755"/> <o:Key Ref="o7761"/>
</c:ClusterObject> </c:ClusterObject>
</o:Table> </o:Table>
</c:Tables> </c:Tables>
@ -123887,7 +123955,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6454"/> <o:Key Ref="o6454"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7756"> <o:ReferenceJoin Id="o7762">
<a:ObjectID>7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2</a:ObjectID> <a:ObjectID>7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2</a:ObjectID>
<a:CreationDate>1714101292</a:CreationDate> <a:CreationDate>1714101292</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -123921,7 +123989,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6425"/> <o:Key Ref="o6425"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7757"> <o:ReferenceJoin Id="o7763">
<a:ObjectID>D23C452C-4BB6-4C2A-AB2E-E8434D958A77</a:ObjectID> <a:ObjectID>D23C452C-4BB6-4C2A-AB2E-E8434D958A77</a:ObjectID>
<a:CreationDate>1714101335</a:CreationDate> <a:CreationDate>1714101335</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -123955,7 +124023,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6425"/> <o:Key Ref="o6425"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7758"> <o:ReferenceJoin Id="o7764">
<a:ObjectID>D4016F9D-5631-4F9E-A70D-D42133A4EBB7</a:ObjectID> <a:ObjectID>D4016F9D-5631-4F9E-A70D-D42133A4EBB7</a:ObjectID>
<a:CreationDate>1714107872</a:CreationDate> <a:CreationDate>1714107872</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -123989,7 +124057,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6710"/> <o:Key Ref="o6710"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7759"> <o:ReferenceJoin Id="o7765">
<a:ObjectID>BEBA3346-CCC6-41D9-B95B-12B8F81188BF</a:ObjectID> <a:ObjectID>BEBA3346-CCC6-41D9-B95B-12B8F81188BF</a:ObjectID>
<a:CreationDate>1714108449</a:CreationDate> <a:CreationDate>1714108449</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124023,7 +124091,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6789"/> <o:Key Ref="o6789"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7760"> <o:ReferenceJoin Id="o7766">
<a:ObjectID>FC69BEF9-F863-4A65-903E-CB2850197526</a:ObjectID> <a:ObjectID>FC69BEF9-F863-4A65-903E-CB2850197526</a:ObjectID>
<a:CreationDate>1714109221</a:CreationDate> <a:CreationDate>1714109221</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124057,7 +124125,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6830"/> <o:Key Ref="o6830"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7761"> <o:ReferenceJoin Id="o7767">
<a:ObjectID>ACE0AB02-0D27-4F1C-BF71-738C20DF96C2</a:ObjectID> <a:ObjectID>ACE0AB02-0D27-4F1C-BF71-738C20DF96C2</a:ObjectID>
<a:CreationDate>1714120556</a:CreationDate> <a:CreationDate>1714120556</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124091,7 +124159,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6664"/> <o:Key Ref="o6664"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7762"> <o:ReferenceJoin Id="o7768">
<a:ObjectID>B95672ED-9976-4742-9FFC-52B326620682</a:ObjectID> <a:ObjectID>B95672ED-9976-4742-9FFC-52B326620682</a:ObjectID>
<a:CreationDate>1715565535</a:CreationDate> <a:CreationDate>1715565535</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124125,7 +124193,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6664"/> <o:Key Ref="o6664"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7763"> <o:ReferenceJoin Id="o7769">
<a:ObjectID>B6E89235-A6E0-460D-9228-DCA8C58EE2AD</a:ObjectID> <a:ObjectID>B6E89235-A6E0-460D-9228-DCA8C58EE2AD</a:ObjectID>
<a:CreationDate>1715570661</a:CreationDate> <a:CreationDate>1715570661</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124159,7 +124227,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6964"/> <o:Key Ref="o6964"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7764"> <o:ReferenceJoin Id="o7770">
<a:ObjectID>5D4938F3-7934-4F74-891C-97DC9DC47B1B</a:ObjectID> <a:ObjectID>5D4938F3-7934-4F74-891C-97DC9DC47B1B</a:ObjectID>
<a:CreationDate>1716798640</a:CreationDate> <a:CreationDate>1716798640</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124193,7 +124261,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6789"/> <o:Key Ref="o6789"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7765"> <o:ReferenceJoin Id="o7771">
<a:ObjectID>179079CB-7169-4B19-A07A-A61C331F59CD</a:ObjectID> <a:ObjectID>179079CB-7169-4B19-A07A-A61C331F59CD</a:ObjectID>
<a:CreationDate>1716876897</a:CreationDate> <a:CreationDate>1716876897</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124227,7 +124295,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6789"/> <o:Key Ref="o6789"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7766"> <o:ReferenceJoin Id="o7772">
<a:ObjectID>DD965546-2361-4301-82D7-446B823BDCFD</a:ObjectID> <a:ObjectID>DD965546-2361-4301-82D7-446B823BDCFD</a:ObjectID>
<a:CreationDate>1717481682</a:CreationDate> <a:CreationDate>1717481682</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124261,7 +124329,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7092"/> <o:Key Ref="o7092"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7767"> <o:ReferenceJoin Id="o7773">
<a:ObjectID>E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC</a:ObjectID> <a:ObjectID>E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC</a:ObjectID>
<a:CreationDate>1717726229</a:CreationDate> <a:CreationDate>1717726229</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124295,7 +124363,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7092"/> <o:Key Ref="o7092"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7768"> <o:ReferenceJoin Id="o7774">
<a:ObjectID>8C71D6B9-780B-4547-ADFD-986E619F4DCD</a:ObjectID> <a:ObjectID>8C71D6B9-780B-4547-ADFD-986E619F4DCD</a:ObjectID>
<a:CreationDate>1719381914</a:CreationDate> <a:CreationDate>1719381914</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124329,7 +124397,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7131"/> <o:Key Ref="o7131"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7769"> <o:ReferenceJoin Id="o7775">
<a:ObjectID>EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE</a:ObjectID> <a:ObjectID>EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE</a:ObjectID>
<a:CreationDate>1719468257</a:CreationDate> <a:CreationDate>1719468257</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124363,7 +124431,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o6745"/> <o:Key Ref="o6745"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7770"> <o:ReferenceJoin Id="o7776">
<a:ObjectID>ACF1454B-2C3F-40E5-ADC5-4A48787EB937</a:ObjectID> <a:ObjectID>ACF1454B-2C3F-40E5-ADC5-4A48787EB937</a:ObjectID>
<a:CreationDate>1720488320</a:CreationDate> <a:CreationDate>1720488320</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124397,7 +124465,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7558"/> <o:Key Ref="o7558"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7771"> <o:ReferenceJoin Id="o7777">
<a:ObjectID>55351100-6B8C-411A-838F-ADF17D7249C7</a:ObjectID> <a:ObjectID>55351100-6B8C-411A-838F-ADF17D7249C7</a:ObjectID>
<a:CreationDate>1721372650</a:CreationDate> <a:CreationDate>1721372650</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124431,7 +124499,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7486"/> <o:Key Ref="o7486"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7772"> <o:ReferenceJoin Id="o7778">
<a:ObjectID>CE1833FA-A783-4FAC-87BF-AA0FF8008532</a:ObjectID> <a:ObjectID>CE1833FA-A783-4FAC-87BF-AA0FF8008532</a:ObjectID>
<a:CreationDate>1721280283</a:CreationDate> <a:CreationDate>1721280283</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124465,7 +124533,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7558"/> <o:Key Ref="o7558"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7773"> <o:ReferenceJoin Id="o7779">
<a:ObjectID>18F2EFF3-BD41-4F96-96C8-D8B15C7E2644</a:ObjectID> <a:ObjectID>18F2EFF3-BD41-4F96-96C8-D8B15C7E2644</a:ObjectID>
<a:CreationDate>1721372603</a:CreationDate> <a:CreationDate>1721372603</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124499,7 +124567,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:Key Ref="o7558"/> <o:Key Ref="o7558"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o7774"> <o:ReferenceJoin Id="o7780">
<a:ObjectID>F7ECB7BC-BA8B-4606-B521-999C20FD5C43</a:ObjectID> <a:ObjectID>F7ECB7BC-BA8B-4606-B521-999C20FD5C43</a:ObjectID>
<a:CreationDate>1722318917</a:CreationDate> <a:CreationDate>1722318917</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
@ -124521,7 +124589,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<o:PhysicalDiagram Ref="o4"/> <o:PhysicalDiagram Ref="o4"/>
</c:DefaultDiagram> </c:DefaultDiagram>
<c:Users> <c:Users>
<o:User Id="o7775"> <o:User Id="o7781">
<a:ObjectID>A1DD77B6-E48E-4C9D-947D-D42E3C5240C2</a:ObjectID> <a:ObjectID>A1DD77B6-E48E-4C9D-947D-D42E3C5240C2</a:ObjectID>
<a:Name>dbo</a:Name> <a:Name>dbo</a:Name>
<a:Code>dbo</a:Code> <a:Code>dbo</a:Code>
@ -124534,7 +124602,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</a:ExtendedAttributesText> </a:ExtendedAttributesText>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o7776"> <o:ExtendedCollection Id="o7782">
<a:ObjectID>C012A467-0031-4F3C-9D9D-13408491E147</a:ObjectID> <a:ObjectID>C012A467-0031-4F3C-9D9D-13408491E147</a:ObjectID>
<a:ExtendedBaseCollection.CollectionName>DefaultSchema</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>DefaultSchema</a:ExtendedBaseCollection.CollectionName>
<a:CreationDate>1597196432</a:CreationDate> <a:CreationDate>1597196432</a:CreationDate>
@ -124542,12 +124610,12 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:ModificationDate>1597196433</a:ModificationDate> <a:ModificationDate>1597196433</a:ModificationDate>
<a:Modifier>ttsoftxch</a:Modifier> <a:Modifier>ttsoftxch</a:Modifier>
<c:Content> <c:Content>
<o:User Ref="o7777"/> <o:User Ref="o7783"/>
</c:Content> </c:Content>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
</o:User> </o:User>
<o:User Id="o7777"> <o:User Id="o7783">
<a:ObjectID>41D2B655-5319-49C5-9BA6-133BB8B097CA</a:ObjectID> <a:ObjectID>41D2B655-5319-49C5-9BA6-133BB8B097CA</a:ObjectID>
<a:Name>dbo</a:Name> <a:Name>dbo</a:Name>
<a:Code>dbo</a:Code> <a:Code>dbo</a:Code>
@ -124559,7 +124627,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:User> </o:User>
</c:Users> </c:Users>
<c:Domains> <c:Domains>
<o:PhysicalDomain Id="o7778"> <o:PhysicalDomain Id="o7784">
<a:ObjectID>2153E033-C4DC-4F90-B2F4-3B0F44BD33D5</a:ObjectID> <a:ObjectID>2153E033-C4DC-4F90-B2F4-3B0F44BD33D5</a:ObjectID>
<a:Name>文本</a:Name> <a:Name>文本</a:Name>
<a:Code>TEXT</a:Code> <a:Code>TEXT</a:Code>
@ -124569,7 +124637,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Modifier>ttsoftxch</a:Modifier> <a:Modifier>ttsoftxch</a:Modifier>
<a:DataType>text</a:DataType> <a:DataType>text</a:DataType>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o7779"> <o:PhysicalDomain Id="o7785">
<a:ObjectID>AC8799D0-82CA-4B70-ADAC-18D8797720A9</a:ObjectID> <a:ObjectID>AC8799D0-82CA-4B70-ADAC-18D8797720A9</a:ObjectID>
<a:Name>图片</a:Name> <a:Name>图片</a:Name>
<a:Code>IMAGE</a:Code> <a:Code>IMAGE</a:Code>
@ -124579,7 +124647,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:DataType>image</a:DataType> <a:DataType>image</a:DataType>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o7780"> <o:PhysicalDomain Id="o7786">
<a:ObjectID>DEC04470-B84A-413E-9B2A-C265C5506182</a:ObjectID> <a:ObjectID>DEC04470-B84A-413E-9B2A-C265C5506182</a:ObjectID>
<a:Name>加密</a:Name> <a:Name>加密</a:Name>
<a:Code>ENCRYPT_STRING</a:Code> <a:Code>ENCRYPT_STRING</a:Code>
@ -124647,7 +124715,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(4000)</a:DataType> <a:DataType>varchar(4000)</a:DataType>
<a:Length>4000</a:Length> <a:Length>4000</a:Length>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o7781"> <o:PhysicalDomain Id="o7787">
<a:ObjectID>703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30</a:ObjectID> <a:ObjectID>703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30</a:ObjectID>
<a:Name>短字符串</a:Name> <a:Name>短字符串</a:Name>
<a:Code>SHORT_STRING</a:Code> <a:Code>SHORT_STRING</a:Code>
@ -124658,7 +124726,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(64)</a:DataType> <a:DataType>varchar(64)</a:DataType>
<a:Length>64</a:Length> <a:Length>64</a:Length>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o7782"> <o:PhysicalDomain Id="o7788">
<a:ObjectID>89A476D2-A1C0-428C-9875-26A50B7AFE1A</a:ObjectID> <a:ObjectID>89A476D2-A1C0-428C-9875-26A50B7AFE1A</a:ObjectID>
<a:Name>长字符串</a:Name> <a:Name>长字符串</a:Name>
<a:Code>LONG_STRING</a:Code> <a:Code>LONG_STRING</a:Code>
@ -124680,7 +124748,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(2000)</a:DataType> <a:DataType>varchar(2000)</a:DataType>
<a:Length>2000</a:Length> <a:Length>2000</a:Length>
<c:PhysicalDomain.Owner> <c:PhysicalDomain.Owner>
<o:User Ref="o7777"/> <o:User Ref="o7783"/>
</c:PhysicalDomain.Owner> </c:PhysicalDomain.Owner>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o566"> <o:PhysicalDomain Id="o566">
@ -124758,7 +124826,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:DataType>varchar(32)</a:DataType> <a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length> <a:Length>32</a:Length>
</o:PhysicalDomain> </o:PhysicalDomain>
<o:PhysicalDomain Id="o7783"> <o:PhysicalDomain Id="o7789">
<a:ObjectID>CB2F08D6-BE17-4046-B94A-4FD00EDA9015</a:ObjectID> <a:ObjectID>CB2F08D6-BE17-4046-B94A-4FD00EDA9015</a:ObjectID>
<a:Name>文件</a:Name> <a:Name>文件</a:Name>
<a:Code>FILE</a:Code> <a:Code>FILE</a:Code>
@ -124781,7 +124849,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:PhysicalDomain> </o:PhysicalDomain>
</c:Domains> </c:Domains>
<c:DefaultGroups> <c:DefaultGroups>
<o:Group Id="o7784"> <o:Group Id="o7790">
<a:ObjectID>B41C21E8-76E9-4031-8EF0-34743E5525C5</a:ObjectID> <a:ObjectID>B41C21E8-76E9-4031-8EF0-34743E5525C5</a:ObjectID>
<a:Name>PUBLIC</a:Name> <a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code> <a:Code>PUBLIC</a:Code>
@ -124790,13 +124858,13 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:ModificationDate>1597196433</a:ModificationDate> <a:ModificationDate>1597196433</a:ModificationDate>
<a:Modifier>ttsoftxch</a:Modifier> <a:Modifier>ttsoftxch</a:Modifier>
<c:Group.Users> <c:Group.Users>
<o:User Ref="o7775"/> <o:User Ref="o7781"/>
<o:User Ref="o7777"/> <o:User Ref="o7783"/>
</c:Group.Users> </c:Group.Users>
</o:Group> </o:Group>
</c:DefaultGroups> </c:DefaultGroups>
<c:TargetModels> <c:TargetModels>
<o:TargetModel Id="o7785"> <o:TargetModel Id="o7791">
<a:ObjectID>02EF92C9-49BF-45C7-934A-23BA290D5595</a:ObjectID> <a:ObjectID>02EF92C9-49BF-45C7-934A-23BA290D5595</a:ObjectID>
<a:Name>Microsoft SQL Server 2008</a:Name> <a:Name>Microsoft SQL Server 2008</a:Name>
<a:Code>MSSQLSRV2008</a:Code> <a:Code>MSSQLSRV2008</a:Code>

4
Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs
Unescape View File

@ -31,9 +31,9 @@ public class Ghre_RequestController : BaseController<IGhre_RequestServices, Ghre
#region 更新 #region 更新
[HttpPost("UpdateStatus/{status}")] [HttpPost("UpdateStatus/{status}")]
public async Task<ServiceResult> UpdateStatus(string status, [FromBody] long[] ids) public async Task<ServiceResult> UpdateStatus(string status, [FromBody] InsertGhre_RequestInput input)
{ {
return await _service.UpdateStatus(ids, status); return await _service.UpdateStatus(input, status);
} }
#endregion #endregion

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

@ -4105,6 +4105,36 @@
ConfirmComment ConfirmComment
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeUserId">
<summary>
同意人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeTime">
<summary>
同意时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeReason">
<summary>
同意理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseUserId">
<summary>
拒绝人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseTime">
<summary>
拒绝时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseReason">
<summary>
拒绝理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.Reverse1"> <member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.Reverse1">
<summary> <summary>
预留字段1 预留字段1
@ -11066,6 +11096,36 @@
ConfirmComment ConfirmComment
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeUserId">
<summary>
同意人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeTime">
<summary>
同意时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeReason">
<summary>
同意理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseUserId">
<summary>
拒绝人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseTime">
<summary>
拒绝时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseReason">
<summary>
拒绝理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.Reverse1"> <member name="P:Tiobon.Core.Model.Models.Ghre_Request.Reverse1">
<summary> <summary>
预留字段1 预留字段1

2
Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs
Unescape View File

@ -9,7 +9,7 @@ namespace Tiobon.Core.IServices;
/// </summary> /// </summary>
public interface IGhre_RequestServices : IBaseServices<Ghre_Request, Ghre_RequestDto, InsertGhre_RequestInput, EditGhre_RequestInput> public interface IGhre_RequestServices : IBaseServices<Ghre_Request, Ghre_RequestDto, InsertGhre_RequestInput, EditGhre_RequestInput>
{ {
Task<ServiceResult> UpdateStatus(long[] ids, string status); Task<ServiceResult> UpdateStatus(InsertGhre_RequestInput input, string status);
Task<ServiceResult<long>> InsertByStatus(InsertGhre_RequestInput insertModel, string status); Task<ServiceResult<long>> InsertByStatus(InsertGhre_RequestInput insertModel, string status);
} }

34
Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
Unescape View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
*V0.01 2024/9/10 14:28:24 SimonHsiao 初版 *V0.01 2024/9/12 13:18:47 SimonHsiao 初版
* *
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐
@ -196,6 +196,38 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
public string ConfirmComment { get; set; } public string ConfirmComment { get; set; }
/// <summary>
/// 同意人
/// </summary>
public long? AgreeUserId { get; set; }
/// <summary>
/// 同意时间
/// </summary>
public DateTime? AgreeTime { get; set; }
/// <summary>
/// 同意理由
/// </summary>
[Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")]
public string AgreeReason { get; set; }
/// <summary>
/// 拒绝人
/// </summary>
public long? RefuseUserId { get; set; }
/// <summary>
/// 拒绝时间
/// </summary>
public DateTime? RefuseTime { get; set; }
/// <summary>
/// 拒绝理由
/// </summary>
[Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")]
public string RefuseReason { get; set; }
/// <summary> /// <summary>
/// 预留字段1 /// 预留字段1
/// </summary> /// </summary>

1
Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs
Unescape View File

@ -25,5 +25,6 @@ namespace Tiobon.Core.Model.Models
{ {
public List<int> TrainStaffIds { get; set; } public List<int> TrainStaffIds { get; set; }
public List<long> Ids { get; set; }
} }
} }

36
Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
Unescape View File

@ -6,7 +6,7 @@
* *
* Ver 变更日期 负责人 变更内容 * Ver 变更日期 负责人 变更内容
* ─────────────────────────────────── * ───────────────────────────────────
*V0.01 2024/9/10 14:28:24 SimonHsiao 初版 *V0.01 2024/9/12 13:18:47 SimonHsiao 初版
* *
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐ *┌──────────────────────────────────┐
@ -25,7 +25,7 @@ namespace Tiobon.Core.Model.Models
/// <summary> /// <summary>
/// 培训需求 (Model) /// 培训需求 (Model)
/// </summary> /// </summary>
[SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "Ghre_Request", TableName = "Ghre_Request")] [SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "培训需求", TableName = "Ghre_Request")]
public class Ghre_Request : BasePoco public class Ghre_Request : BasePoco
{ {
@ -198,6 +198,38 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
public string ConfirmComment { get; set; } public string ConfirmComment { get; set; }
/// <summary>
/// 同意人
/// </summary>
public long? AgreeUserId { get; set; }
/// <summary>
/// 同意时间
/// </summary>
public DateTime? AgreeTime { get; set; }
/// <summary>
/// 同意理由
/// </summary>
[Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")]
public string AgreeReason { get; set; }
/// <summary>
/// 拒绝人
/// </summary>
public long? RefuseUserId { get; set; }
/// <summary>
/// 拒绝时间
/// </summary>
public DateTime? RefuseTime { get; set; }
/// <summary>
/// 拒绝理由
/// </summary>
[Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")]
public string RefuseReason { get; set; }
/// <summary> /// <summary>
/// 预留字段1 /// 预留字段1
/// </summary> /// </summary>

5
Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs
Unescape View File

@ -47,7 +47,12 @@ public class Ghre_RequestDto : Ghre_Request
public string TeacherClassLabel { get; set; } public string TeacherClassLabel { get; set; }
public string SponsorName { get; set; } public string SponsorName { get; set; }
public string TrainStaffNames { get; set; } public string TrainStaffNames { get; set; }
public string AgreeUserName { get; set; }
public string RefuseUserName { get; set; }
public string WorkStateLabel { get; set; }
} }

40
Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
Unescape View File

@ -9,6 +9,7 @@ using Tiobon.Core.Common.UserManager;
using Tiobon.Core.Model; using Tiobon.Core.Model;
using Tiobon.Core.Common.Helper; using Tiobon.Core.Common.Helper;
using Tiobon.Core.Common; using Tiobon.Core.Common;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services; namespace Tiobon.Core.Services;
@ -39,7 +40,8 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
var sponsorIds = result.result.DT_TableDataT1.Where(x => x.SponsorId != null).Select(x => x.SponsorId).Distinct().ToList(); var sponsorIds = result.result.DT_TableDataT1.Where(x => x.SponsorId != null).Select(x => x.SponsorId).Distinct().ToList();
var userIds = result.result.DT_TableDataT1.Where(x => x.RefuseUserId != null).Select(x => x.RefuseUserId).Distinct().ToList();
userIds.AddRange(result.result.DT_TableDataT1.Where(x => x.AgreeUserId != null).Select(x => x.AgreeUserId).Distinct());
result.result.DT_TableDataT1.ForEach(x => result.result.DT_TableDataT1.ForEach(x =>
{ {
string trainStaffId = x.TrainStaffId; string trainStaffId = x.TrainStaffId;
@ -54,6 +56,7 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
}); });
sponsorIds = sponsorIds.Distinct().ToList(); sponsorIds = sponsorIds.Distinct().ToList();
var staffs = await Db.Queryable<Ghra_Staff>().Where(x => sponsorIds.Contains(x.StaffID)).ToListAsync(); var staffs = await Db.Queryable<Ghra_Staff>().Where(x => sponsorIds.Contains(x.StaffID)).ToListAsync();
var users = await Db.Queryable<Ghrs_User>().Where(x => userIds.Contains(x.UserId)).ToListAsync();
result.result.DT_TableDataT1.ForEach(async x => result.result.DT_TableDataT1.ForEach(async x =>
{ {
x.CourseSourceLabel = await GetParaLabel("TrainingRequestCourseSource", x.CourseSource); x.CourseSourceLabel = await GetParaLabel("TrainingRequestCourseSource", x.CourseSource);
@ -73,6 +76,20 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
x.SponsorName = staffs.Where(o => x.SponsorId == o.StaffID).FirstOrDefault()?.StaffName; x.SponsorName = staffs.Where(o => x.SponsorId == o.StaffID).FirstOrDefault()?.StaffName;
if (x.TrainStaffIds.IsNotEmptyOrNull()) if (x.TrainStaffIds.IsNotEmptyOrNull())
x.TrainStaffNames = string.Join("、", staffs.Where(o => x.TrainStaffIds.Contains(o.StaffID)).Select(o => o.StaffName)); x.TrainStaffNames = string.Join("、", staffs.Where(o => x.TrainStaffIds.Contains(o.StaffID)).Select(o => o.StaffName));
if (x.AgreeUserId != null)
x.AgreeUserName = users.Where(o => x.AgreeUserId == o.UserId).FirstOrDefault()?.UserName;
if (x.RefuseUserId != null)
x.RefuseUserName = users.Where(o => x.RefuseUserId == o.UserId).FirstOrDefault()?.UserName;
if (x.WorkState.IsNotEmptyOrNull())
{
if (x.WorkState == 0) x.WorkStateLabel = "审批中";
if (x.WorkState == 1) x.WorkStateLabel = "审批通过";
}
}); });
return result; return result;
@ -127,7 +144,7 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
} }
public async Task<ServiceResult> UpdateStatus(long[] ids, string status) public async Task<ServiceResult> UpdateStatus(InsertGhre_RequestInput input, string status)
{ {
HttpRequest request = UserContext.Context.Request; HttpRequest request = UserContext.Context.Request;
@ -135,13 +152,28 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
var ip = GetUserIp(UserContext.Context); var ip = GetUserIp(UserContext.Context);
var entities = new List<Ghre_Request>(); var entities = new List<Ghre_Request>();
foreach (var id in ids) foreach (var id in input.Ids)
{ {
if (id == null || !BaseDal.Any(id)) if (!BaseDal.Any(id))
continue; continue;
var entity = await BaseDal.QueryById(id); var entity = await BaseDal.QueryById(id);
switch (status)
{
case DIC_REQUEST_STATUS.Active:
entity.AgreeReason = input.Reason;
entity.AgreeTime = DateTime.Now;
entity.AgreeUserId = App.User.ID;
break;
case DIC_REQUEST_STATUS.Temporary:
entity.RefuseReason = input.Reason;
entity.RefuseTime = DateTime.Now;
entity.RefuseUserId = App.User.ID;
break;
}
entity.UpdateIP = ip; entity.UpdateIP = ip;
entity.UpdateProg = api; entity.UpdateProg = api;
entity.Status = status; entity.Status = status;

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

@ -4105,6 +4105,36 @@
ConfirmComment ConfirmComment
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeUserId">
<summary>
同意人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeTime">
<summary>
同意时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.AgreeReason">
<summary>
同意理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseUserId">
<summary>
拒绝人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseTime">
<summary>
拒绝时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.RefuseReason">
<summary>
拒绝理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.Reverse1"> <member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.Reverse1">
<summary> <summary>
预留字段1 预留字段1
@ -11066,6 +11096,36 @@
ConfirmComment ConfirmComment
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeUserId">
<summary>
同意人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeTime">
<summary>
同意时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.AgreeReason">
<summary>
同意理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseUserId">
<summary>
拒绝人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseTime">
<summary>
拒绝时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.RefuseReason">
<summary>
拒绝理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.Reverse1"> <member name="P:Tiobon.Core.Model.Models.Ghre_Request.Reverse1">
<summary> <summary>
预留字段1 预留字段1

Write Preview
Loading…
Cancel
Save