From 629762d9c9d28487e71b9a8105c5b3696e0d2bb3 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Mon, 15 Sep 2025 15:47:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9A=90=E8=97=8F=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A0=E7=94=A8=E5=8A=9F=E8=83=BD=202?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E7=B1=BB=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=203=E3=80=81=E8=A1=A5=E5=85=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3(=E4=BF=9D=E5=85=BB/=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=B0=E5=BD=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/uiDesigner.xml                               | 124 ++++++++++++++
 admin-hanhai-vue/src/components/tools/UserMenu.vue |  60 +++----
 .../controller/ExhibitCategoryController.java      |   2 +-
 .../exhibitCategory/entity/ExhibitCategory.java    |   6 +-
 .../mapper/ExhibitCategoryMapper.java              |   2 +-
 .../service/IExhibitCategoryService.java           |   2 +-
 .../service/impl/ExhibitCategoryServiceImpl.java   |   2 +-
 .../exhibitCategory/vue/ExhibitCategoryList.vue    |   6 +
 .../vue/modules/ExhibitCategoryModal.vue           |   3 +
 .../exhibitCategory/vue3/ExhibitCategory.data.ts   |  10 ++
 .../api/exhibitController/ShowpieceController.java |  12 ++
 .../modules/api/service/ShowpieceService.java      |  10 +-
 .../api/service/impl/ConfigServiceImpl.java        |   2 +-
 .../api/service/impl/ShowpieceServiceImpl.java     | 178 ++++++++++++++++++++-
 14 files changed, 372 insertions(+), 47 deletions(-)
 create mode 100644 .idea/uiDesigner.xml

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/components/tools/UserMenu.vue b/admin-hanhai-vue/src/components/tools/UserMenu.vue
index 6efba61..f9f90c0 100644
--- a/admin-hanhai-vue/src/components/tools/UserMenu.vue
+++ b/admin-hanhai-vue/src/components/tools/UserMenu.vue
@@ -26,46 +26,46 @@
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span>
-    <header-notice class="action"/>
+<!--    <span class="action">-->
+<!--      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">-->
+<!--        <a-icon type="question-circle-o"></a-icon>-->
+<!--      </a>-->
+<!--    </span>-->
+<!--    <header-notice class="action"/>-->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
-          <router-link :to="{ name: 'account-center' }">
-            <a-icon type="user"/>
-            <span>个人中心</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="3"  @click="systemSetting">
-           <a-icon type="tool"/>
-           <span>系统设置</span>
-        </a-menu-item>
+<!--        <a-menu-item key="0">-->
+<!--          <router-link :to="{ name: 'account-center' }">-->
+<!--            <a-icon type="user"/>-->
+<!--            <span>个人中心</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="1">-->
+<!--          <router-link :to="{ name: 'account-settings-base' }">-->
+<!--            <a-icon type="setting"/>-->
+<!--            <span>账户设置</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="3"  @click="systemSetting">-->
+<!--           <a-icon type="tool"/>-->
+<!--           <span>系统设置</span>-->
+<!--        </a-menu-item>-->
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
-          <a-icon type="cluster"/>
-          <span>切换部门</span>
-        </a-menu-item>
-        <a-menu-item key="6" @click="clearCache">
-          <a-icon type="sync"/>
-          <span>清理缓存</span>
-        </a-menu-item>
+<!--        <a-menu-item key="5" @click="updateCurrentDepart">-->
+<!--          <a-icon type="cluster"/>-->
+<!--          <span>切换部门</span>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="6" @click="clearCache">-->
+<!--          <a-icon type="sync"/>-->
+<!--          <span>清理缓存</span>-->
+<!--        </a-menu-item>-->
        <!-- <a-menu-item key="2" disabled>
           <a-icon type="setting"/>
           <span>测试</span>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/controller/ExhibitCategoryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/controller/ExhibitCategoryController.java
index 0273916..48c56c2 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/controller/ExhibitCategoryController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/controller/ExhibitCategoryController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 展品分类表
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-12
  * @Version: V1.0
  */
 @Api(tags="展品分类表")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/entity/ExhibitCategory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/entity/ExhibitCategory.java
index b3dfde5..d37dda0 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/entity/ExhibitCategory.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/entity/ExhibitCategory.java
@@ -18,7 +18,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 展品分类表
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-12
  * @Version: V1.0
  */
 @Data
@@ -47,6 +47,10 @@ public class ExhibitCategory implements Serializable {
 	@Excel(name = "分类名称", width = 15)
     @ApiModelProperty(value = "分类名称")
     private java.lang.String title;
+	/**排序编号*/
+	@Excel(name = "排序编号", width = 15)
+    @ApiModelProperty(value = "排序编号")
+    private java.lang.Integer orderNo;
 	/**父级节点*/
 	@Excel(name = "父级节点", width = 15)
     @ApiModelProperty(value = "父级节点")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/mapper/ExhibitCategoryMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/mapper/ExhibitCategoryMapper.java
index 4ee382d..6f3278e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/mapper/ExhibitCategoryMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/mapper/ExhibitCategoryMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 展品分类表
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-12
  * @Version: V1.0
  */
 public interface ExhibitCategoryMapper extends BaseMapper<ExhibitCategory> {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/IExhibitCategoryService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/IExhibitCategoryService.java
index a9f8068..354265e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/IExhibitCategoryService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/IExhibitCategoryService.java
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * @Description: 展品分类表
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-12
  * @Version: V1.0
  */
 public interface IExhibitCategoryService extends IService<ExhibitCategory> {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/impl/ExhibitCategoryServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/impl/ExhibitCategoryServiceImpl.java
index 42d51c7..f9df949 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/impl/ExhibitCategoryServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/service/impl/ExhibitCategoryServiceImpl.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 展品分类表
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-12
  * @Version: V1.0
  */
 @Service
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/ExhibitCategoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/ExhibitCategoryList.vue
index 6d2363e..7499b07 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/ExhibitCategoryList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/ExhibitCategoryList.vue
@@ -115,6 +115,11 @@
             align:"left",
             dataIndex: 'title'
           },
+          {
+            title:'排序编号',
+            align:"left",
+            dataIndex: 'orderNo'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -336,6 +341,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'分类名称',dictCode:''})
+        fieldList.push({type:'int',value:'orderNo',text:'排序编号',dictCode:''})
         fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/modules/ExhibitCategoryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/modules/ExhibitCategoryModal.vue
index b7992f1..d28e95d 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/modules/ExhibitCategoryModal.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue/modules/ExhibitCategoryModal.vue
@@ -13,6 +13,9 @@
         <a-form-model-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
           <a-input v-model="model.title" placeholder="请输入分类名称" ></a-input>
         </a-form-model-item>
+        <a-form-model-item label="排序编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
+          <a-input-number v-model="model.orderNo" placeholder="请输入排序编号" style="width: 100%" />
+        </a-form-model-item>
         <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
           <j-tree-select
             ref="treeSelect"
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue3/ExhibitCategory.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue3/ExhibitCategory.data.ts
index d23bb13..d145e56 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue3/ExhibitCategory.data.ts
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitCategory/vue3/ExhibitCategory.data.ts
@@ -9,6 +9,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'title'
    },
+   {
+    title: '排序编号',
+    align:"center",
+    dataIndex: 'orderNo'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -20,6 +25,11 @@ export const formSchema: FormSchema[] = [
     field: 'title',
     component: 'Input',
   },
+  {
+    label: '排序编号',
+    field: 'orderNo',
+    component: 'InputNumber',
+  },
   {
     label: '父级节点',
     field: 'pid',
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java
index 257b4f2..1a3f67a 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java
@@ -78,6 +78,12 @@ public class ShowpieceController {
         return showpieceService.addRepair(token, exhibitRepair);
     }
 
+    @ApiOperation(value="维修-修改维修记录", notes="维修-修改维修记录")
+    @RequestMapping(value = "/updateRepair", method = {RequestMethod.POST})
+    public Result<?> updateRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair){
+        return showpieceService.updateRepair(token, exhibitRepair);
+    }
+
     @ApiOperation(value="保养-查看保养记录列表", notes="保养-查看保养记录列表")
     @RequestMapping(value = "/queryMaintenanceList", method = {RequestMethod.GET})
     public Result<?> queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean){
@@ -96,4 +102,10 @@ public class ShowpieceController {
         return showpieceService.addMaintenance(token, exhibitMaintenance);
     }
 
+    @ApiOperation(value="保养-修改保养记录", notes="保养-修改保养记录")
+    @RequestMapping(value = "/updateMaintenance", method = {RequestMethod.POST})
+    public Result<?> updateMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance){
+        return showpieceService.updateMaintenance(token, exhibitMaintenance);
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java
index bb73bd1..5e29af2 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java
@@ -1,15 +1,11 @@
 package org.jeecg.modules.api.service;
 
-import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenance;
 import org.jeecg.modules.exhibitMalfunction.entity.ExhibitMalfunction;
 import org.jeecg.modules.exhibitRepair.entity.ExhibitRepair;
 import org.jeecg.modules.exhibitShowpiece.entity.ExhibitShowpiece;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 public interface ShowpieceService {
 
@@ -37,6 +33,9 @@ public interface ShowpieceService {
     //维修-新增维修记录
     public Result<?> addRepair(String token, ExhibitRepair exhibitRepair);
 
+    //维修-修改维修记录
+    public Result<?> updateRepair(String token, ExhibitRepair exhibitRepair);
+
     //保养-查看保养记录列表
     public Result<?> queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean);
 
@@ -46,4 +45,7 @@ public interface ShowpieceService {
     //保养-新增保养记录
     public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance);
 
+    //保养-修改保养记录
+    public Result<?> updateMaintenance(String token, ExhibitMaintenance exhibitMaintenance);
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java
index db546df..a47b9ec 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java
@@ -204,7 +204,7 @@ public class ConfigServiceImpl implements ConfigService {
             }
 
             //按照创建时间降序排列
-            query.orderByDesc(ExhibitCategory::getCreateTime);
+            query.orderByAsc(ExhibitCategory::getOrderNo);
 
             //获取展品分类列表信息
             pageList = query.page(page);
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java
index 11361d1..9706879 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java
@@ -9,9 +9,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.ShowpieceService;
-import org.jeecg.modules.exhibitBanner.entity.ExhibitBanner;
-import org.jeecg.modules.exhibitBanner.service.IExhibitBannerService;
-import org.jeecg.modules.exhibitDepartment.service.IExhibitDepartmentService;
 import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenance;
 import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenanceExpense;
 import org.jeecg.modules.exhibitMaintenance.service.IExhibitMaintenanceExpenseService;
@@ -141,7 +138,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             }
 
             //按照报修日期降序排列
-            query.orderByDesc(ExhibitMalfunction::getMalfunctionDate);
+            query.orderByDesc(ExhibitMalfunction::getCreateTime);
 
             //获取报修单信息列表
             pageList = query.page(page);
@@ -240,7 +237,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 return Result.error("用户审核未通过");
             }
 
-            //2、新增报修单
+            //2、修改报修单
             boolean result =  exhibitMalfunctionService.updateById(exhibitMalfunction);
 
             if(result){
@@ -292,7 +289,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             }
 
             //按照维修时间降序排列
-            query.orderByDesc(ExhibitRepair::getRepairDate);
+            query.orderByDesc(ExhibitRepair::getCreateTime);
 
             //获取维修记录信息列表
             pageList = query.page(page);
@@ -404,6 +401,85 @@ public class ShowpieceServiceImpl implements ShowpieceService {
         }
     }
 
