1、初版代码接口提交

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java

@@ -64,4 +64,10 @@ public class LoginReq {
      */
     @ApiModelProperty(value = "所在部门")
     private String department;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java

@@ -101,5 +101,5 @@ public class ExhibitMaintenance implements Serializable {
 
     //保养费用表
     @TableField(exist = false)
-    List<ExhibitMaintenanceExpense> expenseList;
+    List<ExhibitMaintenanceExpense> exhibitMaintenanceExpenses;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunction/entity/ExhibitMalfunction.java

@@ -4,11 +4,17 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenanceExpense;
+import org.jeecg.modules.exhibitShowpiece.entity.ExhibitShowpiece;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -119,4 +125,8 @@ public class ExhibitMalfunction implements Serializable {
 	@Dict(dictTable = "exhibit_showpiece", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "关联展品id")
     private java.lang.String showpieceId;
+
+	//展品信息
+	@TableField(exist = false)
+	ExhibitShowpiece showpiece;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/controller/ExhibitMalfunctionDescController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.exhibitMalfunctionDesc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc;
+import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 常见故障情况表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-02
+ * @Version: V1.0
+ */
+@Api(tags="常见故障情况表")
+@RestController
+@RequestMapping("/exhibitMalfunctionDesc/exhibitMalfunctionDesc")
+@Slf4j
+public class ExhibitMalfunctionDescController extends JeecgController<ExhibitMalfunctionDesc, IExhibitMalfunctionDescService> {
+	@Autowired
+	private IExhibitMalfunctionDescService exhibitMalfunctionDescService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param exhibitMalfunctionDesc
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "常见故障情况表-分页列表查询")
+	@ApiOperation(value="常见故障情况表-分页列表查询", notes="常见故障情况表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ExhibitMalfunctionDesc>> queryPageList(ExhibitMalfunctionDesc exhibitMalfunctionDesc,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ExhibitMalfunctionDesc> queryWrapper = QueryGenerator.initQueryWrapper(exhibitMalfunctionDesc, req.getParameterMap());
+		Page<ExhibitMalfunctionDesc> page = new Page<ExhibitMalfunctionDesc>(pageNo, pageSize);
+		IPage<ExhibitMalfunctionDesc> pageList = exhibitMalfunctionDescService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param exhibitMalfunctionDesc
+	 * @return
+	 */
+	@AutoLog(value = "常见故障情况表-添加")
+	@ApiOperation(value="常见故障情况表-添加", notes="常见故障情况表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ExhibitMalfunctionDesc exhibitMalfunctionDesc) {
+		exhibitMalfunctionDescService.save(exhibitMalfunctionDesc);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param exhibitMalfunctionDesc
+	 * @return
+	 */
+	@AutoLog(value = "常见故障情况表-编辑")
+	@ApiOperation(value="常见故障情况表-编辑", notes="常见故障情况表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ExhibitMalfunctionDesc exhibitMalfunctionDesc) {
+		exhibitMalfunctionDescService.updateById(exhibitMalfunctionDesc);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "常见故障情况表-通过id删除")
+	@ApiOperation(value="常见故障情况表-通过id删除", notes="常见故障情况表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		exhibitMalfunctionDescService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "常见故障情况表-批量删除")
+	@ApiOperation(value="常见故障情况表-批量删除", notes="常见故障情况表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.exhibitMalfunctionDescService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "常见故障情况表-通过id查询")
+	@ApiOperation(value="常见故障情况表-通过id查询", notes="常见故障情况表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ExhibitMalfunctionDesc> queryById(@RequestParam(name="id",required=true) String id) {
+		ExhibitMalfunctionDesc exhibitMalfunctionDesc = exhibitMalfunctionDescService.getById(id);
+		if(exhibitMalfunctionDesc==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(exhibitMalfunctionDesc);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param exhibitMalfunctionDesc
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ExhibitMalfunctionDesc exhibitMalfunctionDesc) {
+        return super.exportXls(request, exhibitMalfunctionDesc, ExhibitMalfunctionDesc.class, "常见故障情况表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ExhibitMalfunctionDesc.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/entity/ExhibitMalfunctionDesc.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.exhibitMalfunctionDesc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 常见故障情况表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("exhibit_malfunction_desc")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="exhibit_malfunction_desc对象", description="常见故障情况表")
+public class ExhibitMalfunctionDesc implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**故障描述*/
+	@Excel(name = "故障描述", width = 15)
+    @ApiModelProperty(value = "故障描述")
+    private java.lang.String malfunction;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/ExhibitMalfunctionDescMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.exhibitMalfunctionDesc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 常见故障情况表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-02
+ * @Version: V1.0
+ */
+public interface ExhibitMalfunctionDescMapper extends BaseMapper<ExhibitMalfunctionDesc> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/mapper/xml/ExhibitMalfunctionDescMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.exhibitMalfunctionDesc.mapper.ExhibitMalfunctionDescMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/IExhibitMalfunctionDescService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.exhibitMalfunctionDesc.service;
+
+import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 常见故障情况表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-02
+ * @Version: V1.0
+ */
+public interface IExhibitMalfunctionDescService extends IService<ExhibitMalfunctionDesc> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/service/impl/ExhibitMalfunctionDescServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.exhibitMalfunctionDesc.service.impl;
+
+import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc;
+import org.jeecg.modules.exhibitMalfunctionDesc.mapper.ExhibitMalfunctionDescMapper;
+import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 常见故障情况表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-02
+ * @Version: V1.0
+ */
+@Service
+public class ExhibitMalfunctionDescServiceImpl extends ServiceImpl<ExhibitMalfunctionDescMapper, ExhibitMalfunctionDesc> implements IExhibitMalfunctionDescService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/ExhibitMalfunctionDescList.vue

@@ -0,0 +1,171 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('常见故障情况表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <exhibit-malfunction-desc-modal ref="modalForm" @ok="modalFormOk"></exhibit-malfunction-desc-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ExhibitMalfunctionDescModal from './modules/ExhibitMalfunctionDescModal'
+
+  export default {
+    name: 'ExhibitMalfunctionDescList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ExhibitMalfunctionDescModal
+    },
+    data () {
+      return {
+        description: '常见故障情况表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'故障描述',
+            align:"center",
+            dataIndex: 'malfunction'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/list",
+          delete: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/delete",
+          deleteBatch: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/deleteBatch",
+          exportXlsUrl: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/exportXls",
+          importExcelUrl: "exhibitMalfunctionDesc/exhibitMalfunctionDesc/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'malfunction',text:'故障描述',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescForm.vue

@@ -0,0 +1,104 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="故障描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="malfunction">
+              <a-input v-model="model.malfunction" placeholder="请输入故障描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ExhibitMalfunctionDescForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/add",
+          edit: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/edit",
+          queryById: "/exhibitMalfunctionDesc/exhibitMalfunctionDesc/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <exhibit-malfunction-desc-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></exhibit-malfunction-desc-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ExhibitMalfunctionDescForm from './ExhibitMalfunctionDescForm'
+
+  export default {
+    name: 'ExhibitMalfunctionDescModal',
+    components: {
+      ExhibitMalfunctionDescForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue/modules/ExhibitMalfunctionDescModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <exhibit-malfunction-desc-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></exhibit-malfunction-desc-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ExhibitMalfunctionDescForm from './ExhibitMalfunctionDescForm'
+  export default {
+    name: 'ExhibitMalfunctionDescModal',
+    components: {
+      ExhibitMalfunctionDescForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/list',
+  save='/exhibitMalfunctionDesc/exhibitMalfunctionDesc/add',
+  edit='/exhibitMalfunctionDesc/exhibitMalfunctionDesc/edit',
+  deleteOne = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/delete',
+  deleteBatch = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/deleteBatch',
+  importExcel = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/importExcel',
+  exportXls = '/exhibitMalfunctionDesc/exhibitMalfunctionDesc/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDesc.data.ts

@@ -0,0 +1,23 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '故障描述',
+    align:"center",
+    dataIndex: 'malfunction'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '故障描述',
+    field: 'malfunction',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/ExhibitMalfunctionDescList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ExhibitMalfunctionDescModal @register="registerModal" @success="handleSuccess"></ExhibitMalfunctionDescModal>
+  </div>
+</template>
+
+<script lang="ts" name="exhibitMalfunctionDesc-exhibitMalfunctionDesc" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ExhibitMalfunctionDescModal from './components/ExhibitMalfunctionDescModal.vue'
+  import {columns, searchFormSchema} from './exhibitMalfunctionDesc.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './exhibitMalfunctionDesc.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '常见故障情况表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"常见故障情况表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMalfunctionDesc/vue3/components/ExhibitMalfunctionDescModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../exhibitMalfunctionDesc.data';
+    import {saveOrUpdate} from '../exhibitMalfunctionDesc.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java

@@ -93,5 +93,5 @@ public class ExhibitRepair implements Serializable {
 
     //维修费用表
     @TableField(exist = false)
-    List<ExhibitRepairExpense> expenseList;
+    List<ExhibitRepairExpense> exhibitRepairExpenseList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitShowpiece/entity/ExhibitShowpiece.java

@@ -40,12 +40,14 @@ public class ExhibitShowpiece implements Serializable {
     private java.lang.String createBy;
 	/**创建日期*/
     @ApiModelProperty(value = "创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private java.util.Date updateTime;
 	/**展品名称*/
 	@Excel(name = "展品名称", width = 15)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 @Api(tags="han_hai_member")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 @Data
@@ -210,4 +210,8 @@ public class HanHaiMember implements Serializable {
 	@Dict(dicCode = "authentic_status")
     @ApiModelProperty(value = "审核状态")
     private java.lang.String status;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -153,6 +153,11 @@
             align:"center",
             dataIndex: 'status_dictText'
           },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -193,6 +198,7 @@
         fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
         fieldList.push({type:'string',value:'department',text:'所在部门',dictCode:"exhibit_department,title,id"})
         fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'authentic_status'})
+        fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -33,6 +33,11 @@
               <j-dict-select-tag type="list" v-model="model.status" dictCode="authentic_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -35,6 +35,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'status_dictText'
    },
+   {
+    title: '备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -79,4 +84,9 @@ export const formSchema: FormSchema[] = [
         dictCode:"authentic_status"
      },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java

@@ -52,4 +52,18 @@ public class ConfigController {
         return configService.queryConfigByParamCode(paramCode);
     }
 
+    //获取展品分类列表
+    @ApiOperation(value="配置-查询展品分类列表", notes="配置-查询展品分类列表")
+    @RequestMapping(value = "/queryCategoryList", method = {RequestMethod.GET})
+    public Result<?> queryCategoryList(String pid, PageBean pageBean){
+        return configService.queryCategoryList(pid, pageBean);
+    }
+
+    //查看常见故障情况
+    @ApiOperation(value="配置-查询常见故障情况", notes="系统配置-查询常见故障情况")
+    @RequestMapping(value = "/queryMalfunctionDescList", method = {RequestMethod.GET})
+    public Result<?> queryMalfunctionDescList(PageBean pageBean){
+        return configService.queryMalfunctionDescList(pageBean);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java

@@ -74,8 +74,8 @@ public class ShowpieceController {
 
     @ApiOperation(value="维修-新增维修记录", notes="维修-新增维修记录")
     @RequestMapping(value = "/addRepair", method = {RequestMethod.POST})
-    public Result<?> addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair){
-        return showpieceService.addRepair(token, exhibitRepair);
+    public Result<?> addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair, String expenseList){
+        return showpieceService.addRepair(token, exhibitRepair, expenseList);
     }
 
     @ApiOperation(value="保养-查看保养记录列表", notes="保养-查看保养记录列表")
@@ -92,8 +92,8 @@ public class ShowpieceController {
 
     @ApiOperation(value="保养-新增保养记录", notes="保养-新增保养记录")
     @RequestMapping(value = "/addMaintenance", method = {RequestMethod.POST})
-    public Result<?> addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance){
-        return showpieceService.addMaintenance(token, exhibitMaintenance);
+    public Result<?> addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance, String expenseList){
+        return showpieceService.addMaintenance(token, exhibitMaintenance, expenseList);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/UserInfoController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.UserInfoService;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,8 +34,15 @@ public class UserInfoController {
     //修改个人信息
     @ApiOperation(value="我的资料-修改个人信息", notes="我的资料-修改个人信息")
     @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
-    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token, String nickName,String phone,String headImage){
-        return userInfoService.updateUserInfo(token, nickName, phone, headImage);
+    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token, String nickName,String phone,String headImage, String department, String remark){
+        return userInfoService.updateUserInfo(token, nickName, phone, headImage, department, remark);
+    }
+
+    //维修/保养记录-人员列表
+    @ApiOperation(value="维修/保养记录-查询人员列表", notes="维修/保养记录-查询人员列表")
+    @RequestMapping(value = "/queryUserList", method = {RequestMethod.GET})
+    public Result<?> queryUserList(PageBean pageBean){
+        return userInfoService.queryUserList(pageBean);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java

@@ -21,4 +21,10 @@ public interface ConfigService {
     //配置-查询系统配置详情
     public Result<?> queryConfigByParamCode(String paramCode);
 
+    //配置-查询展品分类列表
+    public Result<?> queryCategoryList(String pid, PageBean pageBean);
+
+    //配置-查看常见故障情况
+    public Result<?> queryMalfunctionDescList(PageBean pageBean);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java

@@ -35,7 +35,7 @@ public interface ShowpieceService {
     public Result<?> queryRepairById(String repairId);
 
     //维修-新增维修记录
-    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair);
+    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair, String expenseList);
 
     //保养-查看保养记录列表
     public Result<?> queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean);
@@ -44,6 +44,6 @@ public interface ShowpieceService {
     public Result<?> queryMaintenanceById(String maintenanceId);
 
     //保养-新增保养记录
-    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance);
+    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java

@@ -1,6 +1,10 @@
 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.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 public interface UserInfoService {
 
@@ -8,6 +12,9 @@ public interface UserInfoService {
     Result<?> queryUserInfo(String token);
 
     //修改个人信息
-    Result<?> updateUserInfo(String token,String nickName,String phone,String headImage);
+    Result<?> updateUserInfo(String token,String nickName,String phone,String headImage, String department, String remark);
+
+    //维修/保养记录-查询人员列表
+    public Result<?> queryUserList(PageBean pageBean);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java

@@ -10,10 +10,14 @@ import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.ConfigService;
 import org.jeecg.modules.exhibitBanner.entity.ExhibitBanner;
 import org.jeecg.modules.exhibitBanner.service.IExhibitBannerService;
+import org.jeecg.modules.exhibitCategory.entity.ExhibitCategory;
+import org.jeecg.modules.exhibitCategory.service.IExhibitCategoryService;
 import org.jeecg.modules.exhibitConfig.entity.ExhibitConfig;
 import org.jeecg.modules.exhibitConfig.service.IExhibitConfigService;
 import org.jeecg.modules.exhibitDepartment.entity.ExhibitDepartment;
 import org.jeecg.modules.exhibitDepartment.service.IExhibitDepartmentService;
+import org.jeecg.modules.exhibitMalfunctionDesc.entity.ExhibitMalfunctionDesc;
+import org.jeecg.modules.exhibitMalfunctionDesc.service.IExhibitMalfunctionDescService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,15 +27,21 @@ import javax.annotation.Resource;
 public class ConfigServiceImpl implements ConfigService {
 
     /******************************************************************************************************************/
-    //轮播图列表
+    //轮播图信息
     @Resource
     private IExhibitBannerService exhibitBannerService;
-    //轮播图列表
+    //部门信息
     @Resource
     private IExhibitDepartmentService exhibitDepartmentService;
     //轮播图列表
     @Resource
     private IExhibitConfigService exhibitConfigService;
+    //展品分类列表
+    @Resource
+    private IExhibitCategoryService exhibitCategoryService;
+    //展品分类列表
+    @Resource
+    private IExhibitMalfunctionDescService exhibitMalfunctionDescService;
     /******************************************************************************************************************/
     
     //配置-查看轮播图列表
@@ -169,4 +179,77 @@ public class ConfigServiceImpl implements ConfigService {
         }
     }
 
+    //查询展品分类列表
+    @Override
+    public Result<?> queryCategoryList(String pid, PageBean pageBean) {
+        log.info("开始查询展品分类列表");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<ExhibitCategory> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<ExhibitCategory> query = null;
+        //返回信息
+        Page<ExhibitCategory> pageList = null;
+
+        try{
+            //分页
+            page = new Page<ExhibitCategory>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = exhibitCategoryService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotEmpty(pid)){
+                query.eq(ExhibitCategory::getPid, pid);
+            }
+
+            //按照创建时间降序排列
+            query.orderByDesc(ExhibitCategory::getCreateTime);
+
+            //获取展品分类列表信息
+            pageList = query.page(page);
+
+            log.info("展品分类查询结束");
+            return Result.OK("展品分类列表", pageList);
+        }catch (Exception e){
+            log.error("展品分类查询失败");
+            e.printStackTrace();
+            return Result.error("展品分类列表查询失败");
+        }
+    }
+
+    @Override
+    public Result<?> queryMalfunctionDescList(PageBean pageBean) {
+        log.info("开始查询常见故障列表");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<ExhibitMalfunctionDesc> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<ExhibitMalfunctionDesc> query = null;
+        //返回信息
+        Page<ExhibitMalfunctionDesc> pageList = null;
+
+        try{
+            //分页
+            page = new Page<ExhibitMalfunctionDesc>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = exhibitMalfunctionDescService
+                    .lambdaQuery();
+
+            //组装查询条件
+            //按照创建时间降序排列
+            query.orderByDesc(ExhibitMalfunctionDesc::getCreateTime);
+
+            //获取常见故障列表信息
+            pageList = query.page(page);
+
+            log.info("常见故障查询结束");
+            return Result.OK("常见故障列表", pageList);
+        }catch (Exception e){
+            log.error("常见故障查询失败");
+            e.printStackTrace();
+            return Result.error("常见故障列表查询失败");
+        }
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java

@@ -71,6 +71,8 @@ public class LoginApiServiceImpl implements LoginApiService {
             member.setAppletOpenid(wxOpenid);
             member.setNickName(loginReq.getNickName());
             member.setHeadImage(loginReq.getHeadimgurl());
+            member.setDepartment(loginReq.getDepartment());//所在部门
+            member.setRemark(loginReq.getRemark());//备注
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
             hanHaiMemberService.save(member);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.api.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -125,8 +128,12 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
             //组装查询条件
             if(StringUtils.isNotBlank(exhibitMalfunction.getFrequency())){
+                //发生频率
+                query.eq(ExhibitMalfunction::getFrequency, exhibitMalfunction.getFrequency());
+            }
+            if(StringUtils.isNotBlank(exhibitMalfunction.getUrgency())){
                 //紧急程度
-                query.like(ExhibitMalfunction::getFrequency, exhibitMalfunction.getFrequency());
+                query.eq(ExhibitMalfunction::getUrgency, exhibitMalfunction.getUrgency());
             }
             if(StringUtils.isNotBlank(exhibitMalfunction.getStatus())){
                 //维修状态
@@ -139,6 +146,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             //获取报修单信息列表
             pageList = query.page(page);
 
+            for (ExhibitMalfunction record : pageList.getRecords()) {
+                ExhibitShowpiece showpiece = exhibitShowpieceService.getById(record.getShowpieceId());
+                record.setShowpiece(showpiece);
+            }
+
             log.info("报修单信息列表查询结束");
             return Result.OK("报修单信息列表", pageList);
         }catch (Exception e){
@@ -178,8 +190,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
     public Result<?> addMalfunction(String token, ExhibitMalfunction exhibitMalfunction) {
         log.info("开始新增报修单");
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
         //返回信息
         String massege = "";
 
@@ -215,8 +227,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
     public Result<?> updateMalfunction(String token, ExhibitMalfunction exhibitMalfunction) {
         log.info("开始修改报修单");
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
         //返回信息
         String massege = "";
 
@@ -268,12 +280,12 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             //组装查询条件
             if(StringUtils.isNotBlank(exhibitRepair.getShowpieceId())){
                 //关联维修单
-                query.like(ExhibitRepair::getShowpieceId, exhibitRepair.getShowpieceId());
-            }
-            if(StringUtils.isNotBlank(exhibitRepair.getRepairDate().toString())){
-                //时间
-                query.eq(ExhibitRepair::getRepairDate, exhibitRepair.getRepairDate());
+                query.eq(ExhibitRepair::getShowpieceId, exhibitRepair.getShowpieceId());
             }
+//            if(StringUtils.isNotBlank(exhibitRepair.getRepairDate().toString())){
+//                //时间
+//                query.eq(ExhibitRepair::getRepairDate, exhibitRepair.getRepairDate());
+//            }
             if(StringUtils.isNotBlank(exhibitRepair.getRepairName())){
                 //人员
                 query.eq(ExhibitRepair::getRepairName, exhibitRepair.getRepairName());
@@ -288,11 +300,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             //添加维修费用
             for (ExhibitRepair record : pageList.getRecords()) {
                 //添加维修费用
-                List<ExhibitRepairExpense> expenseList = exhibitRepairExpenseService
+                List<ExhibitRepairExpense> exhibitRepairExpenseList = exhibitRepairExpenseService
                         .lambdaQuery()
                         .eq(ExhibitRepairExpense::getRepairId, record.getId())
                         .list();
-                record.setExpenseList(expenseList);
+                record.setExhibitRepairExpenseList(exhibitRepairExpenseList);
             }
 
             log.info("维修记录信息列表查询结束");
@@ -316,11 +328,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             ExhibitRepair one = exhibitRepairService.getById(repairId);
 
             //添加维修费用
-            List<ExhibitRepairExpense> expenseList = exhibitRepairExpenseService
+            List<ExhibitRepairExpense> exhibitRepairExpenseList = exhibitRepairExpenseService
                     .lambdaQuery()
                     .eq(ExhibitRepairExpense::getRepairId, repairId)
                     .list();
-            one.setExpenseList(expenseList);
+            one.setExhibitRepairExpenseList(exhibitRepairExpenseList);
 
             log.info("维修记录信息详情查询结束");
             return Result.OK("维修记录信息详情", one);
@@ -333,11 +345,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
     //维修-新增维修记录
     @Override
-    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair) {
+    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair, String expenseList) {
         log.info("开始新增维修记录");
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
         //返回信息
         String massege = "";
 
@@ -350,9 +362,31 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             }
 
             //2、新增维修记录
-            boolean result =  exhibitRepairService.save(exhibitRepair);
+            String id = IdWorker.getIdStr();//生成维修单id
+            exhibitRepair.setId(id);
+            boolean result1 =  exhibitRepairService.save(exhibitRepair);
+
+            //3、新增费用明细
+            List<ExhibitRepairExpense> list = new ArrayList<>();
+            String[] split = expenseList.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);
+            }
+            boolean result2 = exhibitRepairExpenseService.saveBatch(list);
 
-            if(result){
+            //4、判断维修记录是否新增成功
+            if(result1 && result2){
                 log.info("维修记录新增成功");
                 return Result.OK("维修记录新增成功");
             }else {
@@ -391,10 +425,10 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 //关联维修单
                 query.like(ExhibitMaintenance::getShowpieceId, exhibitMaintenance.getShowpieceId());
             }
-            if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceDate().toString())){
-                //时间
-                query.eq(ExhibitMaintenance::getMaintenanceDate, exhibitMaintenance.getMaintenanceDate());
-            }
+//            if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceDate().toString())){
+//                //时间
+//                query.eq(ExhibitMaintenance::getMaintenanceDate, exhibitMaintenance.getMaintenanceDate());
+//            }
             if(StringUtils.isNotBlank(exhibitMaintenance.getMaintenanceName())){
                 //人员
                 query.eq(ExhibitMaintenance::getMaintenanceName, exhibitMaintenance.getMaintenanceName());
@@ -409,11 +443,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             //添加维修费用
             for (ExhibitMaintenance record : pageList.getRecords()) {
                 //添加维修费用
-                List<ExhibitMaintenanceExpense> expenseList = exhibitMaintenanceExpenseService
+                List<ExhibitMaintenanceExpense> exhibitMaintenanceExpenseList = exhibitMaintenanceExpenseService
                         .lambdaQuery()
                         .eq(ExhibitMaintenanceExpense::getMaintenanceId, record.getId())
                         .list();
-                record.setExpenseList(expenseList);
+                record.setExhibitMaintenanceExpenses(exhibitMaintenanceExpenseList);
             }
 
             log.info("维修记录信息列表查询结束");
@@ -437,11 +471,11 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             ExhibitMaintenance one = exhibitMaintenanceService.getById(maintenanceId);
 
             //填充保养费用
-            List<ExhibitMaintenanceExpense> expenseList = exhibitMaintenanceExpenseService
+            List<ExhibitMaintenanceExpense> exhibitMaintenanceExpenseList = exhibitMaintenanceExpenseService
                     .lambdaQuery()
                     .eq(ExhibitMaintenanceExpense::getMaintenanceId, maintenanceId)
                     .list();
-            one.setExpenseList(expenseList);
+            one.setExhibitMaintenanceExpenses(exhibitMaintenanceExpenseList);
 
             log.info("保养记录详情查询结束");
             return Result.OK("保养记录详情", one);
@@ -454,7 +488,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
     //保养-新增保养记录
     @Override
-    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance) {
+    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList) {
         log.info("开始新增保养记录");
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@@ -471,8 +505,29 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             }
 
             //2、新增维修记录
+            String id = IdWorker.getIdStr();//生成保养单id
+            exhibitMaintenance.setId(id);
             boolean result =  exhibitMaintenanceService.save(exhibitMaintenance);
 
+            //3、新增费用明细
+            List<ExhibitMaintenanceExpense> list = new ArrayList<>();
+            String[] split = expenseList.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);
+            }
+            boolean result2 = exhibitMaintenanceExpenseService.saveBatch(list);
+
             if(result){
                 log.info("保养记录新增成功");
                 return Result.OK("保养记录新增成功");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.api.service.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 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.UserInfoService;
+import org.jeecg.modules.exhibitBanner.entity.ExhibitBanner;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
@@ -45,13 +49,16 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     //修改个人信息
     @Override
-    public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage){
+    public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage, String department, String remark){
         log.info("开始修改个人信息");
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
+            if(!"1".equals(hanHaiMember.getStatus())){
+                return Result.error("用户审核未通过，请联系管理员进行审核");
+            }
             //用户昵称不能为空
             if(StringUtils.isBlank(nickName)){
                 log.error("用户昵称不能为空");
@@ -71,6 +78,12 @@ public class UserInfoServiceImpl implements UserInfoService {
                     return Result.error("该号码已经有人使用，不能重复填写");
                 }
             }
+            if(StringUtils.isNotEmpty(department)){
+                hanHaiMember.setDepartment(department);
+            }
+            if(StringUtils.isNotEmpty(remark)){
+                hanHaiMember.setRemark(remark);
+            }
 
             hanHaiMember.setNickName(nickName);
             hanHaiMember.setPhone(phone);
@@ -92,4 +105,39 @@ public class UserInfoServiceImpl implements UserInfoService {
         }
     }
 
+    @Override
+    public Result<?> queryUserList(PageBean pageBean) {
+        log.info("开始查询用户信息列表");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<HanHaiMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<HanHaiMember> query = null;
+        //返回信息
+        Page<HanHaiMember> pageList = null;
+
+        try{
+            //分页
+            page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = hanHaiMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //按照排序编号升序排列
+            query.orderByDesc(HanHaiMember::getCreateTime);
+
+            //获取用户信息列表
+            pageList = query.page(page);
+
+            log.info("用户信息列表查询结束");
+            return Result.OK("用户信息列表", pageList);
+        }catch (Exception e){
+            log.info("用户信息列表查询失败");
+            e.printStackTrace();
+            return Result.error("用户信息列表查询失败");
+        }
+    }
+
 }