主题管理

lib/华北油田Ai检索.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698653795" Name="SmartSearch" Objects="330" Symbols="39" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698738783" Name="SmartSearch" Objects="343" Symbols="39" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -1612,8 +1612,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o9">
 <a:CreationDate>1698205956</a:CreationDate>
 <a:ModificationDate>1698205956</a:ModificationDate>
-<a:Rect>((-26276,15906), (-3576,17156))</a:Rect>
-<a:ListOfPoints>((-3976,16531),(-25876,16531))</a:ListOfPoints>
+<a:Rect>((-26276,15906), (-3459,17156))</a:Rect>
+<a:ListOfPoints>((-3859,16531),(-25876,16531))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1634,8 +1634,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o12">
 <a:CreationDate>1698206245</a:CreationDate>
 <a:ModificationDate>1698308970</a:ModificationDate>
-<a:Rect>((-6221,8570), (-4971,11681))</a:Rect>
-<a:ListOfPoints>((-5596,8970),(-5596,11281))</a:ListOfPoints>
+<a:Rect>((-6221,8570), (-4971,11231))</a:Rect>
+<a:ListOfPoints>((-5596,8970),(-5596,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1678,8 +1678,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o17">
 <a:CreationDate>1698285621</a:CreationDate>
 <a:ModificationDate>1698308890</a:ModificationDate>
-<a:Rect>((-9822,-6453), (-8422,11681))</a:Rect>
-<a:ListOfPoints>((-8822,-6053),(-9422,-6053),(-9422,11281))</a:ListOfPoints>
+<a:Rect>((-10097,-6453), (-8422,11231))</a:Rect>
+<a:ListOfPoints>((-8822,-6053),(-9697,-6053),(-9697,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1721,9 +1721,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o22">
 <a:CreationDate>1698290862</a:CreationDate>
-<a:ModificationDate>1698374381</a:ModificationDate>
-<a:Rect>((-11474,-19826), (-7996,11681))</a:Rect>
-<a:ListOfPoints>((-8396,-19426),(-11074,-19426),(-11074,11281))</a:ListOfPoints>
+<a:ModificationDate>1698738625</a:ModificationDate>
+<a:Rect>((-11297,-22102), (-7996,11231))</a:Rect>
+<a:ListOfPoints>((-8396,-21702),(-10897,-21702),(-10897,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1743,9 +1743,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o25">
 <a:CreationDate>1698290863</a:CreationDate>
-<a:ModificationDate>1698653795</a:ModificationDate>
-<a:Rect>((-39575,-21026), (-7996,-15315))</a:Rect>
-<a:ListOfPoints>((-8396,-20626),(-39175,-20626),(-39175,-15715))</a:ListOfPoints>
+<a:ModificationDate>1698738625</a:ModificationDate>
+<a:Rect>((-39575,-23302), (-7996,-15315))</a:Rect>
+<a:ListOfPoints>((-8396,-22902),(-39175,-22902),(-39175,-15715))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1821,7 +1821,7 @@ LABL 0 Microsoft Sans Serif,8,N</a:FontList>
 <a:CreationDate>1698205714</a:CreationDate>
 <a:ModificationDate>1698311821</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-11610,11281), (418,21780))</a:Rect>
+<a:Rect>((-12043,10831), (851,22230))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1894,9 +1894,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o23">
 <a:CreationDate>1698287188</a:CreationDate>
-<a:ModificationDate>1698374381</a:ModificationDate>
+<a:ModificationDate>1698738625</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-8396,-25988), (6350,-15264))</a:Rect>
+<a:Rect>((-8396,-28140), (7560,-15264))</a:Rect>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
@@ -4441,7 +4441,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_subject</a:Code>
 <a:CreationDate>1698201202</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698394794</a:ModificationDate>
+<a:ModificationDate>1698738604</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -4586,9 +4586,22 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>300</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
+<o:Column Id="o196">
+<a:ObjectID>B34F936E-415D-4728-A9C2-F614503B36D3</a:ObjectID>
+<a:Name>创建人姓名</a:Name>
+<a:Code>createdName</a:Code>
+<a:CreationDate>1698738404</a:CreationDate>
+<a:Creator>qiao</a:Creator>
+<a:ModificationDate>1698738776</a:ModificationDate>
+<a:Modifier>qiao</a:Modifier>
+<a:Comment>创建姓名</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o196">
+<o:Key Id="o197">
 <a:ObjectID>8C463177-B174-4688-BC1C-A330116ED273</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -4603,7 +4616,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o28">
@@ -4612,11 +4625,11 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_subjectField</a:Code>
 <a:CreationDate>1698201642</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698311824</a:ModificationDate>
+<a:ModificationDate>1698738729</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o197">
+<o:Column Id="o198">
 <a:ObjectID>DE07F82F-F18A-4CF6-BC59-CE01EB33155F</a:ObjectID>
 <a:Name>主键ID</a:Name>
 <a:Code>fieldId</a:Code>
@@ -4633,7 +4646,7 @@ LABL 0 新宋体,8,N</a:FontList>
 
 </a:ExtendedAttributesText>
 </o:Column>
-<o:Column Id="o198">
+<o:Column Id="o199">
 <a:ObjectID>0EA70651-AB8E-4B69-920A-CFD23B689E2E</a:ObjectID>
 <a:Name>主题id</a:Name>
 <a:Code>subId</a:Code>
@@ -4649,7 +4662,7 @@ LABL 0 新宋体,8,N</a:FontList>
 
 </a:ExtendedAttributesText>
 </o:Column>
-<o:Column Id="o199">
+<o:Column Id="o200">
 <a:ObjectID>BCEE14FA-3788-48C0-9EBE-E4C80F4E7AF7</a:ObjectID>
 <a:Name>字段编码</a:Name>
 <a:Code>fieldCode</a:Code>
@@ -4661,7 +4674,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>100</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o200">
+<o:Column Id="o201">
 <a:ObjectID>C8D615D6-17B3-48BF-BF44-0FA688D56568</a:ObjectID>
 <a:Name>字段名称</a:Name>
 <a:Code>fieldName</a:Code>
@@ -4674,7 +4687,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>100</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o201">
+<o:Column Id="o202">
 <a:ObjectID>22378FAB-0420-4D34-9CD1-9A54D6024E07</a:ObjectID>
 <a:Name>显示别名</a:Name>
 <a:Code>fieldAlias</a:Code>
@@ -4686,7 +4699,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o202">
+<o:Column Id="o203">
 <a:ObjectID>39CC9058-943B-45BD-BAB4-B167904A563D</a:ObjectID>
 <a:Name>配置类型</a:Name>
 <a:Code>settingTypeId</a:Code>
@@ -4698,7 +4711,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o203">
+<o:Column Id="o204">
 <a:ObjectID>92B066C8-2EFF-4F96-A720-F249C03EA681</a:ObjectID>
 <a:Name>字段描述</a:Name>
 <a:Code>fieldDesc</a:Code>
@@ -4709,7 +4722,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o204">
+<o:Column Id="o205">
 <a:ObjectID>90089132-92EE-4BE4-A9B3-E3D7482F8121</a:ObjectID>
 <a:Name>数据类型</a:Name>
 <a:Code>dataType</a:Code>
@@ -4721,7 +4734,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o205">
+<o:Column Id="o206">
 <a:ObjectID>288FADA1-80F8-497A-9A11-C10A1FA76D72</a:ObjectID>
 <a:Name>查询类型</a:Name>
 <a:Code>queryTypeId</a:Code>
@@ -4733,7 +4746,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o206">
+<o:Column Id="o207">
 <a:ObjectID>F76D6BEE-600D-4B63-A151-802D709B6FD2</a:ObjectID>
 <a:Name>取数字典编码</a:Name>
 <a:Code>dictionaryCode</a:Code>
@@ -4745,30 +4758,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o207">
-<a:ObjectID>047FC6A5-555B-4369-9E1B-C53330DAF574</a:ObjectID>
-<a:Name>修改时间</a:Name>
-<a:Code>modifyTime</a:Code>
-<a:CreationDate>1698201642</a:CreationDate>
-<a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698313119</a:ModificationDate>
-<a:Modifier>qiao</a:Modifier>
-<a:DataType>datetime</a:DataType>
-</o:Column>
 <o:Column Id="o208">
-<a:ObjectID>D0A84891-D4DA-4F4B-BB1D-78385BE60CC5</a:ObjectID>
-<a:Name>创建人</a:Name>
-<a:Code>createdBy</a:Code>
-<a:CreationDate>1698201642</a:CreationDate>
-<a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698311981</a:ModificationDate>
-<a:Modifier>qiao</a:Modifier>
-<a:Comment>创建人</a:Comment>
-<a:DataType>varchar(50)</a:DataType>
-<a:Length>50</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
-</o:Column>
-<o:Column Id="o209">
 <a:ObjectID>90E8CA62-9DBB-4E89-9A9B-D1CAFDB808AD</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>status</a:Code>
@@ -4780,7 +4770,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o210">
+<o:Column Id="o209">
 <a:ObjectID>6E9EC4C2-A3D6-4920-BDF1-098B077AE9C3</a:ObjectID>
 <a:Name>显示排序</a:Name>
 <a:Code>disOrder</a:Code>
@@ -4791,7 +4781,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o211">
+<o:Column Id="o210">
 <a:ObjectID>4EA16E72-B69A-445D-8650-697B03663360</a:ObjectID>
 <a:Name>是否查询字段</a:Name>
 <a:Code>isSearchField</a:Code>
@@ -4803,7 +4793,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o212">
+<o:Column Id="o211">
 <a:ObjectID>21BBDCF1-6C67-4455-9454-878F26FDC9E2</a:ObjectID>
 <a:Name>是否关联字段isForeignKey</a:Name>
 <a:Code>isForeignKey</a:Code>
@@ -4815,7 +4805,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o213">
+<o:Column Id="o212">
 <a:ObjectID>1E0A82A4-EF30-49BC-A401-F0E35C0B83F7</a:ObjectID>
 <a:Name>外键表referencesTab</a:Name>
 <a:Code>referencesTab</a:Code>
@@ -4826,7 +4816,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o214">
+<o:Column Id="o213">
 <a:ObjectID>359D02C3-75B2-42D7-A369-16E9C3A21FF5</a:ObjectID>
 <a:Name>外键列foreignKey</a:Name>
 <a:Code>foreignKey</a:Code>
@@ -4837,7 +4827,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o215">
+<o:Column Id="o214">
 <a:ObjectID>B4358800-37F1-417E-AD61-B2465A71A87D</a:ObjectID>
 <a:Name>外键表显示列displayColumn</a:Name>
 <a:Code>displayColumn</a:Code>
@@ -4850,7 +4840,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o216">
+<o:Key Id="o215">
 <a:ObjectID>97E46F5B-B241-4D9D-8281-FF2BF7C68E3F</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -4860,12 +4850,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>qiao</a:Modifier>
 <a:PhysicalOptions>on &quot;PRIMARY&quot;</a:PhysicalOptions>
 <c:Key.Columns>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o29">
@@ -4874,11 +4864,11 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_saerchTemp</a:Code>
 <a:CreationDate>1698205714</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698313180</a:ModificationDate>
+<a:ModificationDate>1698738614</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o217">
+<o:Column Id="o216">
 <a:ObjectID>07723D61-F23B-4738-852B-FCD15EBD54F1</a:ObjectID>
 <a:Name>主键ID</a:Name>
 <a:Code>tempId</a:Code>
@@ -4890,7 +4880,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o218">
+<o:Column Id="o217">
 <a:ObjectID>25F97C2E-6257-4B4E-BF94-25C9798C7898</a:ObjectID>
 <a:Name>模板名称</a:Name>
 <a:Code>tempName</a:Code>
@@ -4901,7 +4891,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o219">
+<o:Column Id="o218">
 <a:ObjectID>8F99AB2F-3912-4378-A267-639613AC1565</a:ObjectID>
 <a:Name>模板编码</a:Name>
 <a:Code>tempNo</a:Code>
@@ -4912,7 +4902,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o220">
+<o:Column Id="o219">
 <a:ObjectID>5BF64EEB-EBC9-4D48-80A0-32B396930B13</a:ObjectID>
 <a:Name>关联主题</a:Name>
 <a:Code>subId</a:Code>
@@ -4923,7 +4913,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o221">
+<o:Column Id="o220">
 <a:ObjectID>27390DFE-FBB4-46B0-88F4-0BC486B16933</a:ObjectID>
 <a:Name>备注</a:Name>
 <a:Code>remark</a:Code>
@@ -4934,7 +4924,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o222">
+<o:Column Id="o221">
 <a:ObjectID>B20FF063-CD54-4A1D-981C-9242FB5DC786</a:ObjectID>
 <a:Name>创建时间</a:Name>
 <a:Code>createTime</a:Code>
@@ -4946,7 +4936,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>datetime</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o223">
+<o:Column Id="o222">
 <a:ObjectID>E14D203B-B29F-481F-9BC1-0374ACEC3266</a:ObjectID>
 <a:Name>修改时间</a:Name>
 <a:Code>modifyTime</a:Code>
@@ -4956,7 +4946,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>qiao</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o224">
+<o:Column Id="o223">
 <a:ObjectID>E27ED3A6-C94A-4BB5-AF69-0ED440971E08</a:ObjectID>
 <a:Name>创建人</a:Name>
 <a:Code>createdBy</a:Code>
@@ -4969,7 +4959,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o225">
+<o:Column Id="o224">
 <a:ObjectID>567CB309-B465-4A2A-8502-51A20C13D280</a:ObjectID>
 <a:Name>修改人</a:Name>
 <a:Code>modifyBy</a:Code>
@@ -4982,7 +4972,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o226">
+<o:Column Id="o225">
 <a:ObjectID>4AA42152-DAAE-46B9-8A52-49058F20024E</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>status</a:Code>
@@ -4994,6 +4984,19 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
+<o:Column Id="o226">
+<a:ObjectID>83E6871D-58B4-421C-80C2-3E90F8CF6DE9</a:ObjectID>
+<a:Name>创建人姓名</a:Name>
+<a:Code>createdName</a:Code>
+<a:CreationDate>1698738607</a:CreationDate>
+<a:Creator>qiao</a:Creator>
+<a:ModificationDate>1698738783</a:ModificationDate>
+<a:Modifier>qiao</a:Modifier>
+<a:Comment>创建姓名</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
 </c:Columns>
 <c:Keys>
 <o:Key Id="o227">
@@ -5005,7 +5008,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698205831</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5902,7 +5905,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o28"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o276">
@@ -5915,7 +5918,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Column Ref="o185"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o198"/>
+<o:Column Ref="o199"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -5938,7 +5941,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o29"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o277">
@@ -5951,7 +5954,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Column Ref="o185"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o220"/>
+<o:Column Ref="o219"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -5984,7 +5987,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698206245</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o229"/>
@@ -6010,7 +6013,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o30"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o279">
@@ -6020,7 +6023,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698206247</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o230"/>
@@ -6056,7 +6059,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698285621</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o241"/>
@@ -6082,7 +6085,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o31"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o281">
@@ -6092,7 +6095,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698285622</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o242"/>
@@ -6128,7 +6131,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698290862</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o250"/>
@@ -6154,7 +6157,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o32"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o283">
@@ -6164,7 +6167,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698290863</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o251"/>

lib/华北油田Ai检索.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698653795" Name="SmartSearch" Objects="341" Symbols="39" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698738776" Name="SmartSearch" Objects="343" Symbols="39" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -1612,8 +1612,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o9">
 <a:CreationDate>1698205956</a:CreationDate>
 <a:ModificationDate>1698205956</a:ModificationDate>
-<a:Rect>((-26276,15906), (-3576,17156))</a:Rect>
-<a:ListOfPoints>((-3976,16531),(-25876,16531))</a:ListOfPoints>
+<a:Rect>((-26276,15906), (-3459,17156))</a:Rect>
+<a:ListOfPoints>((-3859,16531),(-25876,16531))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1634,8 +1634,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o12">
 <a:CreationDate>1698206245</a:CreationDate>
 <a:ModificationDate>1698308970</a:ModificationDate>
-<a:Rect>((-6221,8570), (-4971,11681))</a:Rect>
-<a:ListOfPoints>((-5596,8970),(-5596,11281))</a:ListOfPoints>
+<a:Rect>((-6221,8570), (-4971,11231))</a:Rect>
+<a:ListOfPoints>((-5596,8970),(-5596,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1678,8 +1678,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o17">
 <a:CreationDate>1698285621</a:CreationDate>
 <a:ModificationDate>1698308890</a:ModificationDate>
-<a:Rect>((-9822,-6453), (-8422,11681))</a:Rect>
-<a:ListOfPoints>((-8822,-6053),(-9422,-6053),(-9422,11281))</a:ListOfPoints>
+<a:Rect>((-10097,-6453), (-8422,11231))</a:Rect>
+<a:ListOfPoints>((-8822,-6053),(-9697,-6053),(-9697,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1721,9 +1721,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o22">
 <a:CreationDate>1698290862</a:CreationDate>
-<a:ModificationDate>1698374381</a:ModificationDate>
-<a:Rect>((-11474,-19826), (-7996,11681))</a:Rect>
-<a:ListOfPoints>((-8396,-19426),(-11074,-19426),(-11074,11281))</a:ListOfPoints>
+<a:ModificationDate>1698738625</a:ModificationDate>
+<a:Rect>((-11297,-22102), (-7996,11231))</a:Rect>
+<a:ListOfPoints>((-8396,-21702),(-10897,-21702),(-10897,10831))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1743,9 +1743,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o25">
 <a:CreationDate>1698290863</a:CreationDate>
-<a:ModificationDate>1698653795</a:ModificationDate>
-<a:Rect>((-39575,-21026), (-7996,-15315))</a:Rect>
-<a:ListOfPoints>((-8396,-20626),(-39175,-20626),(-39175,-15715))</a:ListOfPoints>
+<a:ModificationDate>1698738625</a:ModificationDate>
+<a:Rect>((-39575,-23302), (-7996,-15315))</a:Rect>
+<a:ListOfPoints>((-8396,-22902),(-39175,-22902),(-39175,-15715))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1821,7 +1821,7 @@ LABL 0 Microsoft Sans Serif,8,N</a:FontList>
 <a:CreationDate>1698205714</a:CreationDate>
 <a:ModificationDate>1698311821</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-11610,11281), (418,21780))</a:Rect>
+<a:Rect>((-12043,10831), (851,22230))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -1894,9 +1894,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o23">
 <a:CreationDate>1698287188</a:CreationDate>
-<a:ModificationDate>1698374381</a:ModificationDate>
+<a:ModificationDate>1698738625</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-8396,-25988), (6350,-15264))</a:Rect>
+<a:Rect>((-8396,-28140), (7560,-15264))</a:Rect>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
@@ -4441,7 +4441,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_subject</a:Code>
 <a:CreationDate>1698201202</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698394794</a:ModificationDate>
+<a:ModificationDate>1698738604</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -4586,9 +4586,22 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>300</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
+<o:Column Id="o196">
+<a:ObjectID>B34F936E-415D-4728-A9C2-F614503B36D3</a:ObjectID>
+<a:Name>创建人姓名</a:Name>
+<a:Code>createdName</a:Code>
+<a:CreationDate>1698738404</a:CreationDate>
+<a:Creator>qiao</a:Creator>
+<a:ModificationDate>1698738776</a:ModificationDate>
+<a:Modifier>qiao</a:Modifier>
+<a:Comment>创建姓名</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o196">
+<o:Key Id="o197">
 <a:ObjectID>8C463177-B174-4688-BC1C-A330116ED273</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -4603,7 +4616,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o28">
@@ -4612,11 +4625,11 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_subjectField</a:Code>
 <a:CreationDate>1698201642</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698311824</a:ModificationDate>
+<a:ModificationDate>1698738729</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o197">
+<o:Column Id="o198">
 <a:ObjectID>DE07F82F-F18A-4CF6-BC59-CE01EB33155F</a:ObjectID>
 <a:Name>主键ID</a:Name>
 <a:Code>fieldId</a:Code>
@@ -4633,7 +4646,7 @@ LABL 0 新宋体,8,N</a:FontList>
 
 </a:ExtendedAttributesText>
 </o:Column>
-<o:Column Id="o198">
+<o:Column Id="o199">
 <a:ObjectID>0EA70651-AB8E-4B69-920A-CFD23B689E2E</a:ObjectID>
 <a:Name>主题id</a:Name>
 <a:Code>subId</a:Code>
@@ -4649,7 +4662,7 @@ LABL 0 新宋体,8,N</a:FontList>
 
 </a:ExtendedAttributesText>
 </o:Column>
-<o:Column Id="o199">
+<o:Column Id="o200">
 <a:ObjectID>BCEE14FA-3788-48C0-9EBE-E4C80F4E7AF7</a:ObjectID>
 <a:Name>字段编码</a:Name>
 <a:Code>fieldCode</a:Code>
@@ -4661,7 +4674,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>100</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o200">
+<o:Column Id="o201">
 <a:ObjectID>C8D615D6-17B3-48BF-BF44-0FA688D56568</a:ObjectID>
 <a:Name>字段名称</a:Name>
 <a:Code>fieldName</a:Code>
@@ -4674,7 +4687,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>100</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o201">
+<o:Column Id="o202">
 <a:ObjectID>22378FAB-0420-4D34-9CD1-9A54D6024E07</a:ObjectID>
 <a:Name>显示别名</a:Name>
 <a:Code>fieldAlias</a:Code>
@@ -4686,7 +4699,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o202">
+<o:Column Id="o203">
 <a:ObjectID>39CC9058-943B-45BD-BAB4-B167904A563D</a:ObjectID>
 <a:Name>配置类型</a:Name>
 <a:Code>settingTypeId</a:Code>
@@ -4698,7 +4711,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o203">
+<o:Column Id="o204">
 <a:ObjectID>92B066C8-2EFF-4F96-A720-F249C03EA681</a:ObjectID>
 <a:Name>字段描述</a:Name>
 <a:Code>fieldDesc</a:Code>
@@ -4709,7 +4722,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o204">
+<o:Column Id="o205">
 <a:ObjectID>90089132-92EE-4BE4-A9B3-E3D7482F8121</a:ObjectID>
 <a:Name>数据类型</a:Name>
 <a:Code>dataType</a:Code>
@@ -4721,7 +4734,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>20</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o205">
+<o:Column Id="o206">
 <a:ObjectID>288FADA1-80F8-497A-9A11-C10A1FA76D72</a:ObjectID>
 <a:Name>查询类型</a:Name>
 <a:Code>queryTypeId</a:Code>
@@ -4733,7 +4746,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o206">
+<o:Column Id="o207">
 <a:ObjectID>F76D6BEE-600D-4B63-A151-802D709B6FD2</a:ObjectID>
 <a:Name>取数字典编码</a:Name>
 <a:Code>dictionaryCode</a:Code>
@@ -4745,30 +4758,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o207">
-<a:ObjectID>047FC6A5-555B-4369-9E1B-C53330DAF574</a:ObjectID>
-<a:Name>修改时间</a:Name>
-<a:Code>modifyTime</a:Code>
-<a:CreationDate>1698201642</a:CreationDate>
-<a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698313119</a:ModificationDate>
-<a:Modifier>qiao</a:Modifier>
-<a:DataType>datetime</a:DataType>
-</o:Column>
 <o:Column Id="o208">
-<a:ObjectID>D0A84891-D4DA-4F4B-BB1D-78385BE60CC5</a:ObjectID>
-<a:Name>创建人</a:Name>
-<a:Code>createdBy</a:Code>
-<a:CreationDate>1698201642</a:CreationDate>
-<a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698311981</a:ModificationDate>
-<a:Modifier>qiao</a:Modifier>
-<a:Comment>创建人</a:Comment>
-<a:DataType>varchar(50)</a:DataType>
-<a:Length>50</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
-</o:Column>
-<o:Column Id="o209">
 <a:ObjectID>90E8CA62-9DBB-4E89-9A9B-D1CAFDB808AD</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>status</a:Code>
@@ -4780,7 +4770,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o210">
+<o:Column Id="o209">
 <a:ObjectID>6E9EC4C2-A3D6-4920-BDF1-098B077AE9C3</a:ObjectID>
 <a:Name>显示排序</a:Name>
 <a:Code>disOrder</a:Code>
@@ -4791,7 +4781,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o211">
+<o:Column Id="o210">
 <a:ObjectID>4EA16E72-B69A-445D-8650-697B03663360</a:ObjectID>
 <a:Name>是否查询字段</a:Name>
 <a:Code>isSearchField</a:Code>
@@ -4803,7 +4793,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o212">
+<o:Column Id="o211">
 <a:ObjectID>21BBDCF1-6C67-4455-9454-878F26FDC9E2</a:ObjectID>
 <a:Name>是否关联字段isForeignKey</a:Name>
 <a:Code>isForeignKey</a:Code>
@@ -4815,7 +4805,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o213">
+<o:Column Id="o212">
 <a:ObjectID>1E0A82A4-EF30-49BC-A401-F0E35C0B83F7</a:ObjectID>
 <a:Name>外键表referencesTab</a:Name>
 <a:Code>referencesTab</a:Code>
@@ -4826,7 +4816,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o214">
+<o:Column Id="o213">
 <a:ObjectID>359D02C3-75B2-42D7-A369-16E9C3A21FF5</a:ObjectID>
 <a:Name>外键列foreignKey</a:Name>
 <a:Code>foreignKey</a:Code>
@@ -4837,7 +4827,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o215">
+<o:Column Id="o214">
 <a:ObjectID>B4358800-37F1-417E-AD61-B2465A71A87D</a:ObjectID>
 <a:Name>外键表显示列displayColumn</a:Name>
 <a:Code>displayColumn</a:Code>
@@ -4850,7 +4840,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o216">
+<o:Key Id="o215">
 <a:ObjectID>97E46F5B-B241-4D9D-8281-FF2BF7C68E3F</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -4860,12 +4850,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>qiao</a:Modifier>
 <a:PhysicalOptions>on &quot;PRIMARY&quot;</a:PhysicalOptions>
 <c:Key.Columns>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o29">
@@ -4874,11 +4864,11 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>sr_saerchTemp</a:Code>
 <a:CreationDate>1698205714</a:CreationDate>
 <a:Creator>qiao</a:Creator>
-<a:ModificationDate>1698313180</a:ModificationDate>
+<a:ModificationDate>1698738614</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o217">
+<o:Column Id="o216">
 <a:ObjectID>07723D61-F23B-4738-852B-FCD15EBD54F1</a:ObjectID>
 <a:Name>主键ID</a:Name>
 <a:Code>tempId</a:Code>
@@ -4890,7 +4880,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o218">
+<o:Column Id="o217">
 <a:ObjectID>25F97C2E-6257-4B4E-BF94-25C9798C7898</a:ObjectID>
 <a:Name>模板名称</a:Name>
 <a:Code>tempName</a:Code>
@@ -4901,7 +4891,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o219">
+<o:Column Id="o218">
 <a:ObjectID>8F99AB2F-3912-4378-A267-639613AC1565</a:ObjectID>
 <a:Name>模板编码</a:Name>
 <a:Code>tempNo</a:Code>
@@ -4912,7 +4902,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o220">
+<o:Column Id="o219">
 <a:ObjectID>5BF64EEB-EBC9-4D48-80A0-32B396930B13</a:ObjectID>
 <a:Name>关联主题</a:Name>
 <a:Code>subId</a:Code>
@@ -4923,7 +4913,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o221">
+<o:Column Id="o220">
 <a:ObjectID>27390DFE-FBB4-46B0-88F4-0BC486B16933</a:ObjectID>
 <a:Name>备注</a:Name>
 <a:Code>remark</a:Code>
@@ -4934,7 +4924,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o222">
+<o:Column Id="o221">
 <a:ObjectID>B20FF063-CD54-4A1D-981C-9242FB5DC786</a:ObjectID>
 <a:Name>创建时间</a:Name>
 <a:Code>createTime</a:Code>
@@ -4946,7 +4936,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>datetime</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o223">
+<o:Column Id="o222">
 <a:ObjectID>E14D203B-B29F-481F-9BC1-0374ACEC3266</a:ObjectID>
 <a:Name>修改时间</a:Name>
 <a:Code>modifyTime</a:Code>
@@ -4956,7 +4946,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>qiao</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o224">
+<o:Column Id="o223">
 <a:ObjectID>E27ED3A6-C94A-4BB5-AF69-0ED440971E08</a:ObjectID>
 <a:Name>创建人</a:Name>
 <a:Code>createdBy</a:Code>
@@ -4969,7 +4959,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o225">
+<o:Column Id="o224">
 <a:ObjectID>567CB309-B465-4A2A-8502-51A20C13D280</a:ObjectID>
 <a:Name>修改人</a:Name>
 <a:Code>modifyBy</a:Code>
@@ -4982,7 +4972,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o226">
+<o:Column Id="o225">
 <a:ObjectID>4AA42152-DAAE-46B9-8A52-49058F20024E</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>status</a:Code>
@@ -4994,6 +4984,19 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
+<o:Column Id="o226">
+<a:ObjectID>83E6871D-58B4-421C-80C2-3E90F8CF6DE9</a:ObjectID>
+<a:Name>创建人姓名</a:Name>
+<a:Code>createdName</a:Code>
+<a:CreationDate>1698738607</a:CreationDate>
+<a:Creator>qiao</a:Creator>
+<a:ModificationDate>1698738614</a:ModificationDate>
+<a:Modifier>qiao</a:Modifier>
+<a:Comment>创建人</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
 </c:Columns>
 <c:Keys>
 <o:Key Id="o227">
@@ -5005,7 +5008,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698205831</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5902,7 +5905,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o28"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o276">
@@ -5915,7 +5918,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Column Ref="o185"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o198"/>
+<o:Column Ref="o199"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -5938,7 +5941,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o29"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o196"/>
+<o:Key Ref="o197"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o277">
@@ -5951,7 +5954,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Column Ref="o185"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o220"/>
+<o:Column Ref="o219"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -5984,7 +5987,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698206245</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o229"/>
@@ -6010,7 +6013,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o30"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o279">
@@ -6020,7 +6023,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698206247</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o230"/>
@@ -6056,7 +6059,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698285621</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o241"/>
@@ -6082,7 +6085,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o31"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o281">
@@ -6092,7 +6095,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698285622</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o242"/>
@@ -6128,7 +6131,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698290862</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o217"/>
+<o:Column Ref="o216"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o250"/>
@@ -6154,7 +6157,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Table Ref="o32"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:ParentKey>
 <c:Joins>
 <o:ReferenceJoin Id="o283">
@@ -6164,7 +6167,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1698290863</a:ModificationDate>
 <a:Modifier>qiao</a:Modifier>
 <c:Object1>
-<o:Column Ref="o197"/>
+<o:Column Ref="o198"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o251"/>

src/main/java/com/bowintek/practice/controller/SubjectController.java

@@ -8,13 +8,20 @@ import com.bowintek.practice.model.SrSubjectfield;
 import com.bowintek.practice.services.service.AccountService;
 import com.bowintek.practice.services.service.SubjectService;
 import com.bowintek.practice.services.service.UserService;
+import com.bowintek.practice.util.DateUtils;
+import com.bowintek.practice.util.ExcelHelper;
 import com.bowintek.practice.util.JsonMapper;
 import com.bowintek.practice.util.MapUtils;
+import com.bowintek.practice.vo.PositionModel;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -32,15 +39,25 @@ public class SubjectController {
     private AccountService accountService;
     @Autowired
     private MapUtils mapUtils;
+    @Autowired
+    private DateUtils dateUtils;
+
+    @ResponseBody
+    @GetMapping("/getList")
+    public BaseResponse<PageInfo<SrSubject>> getList(@RequestParam("page") int page, @RequestParam("rows") int rows,
+                                                     String subjectName, String tabName, String tabCode) throws Exception {
+
+        PageInfo<SrSubject> result = subjectService.getList(page, rows, subjectName, tabName,
+                tabCode, null);
+
+        return RespGenerstor.success(result);
+    }
 
     @ResponseBody
     @PostMapping("/saveSubject")
     public BaseResponse saveSubject(@RequestBody JSONObject reqMap) {
-
         int count = 0;
-        ObjectMapper mapper = new ObjectMapper();
         try {
-
             SrSubject dataModel = reqMap.getObject("dataModel", SrSubject.class);
             List<SrSubjectfield> fieldList = reqMap.getJSONArray("fieldList").toJavaList(SrSubjectfield.class);
             count = subjectService.saveSubject(dataModel, fieldList, accountService.getLoginUserID());
@@ -49,4 +66,60 @@ public class SubjectController {
         }
         return RespGenerstor.success(count);
     }
+
+    @ResponseBody
+    @GetMapping("/getSubject")
+    public BaseResponse<SrSubject> getSubject(String subjectId) {
+        SrSubject model = subjectService.getSubject(subjectId);
+
+        return RespGenerstor.success(model);
+    }
+
+    @ResponseBody
+    @GetMapping("/getFieldList")
+    public BaseResponse<List<SrSubjectfield>> getFieldList(String subjectId) throws Exception {
+
+        List<SrSubjectfield> result = subjectService.getFieldList(subjectId);
+
+        return RespGenerstor.success(result);
+    }
+
+    @ResponseBody
+    @PostMapping("/delete")
+    public BaseResponse delete(@RequestBody List<String> idList) {
+        Integer result = subjectService.delete(idList);
+        if (result <= 0) {
+            return RespGenerstor.fail("1003", "数据已经被使用");
+        }
+        return RespGenerstor.success(1);
+    }
+
+    @ResponseBody
+    @GetMapping("/exportSubject")
+    public void exportSubject(HttpServletResponse response,
+                              @RequestParam(required = false) List<String> idList,
+                              String subjectName, String tabName, String tabCode) throws Exception {
+        List<SrSubject> dataList = subjectService.getList(1, 9999, subjectName, tabName,
+                tabCode, idList).getList();
+
+        ExcelHelper excelHelper = new ExcelHelper();
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+        data.setTitles(Arrays.asList(new String[]{"主题名称", "表编码", "表名称", "描述", "创建时间", "创建人", "是否有外键字段"}));
+
+        List<List<Object>> rowData = new ArrayList();
+        for (SrSubject item : dataList) {
+            List<Object> row = new ArrayList();
+            row.add(item.getSubjectName());
+            row.add(item.getTabCode());
+            row.add(item.getTabName());
+            row.add(item.getTabDesc());
+            row.add(dateUtils.dateToStr(item.getCreateTime()));
+            row.add(item.getCreatedName());
+            row.add(item.getIsReferences() == 1 ? "是" : "否");
+            rowData.add(row);
+        }
+
+        data.setRows(rowData);
+        excelHelper.exportExcel(response, data);
+    }
 }

src/main/java/com/bowintek/practice/mapper/cquery/SubjectCQuery.java

@@ -1,9 +1,12 @@
 package com.bowintek.practice.mapper.cquery;
 
+import com.bowintek.practice.model.SrSubject;
+
 import java.util.HashMap;
 import java.util.List;
 
 public interface SubjectCQuery {
+    List<SrSubject> getList(String subjectName,String tabName,String tabCode,String subjectIdsString);
     List<HashMap<String,Object>> getListToHashMap(String tabName);
     List<HashMap<String,Object>> getSubjectFieldToHashMapList(List<String> subIdList);
 }

src/main/java/com/bowintek/practice/model/SrSaerchtemp.java

@@ -23,6 +23,8 @@ public class SrSaerchtemp {
 
     private Integer status;
 
+    private String createdName;
+
     public String getTempId() {
         return tempId;
     }
@@ -102,4 +104,12 @@ public class SrSaerchtemp {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public String getCreatedName() {
+        return createdName;
+    }
+
+    public void setCreatedName(String createdName) {
+        this.createdName = createdName == null ? null : createdName.trim();
+    }
 }

src/main/java/com/bowintek/practice/model/SrSaerchtempExample.java

@@ -774,6 +774,76 @@ public class SrSaerchtempExample {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }
+
+        public Criteria andCreatedNameIsNull() {
+            addCriterion("createdName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameIsNotNull() {
+            addCriterion("createdName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameEqualTo(String value) {
+            addCriterion("createdName =", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotEqualTo(String value) {
+            addCriterion("createdName <>", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameGreaterThan(String value) {
+            addCriterion("createdName >", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameGreaterThanOrEqualTo(String value) {
+            addCriterion("createdName >=", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLessThan(String value) {
+            addCriterion("createdName <", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLessThanOrEqualTo(String value) {
+            addCriterion("createdName <=", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLike(String value) {
+            addCriterion("createdName like", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotLike(String value) {
+            addCriterion("createdName not like", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameIn(List<String> values) {
+            addCriterion("createdName in", values, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotIn(List<String> values) {
+            addCriterion("createdName not in", values, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameBetween(String value1, String value2) {
+            addCriterion("createdName between", value1, value2, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotBetween(String value1, String value2) {
+            addCriterion("createdName not between", value1, value2, "createdName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/bowintek/practice/model/SrSubject.java

@@ -25,6 +25,8 @@ public class SrSubject {
 
     private String subjectName;
 
+    private String createdName;
+
     public String getSubId() {
         return subId;
     }
@@ -112,4 +114,12 @@ public class SrSubject {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName == null ? null : subjectName.trim();
     }
+
+    public String getCreatedName() {
+        return createdName;
+    }
+
+    public void setCreatedName(String createdName) {
+        this.createdName = createdName == null ? null : createdName.trim();
+    }
 }

src/main/java/com/bowintek/practice/model/SrSubjectExample.java

@@ -834,6 +834,76 @@ public class SrSubjectExample {
             addCriterion("subjectName not between", value1, value2, "subjectName");
             return (Criteria) this;
         }
+
+        public Criteria andCreatedNameIsNull() {
+            addCriterion("createdName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameIsNotNull() {
+            addCriterion("createdName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameEqualTo(String value) {
+            addCriterion("createdName =", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotEqualTo(String value) {
+            addCriterion("createdName <>", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameGreaterThan(String value) {
+            addCriterion("createdName >", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameGreaterThanOrEqualTo(String value) {
+            addCriterion("createdName >=", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLessThan(String value) {
+            addCriterion("createdName <", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLessThanOrEqualTo(String value) {
+            addCriterion("createdName <=", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameLike(String value) {
+            addCriterion("createdName like", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotLike(String value) {
+            addCriterion("createdName not like", value, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameIn(List<String> values) {
+            addCriterion("createdName in", values, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotIn(List<String> values) {
+            addCriterion("createdName not in", values, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameBetween(String value1, String value2) {
+            addCriterion("createdName between", value1, value2, "createdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedNameNotBetween(String value1, String value2) {
+            addCriterion("createdName not between", value1, value2, "createdName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/bowintek/practice/model/SrSubjectfield.java

@@ -1,7 +1,5 @@
 package com.bowintek.practice.model;
 
-import java.util.Date;
-
 public class SrSubjectfield {
     private String fieldId;
 
@@ -23,10 +21,6 @@ public class SrSubjectfield {
 
     private String dictionaryCode;
 
-    private Date modifyTime;
-
-    private String createdBy;
-
     private Integer status;
 
     private Integer disOrder;
@@ -121,22 +115,6 @@ public class SrSubjectfield {
         this.dictionaryCode = dictionaryCode == null ? null : dictionaryCode.trim();
     }
 
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
     public Integer getStatus() {
         return status;
     }

src/main/java/com/bowintek/practice/model/SrSubjectfieldExample.java

@@ -1,7 +1,6 @@
 package com.bowintek.practice.model;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class SrSubjectfieldExample {
@@ -785,136 +784,6 @@ public class SrSubjectfieldExample {
             return (Criteria) this;
         }
 
-        public Criteria andModifyTimeIsNull() {
-            addCriterion("modifyTime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIsNotNull() {
-            addCriterion("modifyTime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeEqualTo(Date value) {
-            addCriterion("modifyTime =", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotEqualTo(Date value) {
-            addCriterion("modifyTime <>", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThan(Date value) {
-            addCriterion("modifyTime >", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("modifyTime >=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThan(Date value) {
-            addCriterion("modifyTime <", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
-            addCriterion("modifyTime <=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIn(List<Date> values) {
-            addCriterion("modifyTime in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotIn(List<Date> values) {
-            addCriterion("modifyTime not in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeBetween(Date value1, Date value2) {
-            addCriterion("modifyTime between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
-            addCriterion("modifyTime not between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNull() {
-            addCriterion("createdBy is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNotNull() {
-            addCriterion("createdBy is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByEqualTo(String value) {
-            addCriterion("createdBy =", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotEqualTo(String value) {
-            addCriterion("createdBy <>", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThan(String value) {
-            addCriterion("createdBy >", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThanOrEqualTo(String value) {
-            addCriterion("createdBy >=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThan(String value) {
-            addCriterion("createdBy <", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThanOrEqualTo(String value) {
-            addCriterion("createdBy <=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLike(String value) {
-            addCriterion("createdBy like", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotLike(String value) {
-            addCriterion("createdBy not like", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIn(List<String> values) {
-            addCriterion("createdBy in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotIn(List<String> values) {
-            addCriterion("createdBy not in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByBetween(String value1, String value2) {
-            addCriterion("createdBy between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotBetween(String value1, String value2) {
-            addCriterion("createdBy not between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
         public Criteria andStatusIsNull() {
             addCriterion("status is null");
             return (Criteria) this;

src/main/java/com/bowintek/practice/services/impl/SubjectServiceImpl.java

@@ -2,10 +2,16 @@ package com.bowintek.practice.services.impl;
 
 import com.bowintek.practice.mapper.SrSubjectMapper;
 import com.bowintek.practice.mapper.SrSubjectfieldMapper;
+import com.bowintek.practice.mapper.cquery.SubjectCQuery;
 import com.bowintek.practice.model.SrSubject;
+import com.bowintek.practice.model.SrSubjectExample;
 import com.bowintek.practice.model.SrSubjectfield;
 import com.bowintek.practice.model.SrSubjectfieldExample;
 import com.bowintek.practice.services.service.SubjectService;
+import com.bowintek.practice.util.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.poi.hpsf.GUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +26,27 @@ public class SubjectServiceImpl implements SubjectService {
     private SrSubjectMapper subjectMapper;
     @Autowired
     private SrSubjectfieldMapper subjectfieldMapper;
+    @Autowired
+    private SubjectCQuery subjectCQuery;
+    @Autowired
+    private StringUtils stringUtils;
+
+    @Override
+    public PageInfo<SrSubject> getList(Integer page, Integer rows,
+                                       String subjectName, String tabName, String tabCode, List<String> idList) {
+        PageHelper.startPage(page, rows);
+
+        List<SrSubject> dataList = subjectCQuery.getList(subjectName, tabName,
+                tabCode, stringUtils.ListToInSql(idList));
+
+        PageInfo<SrSubject> result = new PageInfo(dataList);
+        return result;
+    }
+
+    @Override
+    public SrSubject getSubject(String subjectId) {
+        return subjectMapper.selectByPrimaryKey(subjectId);
+    }
 
     @Override
     public int saveSubject(SrSubject model, List<SrSubjectfield> fieldList, String userId) {
@@ -43,22 +70,20 @@ public class SubjectServiceImpl implements SubjectService {
 
         if (fieldList != null && fieldList.size() > 0) {
             SrSubjectfieldExample example = new SrSubjectfieldExample();
-            SrSubjectfieldExample.Criteria criteria= example.or();
+            SrSubjectfieldExample.Criteria criteria = example.or();
             criteria.andSubIdEqualTo(model.getSubId());
-            List<SrSubjectfield> dbList =subjectfieldMapper.selectByExample(example);
-            List<String> ids = fieldList.stream().map(x->x.getFieldId()).collect(Collectors.toList());
+            List<SrSubjectfield> dbList = subjectfieldMapper.selectByExample(example);
+            List<String> ids = fieldList.stream().map(x -> x.getFieldId()).collect(Collectors.toList());
 
             criteria.andFieldIdNotIn(ids);
             subjectfieldMapper.deleteByExample(example);
             fieldList.stream().forEach(x -> {
-                long count = dbList.stream().filter(f->f.getFieldId()==x.getFieldId()).count();
-                if(count>0){
-                    x.setModifyTime(new Date());
+                long count = dbList.stream().filter(f -> f.getFieldId() == x.getFieldId()).count();
+                if (count > 0) {
                     subjectfieldMapper.updateByPrimaryKeySelective(x);
-                }else{
+                } else {
                     x.setSubId(model.getSubId());
                     x.setFieldId(UUID.randomUUID().toString());
-                    x.setCreatedBy(userId);
                     x.setStatus(1);
                     subjectfieldMapper.insertSelective(x);
                 }
@@ -66,4 +91,30 @@ public class SubjectServiceImpl implements SubjectService {
         }
         return result;
     }
+
+    @Override
+    public List<SrSubjectfield> getFieldList(String subjectId) {
+        SrSubjectfieldExample example = new SrSubjectfieldExample();
+        SrSubjectfieldExample.Criteria criteria = example.or();
+        criteria.andSubIdEqualTo(subjectId);
+        List<SrSubjectfield> dbList = subjectfieldMapper.selectByExample(example);
+        return dbList;
+    }
+
+    @Override
+    public int delete(List<String> idList) {
+        try {
+            SrSubjectfieldExample example = new SrSubjectfieldExample();
+            SrSubjectfieldExample.Criteria criteria = example.or();
+            criteria.andSubIdIn(idList);
+            subjectfieldMapper.selectByExample(example);
+
+            SrSubjectExample subExp = new SrSubjectExample();
+            subExp.or().andSubIdIn(idList);
+            subjectMapper.deleteByExample(subExp);
+        } catch (Exception e) {
+            return 0;
+        }
+        return 1;
+    }
 }

src/main/java/com/bowintek/practice/services/service/SubjectService.java

@@ -2,12 +2,22 @@ package com.bowintek.practice.services.service;
 
 import com.bowintek.practice.model.SrSubject;
 import com.bowintek.practice.model.SrSubjectfield;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
 public interface SubjectService {
 
+    PageInfo<SrSubject> getList(Integer page, Integer rows,
+                                String subjectName, String tabName, String tabCode,List<String> idList);
+
     int saveSubject(SrSubject model,
                          List<SrSubjectfield>  fieldList,
                          String userId);
+
+    SrSubject getSubject(String subjectId);
+
+    List<SrSubjectfield> getFieldList(String subjectId);
+
+    int delete(List<String> idList);
 }

src/main/resources/generatorConfig.xml

@@ -121,5 +121,7 @@
             <table schema="" tableName="Sys_Log"><property name="useActualColumnNames" value="true"/></table>
         </table>-->
         <table schema="" tableName="sr_subject"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="sr_saerchTemp"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="sr_subjectField"><property name="useActualColumnNames" value="true"/></table>
     </context>
 </generatorConfiguration>

src/main/resources/mapping/SrSaerchtempMapper.xml

@@ -12,6 +12,7 @@
     <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
     <result column="modifyBy" jdbcType="VARCHAR" property="modifyBy" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="createdName" jdbcType="VARCHAR" property="createdName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -73,7 +74,7 @@
   </sql>
   <sql id="Base_Column_List">
     tempId, tempName, tempNo, subId, remark, createTime, modifyTime, createdBy, modifyBy, 
-    status
+    status, createdName
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrSaerchtempExample" resultMap="BaseResultMap">
     select
@@ -109,11 +110,11 @@
     insert into sr_saerchtemp (tempId, tempName, tempNo, 
       subId, remark, createTime, 
       modifyTime, createdBy, modifyBy, 
-      status)
+      status, createdName)
     values (#{tempId,jdbcType=VARCHAR}, #{tempName,jdbcType=VARCHAR}, #{tempNo,jdbcType=VARCHAR}, 
       #{subId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=VARCHAR}, #{modifyBy,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER})
+      #{status,jdbcType=INTEGER}, #{createdName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrSaerchtemp">
     insert into sr_saerchtemp
@@ -148,6 +149,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="createdName != null">
+        createdName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tempId != null">
@@ -180,6 +184,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="createdName != null">
+        #{createdName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bowintek.practice.model.SrSaerchtempExample" resultType="java.lang.Long">
@@ -221,6 +228,9 @@
       <if test="row.status != null">
         status = #{row.status,jdbcType=INTEGER},
       </if>
+      <if test="row.createdName != null">
+        createdName = #{row.createdName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -237,7 +247,8 @@
       modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       createdBy = #{row.createdBy,jdbcType=VARCHAR},
       modifyBy = #{row.modifyBy,jdbcType=VARCHAR},
-      status = #{row.status,jdbcType=INTEGER}
+      status = #{row.status,jdbcType=INTEGER},
+      createdName = #{row.createdName,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -272,6 +283,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="createdName != null">
+        createdName = #{createdName,jdbcType=VARCHAR},
+      </if>
     </set>
     where tempId = #{tempId,jdbcType=VARCHAR}
   </update>
@@ -285,7 +299,8 @@
       modifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       createdBy = #{createdBy,jdbcType=VARCHAR},
       modifyBy = #{modifyBy,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER}
+      status = #{status,jdbcType=INTEGER},
+      createdName = #{createdName,jdbcType=VARCHAR}
     where tempId = #{tempId,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/SrSubjectMapper.xml

@@ -13,6 +13,7 @@
     <result column="isReferences" jdbcType="INTEGER" property="isReferences" />
     <result column="execSql" jdbcType="VARCHAR" property="execSql" />
     <result column="subjectName" jdbcType="VARCHAR" property="subjectName" />
+    <result column="createdName" jdbcType="VARCHAR" property="createdName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -74,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List">
     subId, tabCode, tabName, tabDesc, createTime, modiTime, createdBy, status, isReferences, 
-    execSql, subjectName
+    execSql, subjectName, createdName
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrSubjectExample" resultMap="BaseResultMap">
     select
@@ -110,11 +111,13 @@
     insert into sr_subject (subId, tabCode, tabName, 
       tabDesc, createTime, modiTime, 
       createdBy, status, isReferences, 
-      execSql, subjectName)
+      execSql, subjectName, createdName
+      )
     values (#{subId,jdbcType=VARCHAR}, #{tabCode,jdbcType=VARCHAR}, #{tabName,jdbcType=VARCHAR}, 
       #{tabDesc,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modiTime,jdbcType=TIMESTAMP}, 
       #{createdBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{isReferences,jdbcType=INTEGER}, 
-      #{execSql,jdbcType=VARCHAR}, #{subjectName,jdbcType=VARCHAR})
+      #{execSql,jdbcType=VARCHAR}, #{subjectName,jdbcType=VARCHAR}, #{createdName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrSubject">
     insert into sr_subject
@@ -152,6 +155,9 @@
       <if test="subjectName != null">
         subjectName,
       </if>
+      <if test="createdName != null">
+        createdName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="subId != null">
@@ -187,6 +193,9 @@
       <if test="subjectName != null">
         #{subjectName,jdbcType=VARCHAR},
       </if>
+      <if test="createdName != null">
+        #{createdName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bowintek.practice.model.SrSubjectExample" resultType="java.lang.Long">
@@ -231,6 +240,9 @@
       <if test="row.subjectName != null">
         subjectName = #{row.subjectName,jdbcType=VARCHAR},
       </if>
+      <if test="row.createdName != null">
+        createdName = #{row.createdName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -248,7 +260,8 @@
       status = #{row.status,jdbcType=INTEGER},
       isReferences = #{row.isReferences,jdbcType=INTEGER},
       execSql = #{row.execSql,jdbcType=VARCHAR},
-      subjectName = #{row.subjectName,jdbcType=VARCHAR}
+      subjectName = #{row.subjectName,jdbcType=VARCHAR},
+      createdName = #{row.createdName,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,6 +299,9 @@
       <if test="subjectName != null">
         subjectName = #{subjectName,jdbcType=VARCHAR},
       </if>
+      <if test="createdName != null">
+        createdName = #{createdName,jdbcType=VARCHAR},
+      </if>
     </set>
     where subId = #{subId,jdbcType=VARCHAR}
   </update>
@@ -300,7 +316,8 @@
       status = #{status,jdbcType=INTEGER},
       isReferences = #{isReferences,jdbcType=INTEGER},
       execSql = #{execSql,jdbcType=VARCHAR},
-      subjectName = #{subjectName,jdbcType=VARCHAR}
+      subjectName = #{subjectName,jdbcType=VARCHAR},
+      createdName = #{createdName,jdbcType=VARCHAR}
     where subId = #{subId,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/SrSubjectfieldMapper.xml

@@ -12,8 +12,6 @@
     <result column="dataType" jdbcType="VARCHAR" property="dataType" />
     <result column="queryTypeId" jdbcType="INTEGER" property="queryTypeId" />
     <result column="dictionaryCode" jdbcType="VARCHAR" property="dictionaryCode" />
-    <result column="modifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="disOrder" jdbcType="INTEGER" property="disOrder" />
     <result column="isSearchField" jdbcType="INTEGER" property="isSearchField" />
@@ -82,8 +80,8 @@
   </sql>
   <sql id="Base_Column_List">
     fieldId, subId, fieldCode, fieldName, fieldAlias, settingTypeId, fieldDesc, dataType, 
-    queryTypeId, dictionaryCode, modifyTime, createdBy, status, disOrder, isSearchField, 
-    isForeignKey, referencesTab, foreignKey, displayColumn
+    queryTypeId, dictionaryCode, status, disOrder, isSearchField, isForeignKey, referencesTab, 
+    foreignKey, displayColumn
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrSubjectfieldExample" resultMap="BaseResultMap">
     select
@@ -119,17 +117,15 @@
     insert into sr_subjectfield (fieldId, subId, fieldCode, 
       fieldName, fieldAlias, settingTypeId, 
       fieldDesc, dataType, queryTypeId, 
-      dictionaryCode, modifyTime, createdBy, 
-      status, disOrder, isSearchField, 
-      isForeignKey, referencesTab, foreignKey, 
-      displayColumn)
+      dictionaryCode, status, disOrder, 
+      isSearchField, isForeignKey, referencesTab, 
+      foreignKey, displayColumn)
     values (#{fieldId,jdbcType=VARCHAR}, #{subId,jdbcType=VARCHAR}, #{fieldCode,jdbcType=VARCHAR}, 
       #{fieldName,jdbcType=VARCHAR}, #{fieldAlias,jdbcType=VARCHAR}, #{settingTypeId,jdbcType=INTEGER}, 
       #{fieldDesc,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}, #{queryTypeId,jdbcType=INTEGER}, 
-      #{dictionaryCode,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{disOrder,jdbcType=INTEGER}, #{isSearchField,jdbcType=INTEGER}, 
-      #{isForeignKey,jdbcType=INTEGER}, #{referencesTab,jdbcType=VARCHAR}, #{foreignKey,jdbcType=VARCHAR}, 
-      #{displayColumn,jdbcType=VARCHAR})
+      #{dictionaryCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{disOrder,jdbcType=INTEGER}, 
+      #{isSearchField,jdbcType=INTEGER}, #{isForeignKey,jdbcType=INTEGER}, #{referencesTab,jdbcType=VARCHAR}, 
+      #{foreignKey,jdbcType=VARCHAR}, #{displayColumn,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrSubjectfield">
     insert into sr_subjectfield
@@ -164,12 +160,6 @@
       <if test="dictionaryCode != null">
         dictionaryCode,
       </if>
-      <if test="modifyTime != null">
-        modifyTime,
-      </if>
-      <if test="createdBy != null">
-        createdBy,
-      </if>
       <if test="status != null">
         status,
       </if>
@@ -223,12 +213,6 @@
       <if test="dictionaryCode != null">
         #{dictionaryCode,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null">
-        #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -291,12 +275,6 @@
       <if test="row.dictionaryCode != null">
         dictionaryCode = #{row.dictionaryCode,jdbcType=VARCHAR},
       </if>
-      <if test="row.modifyTime != null">
-        modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="row.createdBy != null">
-        createdBy = #{row.createdBy,jdbcType=VARCHAR},
-      </if>
       <if test="row.status != null">
         status = #{row.status,jdbcType=INTEGER},
       </if>
@@ -335,8 +313,6 @@
       dataType = #{row.dataType,jdbcType=VARCHAR},
       queryTypeId = #{row.queryTypeId,jdbcType=INTEGER},
       dictionaryCode = #{row.dictionaryCode,jdbcType=VARCHAR},
-      modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      createdBy = #{row.createdBy,jdbcType=VARCHAR},
       status = #{row.status,jdbcType=INTEGER},
       disOrder = #{row.disOrder,jdbcType=INTEGER},
       isSearchField = #{row.isSearchField,jdbcType=INTEGER},
@@ -378,12 +354,6 @@
       <if test="dictionaryCode != null">
         dictionaryCode = #{dictionaryCode,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null">
-        modifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        createdBy = #{createdBy,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
@@ -419,8 +389,6 @@
       dataType = #{dataType,jdbcType=VARCHAR},
       queryTypeId = #{queryTypeId,jdbcType=INTEGER},
       dictionaryCode = #{dictionaryCode,jdbcType=VARCHAR},
-      modifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      createdBy = #{createdBy,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       disOrder = #{disOrder,jdbcType=INTEGER},
       isSearchField = #{isSearchField,jdbcType=INTEGER},

src/main/resources/mapping/cquery/SubjectCQuery.xml

@@ -20,4 +20,19 @@
         </foreach>
         order by sf.disOrder
     </select>
+    <select id="getList" resultType="com.bowintek.practice.model.SrSubject">
+        select *
+        from sr_subject sub
+        where 1=1
+        <if test="tabName!='' and tabName!=null">
+            and sub.tabName like Concat('%',#{tabName},'%')
+        </if>
+        <if test="subjectName!='' and subjectName!=null">
+            and sub.subjectName like Concat('%',#{subjectName},'%')
+        </if>
+        <if test="tabCode!='' and tabCode!=null">
+            and sub.tabCode like Concat('%',#{tabCode},'%')
+        </if>
+        order by sub.tabName
+    </select>
 </mapper>

target/classes/generatorConfig.xml

@@ -121,5 +121,7 @@
             <table schema="" tableName="Sys_Log"><property name="useActualColumnNames" value="true"/></table>
         </table>-->
         <table schema="" tableName="sr_subject"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="sr_saerchTemp"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="sr_subjectField"><property name="useActualColumnNames" value="true"/></table>
     </context>
 </generatorConfiguration>

vue/src/views/subject/edit.vue

@@ -59,7 +59,7 @@
       </a-row>
       <a-row>
         <a-col style="margin-bottom: 20px;">
-          <a-table :columns="columns" :data-source="fieldData" :pagination="false"
+          <a-table :columns="columns" :data-source="fieldData" :scroll="{ x:'100%', y: 500 }" :pagination="false"
                    bordered>
             <template #bodyCell="{ column ,record,index}">
               <template v-if="column.key === 'operation'">
@@ -111,7 +111,7 @@ import {defineComponent, reactive, ref, toRefs, watch} from 'vue';
 import {useTabsViewStore} from '@/store/modules/tabsView';
 import BUploadFile from "@/components/file/uploadFile.vue";
 import type {TableColumnsType} from 'ant-design-vue';
-import {save} from '@/api/common';
+import {get, save} from '@/api/common';
 import FieldEdit from "@/views/subject/fieldedit.vue";
 import {getDictionaryItemList} from "@/api/system/dictionary";
 import {Codemirror} from 'vue-codemirror'
@@ -148,7 +148,6 @@ export default defineComponent({
 
     const onFinish = () => {
       save('/subject/saveSubject', {dataModel: formState.dataModel, fieldList: fieldData.value}).then(result => {
-        debugger
         if (result) {
           onClose(1)
         }
@@ -157,7 +156,7 @@ export default defineComponent({
 
     const onClose = (reload: any) => {
       tabsViewStore.closeCurrentTabByPath("/views/subjectedit");
-      tabsViewStore.openTab("views/subjectlist", {reload: reload});
+      tabsViewStore.openTab("/subject/list", {reload: reload});
     };
 
     getDictionaryItemList({code: "queryType"}).then(data => {
@@ -174,9 +173,7 @@ export default defineComponent({
       }
       formState.dataModel.isReferences = fieldData.value.filter((x) => x.isForeignKey == 1).length > 0 ? 1 : 0;
     }
-    const loadData = (id) => {
-      console.log(id)
-    }
+
     const columns: TableColumnsType = [
       {
         title: '序号', width: 80, dataIndex: 'num', key: 'num', align: "center", customRender: ({index}) => {
@@ -223,6 +220,18 @@ export default defineComponent({
     const onDelete = (record) => {
       fieldData.value.splice(record, 1);
     }
+    const loadData = (id) => {
+      if (id != undefined) {
+        get('subject/getSubject',
+          {subjectId: id}).then(data => {
+          formState.dataModel = data;
+        })
+        get('subject/getFieldList',
+          {subjectId: id}).then(data => {
+          fieldData.value = data;
+        })
+      }
+    }
     watch(
       () => [formState.dataModel.tabCode, fieldData],
       () => {
@@ -242,13 +251,8 @@ export default defineComponent({
       edit,
       onDelete,
       loadData, oneDark,
-      fieldData,
-      columns,
-      isEdit,
-      data,
-      lang,
-      code,
-      modalRef,
+      fieldData, columns,
+      isEdit, data, lang, code, modalRef,
     };
   },
   created() {

vue/src/views/subject/index.vue

@@ -10,75 +10,39 @@
       <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item
-            name="practiceBaseName"
-            label="单位名称"
+            name="subjectName"
+            label="主题名称"
             :label-col="{span:6}">
-            <a-input v-model:value="formState.practiceBaseName" style="width: 200px"></a-input>
+            <a-input v-model:value="formState.subjectName" style="width: 200px"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item
-            name="name"
-            label="岗位名称"
+            name="tabCode"
+            label="表编码"
             :label-col="{span:6}">
-            <a-input v-model:value="formState.name" style="width: 200px"></a-input>
+            <a-input v-model:value="formState.tabCode" style="width: 200px"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item
-            name="schoolYearID"
-            label="学年"
+            name="tabName"
+            label="表名称"
             :label-col="{span:6}">
-            <a-select v-model:value="formState.schoolYearID"
-                      style="width: 200px" :allowClear="true"    ref="select"
-                      :options="schoolYearList">
-            </a-select>
+            <a-input v-model:value="formState.tabName" style="width: 200px"></a-input>
           </a-form-item>
         </a-col>
         <a-col  :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onFinish">查询</a-button>
           <a-button style="margin: 0 8px" @click="() => {formRef.resetFields();loadData()}">重置</a-button>
-          <a style="font-size: 12px" @click="expand = !expand">
-            <template v-if="expand">
-              <UpOutlined/>
-            </template>
-            <template v-else>
-              <DownOutlined/>
-            </template>
-            展开
-          </a>
-        </a-col>
-        <a-col v-show="expand" :span="6">
-          <a-form-item
-            name="majorGradeID"
-            label="年级专业"
-            :label-col="{span:6}">
-            <a-select v-model:value="formState.majorGradeID"  show-search :filter-option="filterOption"
-                      style="width: 200px" :allowClear="true"
-                      :options="majorGradeList"
-                      @change="loadData">
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col v-show="expand" :span="6">
-          <a-form-item
-            name="practiceBaseTypeID"
-            label="基地类型"
-            :label-col="{span:6}">
-            <a-select v-model:value="formState.practiceBaseTypeID"
-                      style="width: 200px" :allowClear="true"
-                      :options="practiceBaseTypeList"
-                      @change="loadData">
-            </a-select>
-          </a-form-item>
         </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="button" @click="add" functioncode="T010601">新增</a-button>
           <BImportExcel :options="importOptions" @success="loadData" functioncode="T010602"></BImportExcel>
-          <BExportExcel :title="'导出'" :filename="'岗位信息'" :url="'position/getList'"
-                        :params="{...formState, isExport: true,rows:100000,positionIdList:selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'主题信息'" :url="'subject/exportSubject'"
+                        :params="{...formState, idList:selectedRowKeys}"></BExportExcel>
           <a-popconfirm placement="leftTop"
             title="是否删除数据?"
             @confirm="onDelete()">
@@ -91,13 +55,13 @@
       <a-table :columns="columns" :data-source="data" :scroll="{ x:'100%', y: 500 }" :pagination="pagination"
                :loading="loading"
                :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-               @change="handleTableChange" :row-key="record=>record.positionID"
+               @change="handleTableChange" :row-key="record=>record.subId"
                bordered>
         <template #bodyCell="{ column,record }">
           <template v-if="column.key === 'operation'">
-            <a-button type="link" size="small" @click="detail(record.positionID)">查看
+            <a-button type="link" size="small" @click="detail(record.subId)">查看
             </a-button>
-            <a-button type="link" size="small" @click="edit(record.positionID)" functioncode="T010603">编辑
+            <a-button type="link" size="small" @click="edit(record.subId)" functioncode="T010603">编辑
             </a-button>
           </template>
         </template>
@@ -109,11 +73,10 @@
 <script lang="ts">
 import {reactive, ref, defineComponent, computed} from 'vue';
 import type {FormInstance} from 'ant-design-vue';
-import type {TableColumnsType, TableProps,SelectProps} from 'ant-design-vue';
+import type {TableColumnsType, TableProps} from 'ant-design-vue';
 import { get, postdel} from '@/api/common';
 import {useRoute, useRouter} from "vue-router";
 import {useTabsViewStore} from "@/store/modules/tabsView";
-import {getDictionaryItemList} from "@/api/system/dictionary";
 import {message} from "ant-design-vue";
 import {DownOutlined, UpOutlined} from "@ant-design/icons-vue";
 import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps";
@@ -123,7 +86,7 @@ import {getPaginationTotalTitle} from "@/utils/common";
 import dayjs from "dayjs";
 
 export default defineComponent({
-  name: 'positionlist',
+  name: 'subjectlist',
   components: {DownOutlined, UpOutlined,BImportExcel,BExportExcel},
   setup() {
 
@@ -134,14 +97,9 @@ export default defineComponent({
     const tabsViewStore = useTabsViewStore();
     const selectedRowKeys =ref([]) ;
     const formState = reactive({
-      page: 1, rows: 10, schoolYearID: '', majorGradeID: '', practiceBaseTypeID: null,
-      name: null, practiceBaseName: null, positionID: "", total: 0,isPostManage:true
+      page: 1, rows: 10, subjectName: '', tabName: '', tabCode: null,total: 0
     });
 
-    const practiceBaseTypeList = ref([]);
-    const schoolYearList = ref<SelectProps['options']>();
-    const majorGradeList = ref<SelectProps['options']>();
-
     const columns: TableColumnsType = [
       {
         title: '序号',
@@ -151,16 +109,17 @@ export default defineComponent({
         align: "center",
         customRender: item => `${formState.rows * (formState.page - 1) + item.index + 1}`
       },
-      {title: '表编码', width: 120, dataIndex: 'tabCode', key: 'tabCode',align:"center"},
+      {title: '主题名称', width: 140, dataIndex: 'subjectName', key: 'subjectName',align:"center"},
+      {title: '表编码', width: 200, dataIndex: 'tabCode', key: 'tabCode',align:"center"},
       {title: '表名称', dataIndex: 'tabName', key: '1', width:180},
       {title: '描述', dataIndex: 'tabDesc', key: '2', width: 150, align: "center"},
-      {title: '创建时间', dataIndex: 'createTime', key: '3', width: 200, customRender: ({record}) =>
+      {title: '创建时间', dataIndex: 'createTime', key: '3', width: 100, customRender: ({record}) =>
           record.createTime==null?"": (dayjs(record.createTime).format('YYYY-MM-DD'))},
-      {title: '创建人', dataIndex: 'createdBy', key: '5', width: 120},
-      {title: '是否是否有外键字段', dataIndex: 'isReferences', key: '5', width: 200,align:"center", customRender: ({record}) =>
+      {title: '创建人', dataIndex: 'createdName', key: '5', width: 80},
+      {title: '是否有外键字段', dataIndex: 'isReferences', key: '5', width: 100,align:"center", customRender: ({record}) =>
           record.isReferences==1?"是":"否"},
       {
-        title: '操作', key: 'operation', width: 120, align: "center"
+        title: '操作', key: 'operation', width: 100, align: "center"
       },
     ];
 
@@ -181,17 +140,6 @@ export default defineComponent({
       }
     });
 
-    getDictionaryItemList({code: "PracticeBaseType"}).then(x => {
-      practiceBaseTypeList.value = x.filter(f => f.value != 3).map(x => ({
-        label: x.name,
-        value: x.value
-      }));
-    })
-
-    const filterOption = (input: string, option: any) => {
-      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-    };
-
     const data = ref([]);
     const pagination = computed(() => ({
       total: formState.total,
@@ -213,10 +161,12 @@ export default defineComponent({
     const onFinish = () => {
       loadData();
     }
-
+    const filterOption = (input: string, option: any) => {
+      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    };
     const loadData = async function () {
       loading.value = true;
-      const result: any = await get('position/getList', formState);
+      const result: any = await get('subject/getList', formState);
 
       data.value = result.list;
       formState.total = result.total;
@@ -227,7 +177,7 @@ export default defineComponent({
         message.warning('请选择需要删除的数据！');
         return false;
       }
-      postdel('position/deletePosition', selectedRowKeys.value).then(() => {
+      postdel('subject/delete', selectedRowKeys.value).then(() => {
         loadData();
       })
     };
@@ -250,7 +200,7 @@ export default defineComponent({
       formRef,
       formState,
       columns,data,loading,selectedRowKeys,
-      pagination,practiceBaseTypeList,majorGradeList,schoolYearList,
+      pagination,
       handleTableChange,
       onSelectChange,
       onFinish,