+    //维修-修改维修记录
+    @Override
+    public Result<?> updateRepair(String token, ExhibitRepair exhibitRepair) {
+        log.info("开始修改维修记录");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+
+        try{
+            //1、校验用户信息
+            if(null == hanHaiMember){
+                return Result.error("用户信息不存在");
+            }else if(!"1".equals(hanHaiMember.getStatus())){
+                return Result.error("用户审核未通过");
+            }
+
+            //2、修改维修记录
+            boolean result1 = false;
+            String id = exhibitRepair.getId();
+            if(StringUtils.isEmpty(id)){
+                return Result.error("维修记录id为空，请传入维修记录id");
+            }
+            ExhibitRepair repair = exhibitRepairService.getById(id);
+            if(null != repair){
+                result1 =  exhibitRepairService.updateById(exhibitRepair);
+            }
+
+            //3、新增费用明细
+
+            //3.1删除原有的费用明细
+            List<ExhibitRepairExpense> remove =  exhibitRepairExpenseService.lambdaQuery().eq(ExhibitRepairExpense::getRepairId, id).list();
+            List<String> removeIds = new ArrayList<>();
+            for (ExhibitRepairExpense exhibitRepairExpense : remove) {
+                removeIds.add(exhibitRepairExpense.getId());
+            }
+            exhibitRepairExpenseService.removeByIds(removeIds);
+
+            //3.2 新增新的费用明细
+            List<ExhibitRepairExpense> list = new ArrayList<>();
+            boolean result2 = false;
+            if(StringUtils.isNotEmpty(exhibitRepair.getExpenseList())){
+                String[] split = exhibitRepair.getExpenseList().split(";");
+                for (String s : split) {
+                    String[] expense = s.split(",");
+                    String title = expense[0];//费用名称
+                    int num = Integer.parseInt(expense[1]);//数量
+                    BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
+
+                    ExhibitRepairExpense exhibitRepairExpense = new ExhibitRepairExpense();
+                    exhibitRepairExpense.setRepairId(id);
+                    exhibitRepairExpense.setTitle(title);
+                    exhibitRepairExpense.setNum(num);
+                    exhibitRepairExpense.setAmount(amount);
+
+                    list.add(exhibitRepairExpense);
+                }
+                result2 = exhibitRepairExpenseService.saveBatch(list);
+            }else {
+                result2 = true;
+            }
+
+            //4、判断维修记录是否修改成功
+            if(result1 && result2){
+                log.info("维修记录修改成功");
+                return Result.OK("维修记录修改成功");
+            }else {
+                log.info("维修记录修改失败");
+                return Result.error("维修记录修改失败");
+            }
+
+        }catch (Exception e){
+            log.info("维修记录修改失败");
+            e.printStackTrace();
+            return Result.error("维修记录修改失败");
+        }
+    }
+
     //保养-查看保养记录列表
     @Override
     public Result<?> queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean) {
@@ -438,7 +514,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             }
 
             //按照保养时间降序排列
-            query.orderByDesc(ExhibitMaintenance::getMaintenanceDate);
+            query.orderByDesc(ExhibitMaintenance::getCreateTime);
 
             //获取维修记录信息列表
             pageList = query.page(page);
@@ -559,4 +635,92 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             return Result.error("保养记录新增失败");
         }
     }
+
+
+    //保养-修改保养记录
+    @Override
+    public Result<?> updateMaintenance(String token, ExhibitMaintenance exhibitMaintenance) {
+        log.info("开始修改保养记录");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+
+        try{
+            //1、校验用户信息
+            if(null == hanHaiMember){
+                return Result.error("用户信息不存在");
+            }else if(!"1".equals(hanHaiMember.getStatus())){
+                return Result.error("用户审核未通过");
+            }
+
+            //2、修改维修记录
+            boolean result1 = false;
+            String id = exhibitMaintenance.getId();
+            if(StringUtils.isEmpty(id)){
+                return Result.error("保养记录id为空，请传入保养记录id");
+            }
+            ExhibitMaintenance maintenance = exhibitMaintenanceService.getById(id);
+            if(null != maintenance){
+                result1 =  exhibitMaintenanceService.updateById(exhibitMaintenance);
+            }
+
+            //3、修改费用明细
+            //3.1 删除原有的费用明细
+            List<ExhibitMaintenanceExpense> remove =  exhibitMaintenanceExpenseService.lambdaQuery().eq(ExhibitMaintenanceExpense::getMaintenanceId, id).list();
+            List<String> removeIds = new ArrayList<>();
+            for (ExhibitMaintenanceExpense exhibitMaintenanceExpense : remove) {
+                removeIds.add(exhibitMaintenanceExpense.getId());
+            }
+            exhibitMaintenanceExpenseService.removeByIds(removeIds);
+
+            //3.2 新增费用明细
+            List<ExhibitMaintenanceExpense> list = new ArrayList<>();
+            boolean result2 = true;
+            if(StringUtils.isNotEmpty(exhibitMaintenance.getExpenseList())){
+                String[] split = exhibitMaintenance.getExpenseList().split(";");
+                for (String s : split) {
+                    String[] expense = s.split(",");
+                    String title = expense[0];//费用名称
+                    int num = Integer.parseInt(expense[1]);//数量
+                    BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
+
+                    ExhibitMaintenanceExpense exhibitMaintenanceExpense = new ExhibitMaintenanceExpense();
+                    exhibitMaintenanceExpense.setMaintenanceId(id);
+                    exhibitMaintenanceExpense.setTitle(title);
+                    exhibitMaintenanceExpense.setNum(num);
+                    exhibitMaintenanceExpense.setAmount(amount);
+
+                    list.add(exhibitMaintenanceExpense);
+                }
+                result2 = exhibitMaintenanceExpenseService.saveBatch(list);
+            }
+
+            //4、修改展品下次保养时间
+            boolean result3 = true;
+            if(null != exhibitMaintenance.getNextMaintenanceDate()){
+                ExhibitShowpiece showpiece = exhibitShowpieceService.getById(exhibitMaintenance.getShowpieceId());
+                if(null != showpiece){
+                    showpiece.setMaintenanceDate(exhibitMaintenance.getNextMaintenanceDate());
+                    result3 = exhibitShowpieceService.updateById(showpiece);
+                }
+            }
+
+
+            if(result1 && result2 && result3){
+                log.info("保养记录新增成功");
+                return Result.OK("保养记录新增成功");
+            }else {
+                log.info("保养记录新增失败");
+                return Result.error("保养记录新增失败");
+            }
+
+        }catch (Exception e){
+            log.info("保养记录新增失败");
+            e.printStackTrace();
+            return Result.error("保养记录新增失败");
+        }
+    }
+
 }