From 7f6dbb573a62879ac102baf42621290ad46cf3b4 Mon Sep 17 00:00:00 2001
From: zxf <1532322479@qq.com>
Date: Sun, 22 Mar 2026 12:30:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/pmmaintenanceorder.js           |  12 +
 admin/src/views/cm/warehouse/DispatchList.vue |  37 ++-
 admin/src/views/fm/bill/charge/index.vue      |   2 +-
 admin/src/views/fm/cash/index.vue             |   2 +-
 .../pm/building/pmbuilding-add-and-update.vue |   2 +-
 .../pm/facility/maintenance/plan/index.vue    | 170 ++++++++++-
 ...acilitymaintenacerecord-add-and-update.vue | 271 ++++++++++++++++--
 .../pm/houser/pmhouse-add-and-update.vue      |   4 +-
 .../pm/maintenance/order/DispatchList.vue     |   2 +-
 .../src/views/pm/maintenance/order/index.vue  |  51 +++-
 admin/src/views/pm/pmowner/index.vue          |  16 +-
 admin/src/views/pm/pmowner/record/index.vue   |   2 +-
 admin/src/views/pm/project/DispatchList.vue   |  45 ++-
 .../controller/CkBillController.java          |  31 +-
 .../controller/CmCustQualifyController.java   |  20 ++
 .../controller/CmShelfController.java         |   4 +-
 .../controller/PmBuildingController.java      |   2 +-
 .../controller/PmCheckInController.java       |  18 ++
 .../PmComplaintSuggestionController.java      |   1 +
 .../PmFacilityMaintenaceRecordController.java | 116 +++++++-
 .../controller/PmHouseController.java         |  29 +-
 .../PmMaintenanceOrderController.java         |  98 ++++++-
 .../controller/PmTenantController.java        |  14 +
 .../entity/PmComplaintSuggestion.java         |   5 +-
 .../entity/PmFacilityMaintenaceRecord.java    |  33 +++
 .../autogencode/entity/PubNoticeRel.java      | 167 +++++------
 .../com/zbkj/front/config/JacksonConfig.java  |   8 +
 27 files changed, 1000 insertions(+), 162 deletions(-)

diff --git a/admin/src/api/pmmaintenanceorder.js b/admin/src/api/pmmaintenanceorder.js
index 08799b5..fbe1929 100644
--- a/admin/src/api/pmmaintenanceorder.js
+++ b/admin/src/api/pmmaintenanceorder.js
@@ -61,3 +61,15 @@ export function pmmaintenanceorderListApi(params) {
     })
 }
 
+/**
+ * pmmaintenanceorder更新状态和备注
+ * @param data
+ */
+export function pmmaintenanceorderUpdateStatusAndRemarkApi(data) {
+    return request({
+        url: `autogencode/pmmaintenanceorder/updateStatusAndRemark`,
+        method: 'POST',
+        data
+    })
+}
+
diff --git a/admin/src/views/cm/warehouse/DispatchList.vue b/admin/src/views/cm/warehouse/DispatchList.vue
index c2a85f3..aeaeeb8 100644
--- a/admin/src/views/cm/warehouse/DispatchList.vue
+++ b/admin/src/views/cm/warehouse/DispatchList.vue
@@ -1,8 +1,21 @@
 <template>
   <div>
-    <div style="margin-bottom: 10px;">
-      <el-button type="primary" size="small" @click="addShelf">新增货架</el-button>
-    </div>
+
+    <el-form :inline="true" :model="searchForm" @keyup.enter.native="getDataList()" style="margin-bottom: 10px;">
+      <el-form-item label="货架代码">
+        <el-input v-model="searchForm.shelfCode" placeholder="请输入货架代码" clearable size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="货架名称">
+        <el-input v-model="searchForm.shelfName" placeholder="请输入货架名称" clearable size="small"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" @click="getDataList()">查询</el-button>
+        <el-button size="small" @click="resetSearchForm()">重置</el-button>
+<!--        <div style="margin-bottom: 10px;">-->
+          <el-button type="primary" size="small" @click="addShelf">新增货架</el-button>
+<!--        </div>-->
+      </el-form-item>
+    </el-form>
     <el-table
       :data="dataList"
       border
@@ -167,6 +180,10 @@ export default {
         warehouseId: '',
         remark: ''
       },
+      searchForm: {
+        shelfCode: '',
+        shelfName: ''
+      },
       dataList: [],
       pageIndex: 1,
       pageSize: 10,
@@ -238,6 +255,15 @@ export default {
       this.pageIndex = 1
       this.getDataList()
     },
+    // 重置搜索表单
+    resetSearchForm() {
+      this.searchForm = {
+        shelfCode: '',
+        shelfName: ''
+      }
+      this.pageIndex = 1
+      this.getDataList()
+    },
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true
@@ -248,9 +274,8 @@ export default {
       }
 
       // 将查询条件添加到参数中
-      if (this.dataForm.shelfCode) params.shelfCode = this.dataForm.shelfCode
-      if (this.dataForm.shelfName) params.shelfName = this.dataForm.shelfName
-      if (this.dataForm.remark) params.remark = this.dataForm.remark
+      if (this.searchForm.shelfCode) params.shelfCode = this.searchForm.shelfCode
+      if (this.searchForm.shelfName) params.shelfName = this.searchForm.shelfName
 
       api.cmshelfListApi(params).then((res) => {
         this.dataListLoading = false
diff --git a/admin/src/views/fm/bill/charge/index.vue b/admin/src/views/fm/bill/charge/index.vue
index eb8196d..468ab3c 100644
--- a/admin/src/views/fm/bill/charge/index.vue
+++ b/admin/src/views/fm/bill/charge/index.vue
@@ -32,7 +32,7 @@
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:fmbillcharge:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+        <el-button v-hasPermi="['autogencode:fmbillcharge:save']" type="primary" @click="addOrUpdateHandle()">新增费用</el-button>
         <el-button v-hasPermi="['autogencode:fmbillcharge:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
diff --git a/admin/src/views/fm/cash/index.vue b/admin/src/views/fm/cash/index.vue
index f8a1144..b5b6890 100644
--- a/admin/src/views/fm/cash/index.vue
+++ b/admin/src/views/fm/cash/index.vue
@@ -47,7 +47,7 @@
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button @click="resetForm()">重置</el-button>
-        <el-button v-hasPermi="['autogencode:fmcash:save']" type="primary" @click="addOrUpdateHandle()">新增数据</el-button>
+        <el-button v-hasPermi="['autogencode:fmcash:save']" type="primary" @click="addOrUpdateHandle()">新增日记账</el-button>
         <el-button v-hasPermi="['autogencode:fmcash:delete']" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
diff --git a/admin/src/views/pm/building/pmbuilding-add-and-update.vue b/admin/src/views/pm/building/pmbuilding-add-and-update.vue
index 7c9a227..492743e 100644
--- a/admin/src/views/pm/building/pmbuilding-add-and-update.vue
+++ b/admin/src/views/pm/building/pmbuilding-add-and-update.vue
@@ -102,7 +102,7 @@
       :default-building-id="dataForm.id"
       :default-project-id="dataForm.projectId"
       @close="houseVisible = false"
-      @refresh-data-list="refreshHouseList"
+      @refreshDataList="refreshHouseList"
       @add-house-to-list="addHouseToList"
     />
   </div>
diff --git a/admin/src/views/pm/facility/maintenance/plan/index.vue b/admin/src/views/pm/facility/maintenance/plan/index.vue
index 73081fc..952347c 100644
--- a/admin/src/views/pm/facility/maintenance/plan/index.vue
+++ b/admin/src/views/pm/facility/maintenance/plan/index.vue
@@ -53,6 +53,7 @@
       border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
+      :row-key="row => row.id"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -60,6 +61,64 @@
         align="center"
         width="50">
       </el-table-column>
+      <el-table-column
+        type="expand"
+        header-align="center"
+        align="center">
+        <template slot-scope="scope">
+          <div class="maintenance-records-container">
+            <el-form :inline="true" :model="getMaintenanceRecordSearchForm(scope.row.id)" @keyup.enter.native="getMaintenanceRecords(scope.row.id)" style="margin-bottom: 10px;">
+              <el-form-item label="维保日期">
+                <el-date-picker
+                  v-model="getMaintenanceRecordSearchForm(scope.row.id).execTimeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  size="small">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="执行人">
+                <el-input v-model="getMaintenanceRecordSearchForm(scope.row.id).executorName" placeholder="请输入执行人" clearable size="small"></el-input>
+              </el-form-item>
+              <el-form-item label="执行部门">
+                <el-input v-model="getMaintenanceRecordSearchForm(scope.row.id).executorDeptName" placeholder="请输入执行部门" clearable size="small"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button size="small" @click="getMaintenanceRecords(scope.row.id)">查询</el-button>
+                <el-button size="small" @click="resetMaintenanceRecordSearchForm(scope.row.id)">重置</el-button>
+                <el-button type="primary" size="small" @click="addMaintenanceRecord(scope.row.id)">新增维保记录</el-button>
+              </el-form-item>
+            </el-form>
+            <el-table :data="getMaintenanceRecordsByPlanId(scope.row.id)" style="width: 100%">
+              <el-table-column prop="execTime" label="维保日期" width="180"></el-table-column>
+              <el-table-column prop="executorName" label="执行人" width="120"></el-table-column>
+              <el-table-column prop="executorDeptName" label="执行部门" width="150"></el-table-column>
+              <el-table-column prop="content" label="维保内容" width="200"></el-table-column>
+              <el-table-column prop="consumables" label="耗材使用" width="150"></el-table-column>
+              <el-table-column prop="costAmount" label="维保费用" width="120">
+                <template slot-scope="recordScope">
+                  {{ recordScope.row.costAmount || 0 }} 元
+                </template>
+              </el-table-column>
+              <el-table-column prop="status" label="维保状态" width="120">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.maintenance_status" :value="scope.row.status" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="result" label="维保结果" width="150"></el-table-column>
+              <el-table-column prop="remark" label="备注" width="150"></el-table-column>
+              <el-table-column label="操作" width="180" fixed="right">
+                <template slot-scope="recordScope">
+                  <el-button type="text" size="small" @click="editMaintenanceRecord(recordScope.row.id, scope.row.id)">{{ '修改' }}</el-button>
+                  <el-button type="text" size="small" @click="deleteMaintenanceRecord(recordScope.row.id, scope.row.id)" style="color: #f56c6c;">{{ '删除' }}</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="facilityId"
         header-align="center"
@@ -130,7 +189,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="150"
+        width="180"
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
@@ -149,17 +208,22 @@
     </el-pagination>
     <!-- 表单弹窗, 新增数据和修改数据 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+
+    <!-- 维保记录表单弹窗 -->
+    <add-or-update-record ref="addOrUpdateRecord" :visible="maintenanceRecordFormVisible" :planId="currentPlanId" @close="maintenanceRecordFormVisible = false" @refreshDataList="saveMaintenanceRecord"></add-or-update-record>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './pmfacilitymaintenanceplan-add-and-update'
+  import AddOrUpdateRecord from '../record/pmfacilitymaintenacerecord-add-and-update'
   import * as api from '@/api/pmfacilitymaintenanceplan.js'
   import * as apiByProject from '@/api/pmproject.js'
   import * as apiByBuilding from '@/api/pmbuilding.js'
   import * as apiByFacility from '@/api/pmfacility.js'
+  import * as apiByRecord from '@/api/pmfacilitymaintenacerecord.js'
   export default {
-    dicts: ['maintenance_type'],
+    dicts: ['maintenance_type','maintenance_status'],
     data () {
       return {
         dataForm: {
@@ -184,11 +248,17 @@
         addOrUpdateVisible: false,
         projectList: [],
         buildingList: [],
-        facilityList: []
+        facilityList: [],
+        // 维保记录相关
+        maintenanceRecordsMap: {}, // 存储每个计划的维保记录
+        maintenanceRecordSearchForms: {}, // 存储每个计划的搜索表单
+        maintenanceRecordFormVisible: false,
+        currentPlanId: null
       }
     },
     components: {
-      AddOrUpdate
+      AddOrUpdate,
+      AddOrUpdateRecord
     },
     activated () {
       this.getDataList()
@@ -350,6 +420,98 @@
           })
         })
       },
+      // 获取维保记录列表
+      getMaintenanceRecords(planId) {
+        const params = {
+          planId: planId
+        }
+        // 添加搜索条件
+        const searchForm = this.getMaintenanceRecordSearchForm(planId)
+        // 处理日期范围
+        if (searchForm.execTimeRange && searchForm.execTimeRange.length === 2) {
+          params.execTimeStart = searchForm.execTimeRange[0]
+          params.execTimeEnd = searchForm.execTimeRange[1]
+        }
+        if (searchForm.executorName) params.executorName = searchForm.executorName
+        if (searchForm.executorDeptName) params.executorDeptName = searchForm.executorDeptName
+
+        apiByRecord.pmfacilitymaintenacerecordListApi(params).then(res => {
+          if (!this.maintenanceRecordsMap[planId]) {
+            this.$set(this.maintenanceRecordsMap, planId, [])
+          }
+          this.$set(this.maintenanceRecordsMap, planId, res.list || [])
+        }).catch(e => {
+          if (!this.maintenanceRecordsMap[planId]) {
+            this.$set(this.maintenanceRecordsMap, planId, [])
+          }
+          this.$set(this.maintenanceRecordsMap, planId, [])
+        })
+      },
+      // 根据计划ID获取维保记录
+      getMaintenanceRecordsByPlanId(planId) {
+        if (!this.maintenanceRecordsMap[planId]) {
+          this.getMaintenanceRecords(planId)
+          return []
+        }
+        return this.maintenanceRecordsMap[planId]
+      },
+      // 获取或创建维保记录搜索表单
+      getMaintenanceRecordSearchForm(planId) {
+        if (!this.maintenanceRecordSearchForms[planId]) {
+          this.$set(this.maintenanceRecordSearchForms, planId, {
+            execTime: '',
+            executorId: '',
+            executorDept: ''
+          })
+        }
+        return this.maintenanceRecordSearchForms[planId]
+      },
+      // 重置维保记录搜索表单
+      resetMaintenanceRecordSearchForm(planId) {
+        this.$set(this.maintenanceRecordSearchForms, planId, {
+          execTimeRange: [],
+          executorName: '',
+          executorDeptName: ''
+        })
+        this.getMaintenanceRecords(planId)
+      },
+      // 新增维保记录
+      addMaintenanceRecord(planId) {
+        this.currentPlanId = planId
+        this.maintenanceRecordFormVisible = true
+        if (this.$refs.addOrUpdateRecord) {
+          this.$refs.addOrUpdateRecord.init(0, planId)
+        }
+      },
+      // 编辑维保记录
+      editMaintenanceRecord(id, planId) {
+        this.currentPlanId = planId
+        this.maintenanceRecordFormVisible = true
+        if (this.$refs.addOrUpdateRecord) {
+          this.$refs.addOrUpdateRecord.init(id, planId)
+        }
+      },
+      // 删除维保记录
+      deleteMaintenanceRecord(id, planId) {
+        this.$confirm('确定要删除这条维保记录吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          apiByRecord.pmfacilitymaintenacerecordDeleteApi([id]).then(() => {
+            this.$message.success('删除成功')
+            this.getMaintenanceRecords(planId)
+          }).catch(() => {
+            // this.$message.error('删除失败')
+          })
+        }).catch(() => {})
+      },
+      // 保存维保记录
+      saveMaintenanceRecord() {
+        if (this.currentPlanId) {
+          this.getMaintenanceRecords(this.currentPlanId)
+        }
+      }
     }
   }
 </script>
diff --git a/admin/src/views/pm/facility/maintenance/record/pmfacilitymaintenacerecord-add-and-update.vue b/admin/src/views/pm/facility/maintenance/record/pmfacilitymaintenacerecord-add-and-update.vue
index c5414f0..b273331 100644
--- a/admin/src/views/pm/facility/maintenance/record/pmfacilitymaintenacerecord-add-and-update.vue
+++ b/admin/src/views/pm/facility/maintenance/record/pmfacilitymaintenacerecord-add-and-update.vue
@@ -46,12 +46,40 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="执行人" prop="executorId">
-            <el-input v-model="dataForm.executorId" placeholder="执行人"></el-input>
+            <el-select v-model="dataForm.executorId" placeholder="请选择执行人" style="width: 100%">
+              <el-option
+                v-for="person in personList"
+                :key="person.uid"
+                :label="person.realName"
+                :value="person.uid">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="执行部门" prop="executorDept">
-            <el-input v-model="dataForm.executorDept" placeholder="执行部门"></el-input>
+            <el-popover
+              placement="bottom-start"
+              width="300"
+              trigger="click"
+              v-model="deptPopoverVisible">
+              <el-tree
+                :data="deptTreeData"
+                :props="{ label: 'deptName', value: 'deptId', children: 'children' }"
+                node-key="deptId"
+                highlight-current
+                default-expand-all
+                @node-click="handleDeptNodeClick">
+              </el-tree>
+              <el-input
+                slot="reference"
+                v-model="deptName"
+                placeholder="请选择执行部门"
+                readonly
+                suffix-icon="el-icon-arrow-down"
+                style="width: 100%">
+              </el-input>
+            </el-popover>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -87,7 +115,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="维保状态" prop="status">
-            <el-input v-model="dataForm.status" placeholder="维保状态"></el-input>
+            <el-select v-model="dataForm.status" placeholder="请选择维保状态" style="width: 100%">
+              <el-option
+                v-for="item in dict.maintenance_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -104,11 +139,14 @@
           <el-form-item label="备注" prop="remark">
             <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
           </el-form-item>
-          <el-col :span="12">
-            <el-form-item label="文件id" prop="fileId">
-              <el-input v-model="dataForm.fileId" placeholder="文件id"></el-input>
-            </el-form-item>
-          </el-col>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="附件上传" prop="files">
+            <FileUploadVO
+              :value="fileList"
+              @input="updateFileList"
+            ></FileUploadVO>
+          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -120,14 +158,23 @@
 </template>
 
 <script>
+      import request from '@/utils/request'
       import * as api from '@/api/pmfacilitymaintenacerecord.js'
       import * as apiByProject from '@/api/pmproject.js'
       import * as apiByBuilding from '@/api/pmbuilding.js'
       import * as apiByFacility from '@/api/pmfacility.js'
+      import * as apiByPlan from '@/api/pmfacilitymaintenanceplan.js'
+      import * as apiByUser from '@/api/ebuser.js'
+      import * as apiByDept from '@/api/dept.js'
+      import FileUploadVO from '@/components/FileUploadVO/index.vue'
       export default {
+        components: {
+          FileUploadVO
+        },
+        dicts: ['maintenance_status'],
         props: {
           planId: {
-            type: Number,
+            type: [String, Number],
             default: 0
           }
         },
@@ -137,6 +184,12 @@
             projectList: [],
             buildingList: [],
             facilityList: [],
+            personList: [],
+            deptList: [],
+            deptTreeData: [],
+            deptName: '',
+            deptPopoverVisible: false,
+            fileList: [], // 文件列表
             dataForm: {
               id: '' ,
               planId: this.planId || '' ,
@@ -153,24 +206,54 @@
               result: '' ,
               fileId: '' ,
               remark: '' ,
+              files: [] ,
             },
             dataRule: {
               executorId: [
-                { required: true, message: '执行人  为必填项', trigger: 'blur' }
+                { required: true, message: '执行人  为必填项', trigger: 'change' }
               ],
               executorDept: [
-                { required: true, message: '执行部门  为必填项', trigger: 'blur' }
+                { required: true, message: '执行部门  为必填项', trigger: 'change' }
               ],
               execTime: [
                 { required: true, message: '执行时间  为必填项', trigger: 'blur' }
               ],
-              content: [
-                { required: true, message: '实际维保内容  为必填项', trigger: 'blur' }
-              ],
+              // content: [
+              //   { required: true, message: '实际维保内容  为必填项', trigger: 'blur' }
+              // ],
             }
           }
         },
     methods: {
+      // 更新文件列表
+      updateFileList(files) {
+        this.fileList = files
+        // 将文件保存到dataForm.files中
+        if (files && files.length > 0) {
+          // 将FileUploadVO返回的文件格式转换为后端SystemAttachment需要的格式
+          this.dataForm.files = files.map(file => {
+            // 处理文件路径，确保符合后端要求的格式
+            let attDir = file.attDir || file.attachFileUrl || ''
+            // 如果路径以/file/public/开头，去掉这个前缀，因为后端存储格式不需要
+            if (attDir.startsWith('/file/public/')) {
+              attDir = attDir.replace('/file/public/', '')
+            } else if (attDir.startsWith('/file/')) {
+              attDir = attDir.replace('/file/', '')
+            }
+
+            return {
+              // 严格按照SystemAttachment的字段要求设置
+              attId: file.id || file.attId || '', // 确保转换为字符串
+              name: file.name || file.oldName || '', // 附件名称
+              attDir: attDir, // 附件路径
+              attSize: file.attSize || '', // 附件大小
+              attType: file.attType || '', // 附件类型
+            }
+          })
+        } else {
+          this.dataForm.files = []
+        }
+      },
       // 获取项目列表
       getProjectList() {
         apiByProject.pmprojectListByAllApi().then(res => {
@@ -211,6 +294,76 @@
           this.facilityList = []
         })
       },
+      // 获取执行人列表
+      getPersonList() {
+        // 调用API获取执行人列表
+        apiByUser.ebuserListApiByAll({ hasOwnerTenantId: true }).then(res => {
+          try {
+            this.personList = Array.isArray(res) ? res : (res.list || [])
+          } catch (processingErr) {
+            this.personList = []
+          }
+        }).catch(err => {
+          this.personList = []
+          console.error('获取执行人列表失败:', err)
+        })
+      },
+      // 获取执行部门列表
+      getDeptList() {
+        return new Promise((resolve, reject) => {
+          // 调用API获取部门树
+          apiByDept.deptTreeSelect().then(res => {
+            try {
+              const treeData = Array.isArray(res) ? res : (res.data || [])
+              // 保存树形数据用于下拉框显示
+              this.deptTreeData = treeData
+              // 处理树形数据，提取所有部门用于查找名称
+              this.deptList = this.flattenDeptTree(treeData)
+              resolve()
+            } catch (processingErr) {
+              this.deptTreeData = []
+              this.deptList = []
+              reject(processingErr)
+            }
+          }).catch(err => {
+            this.deptTreeData = []
+            this.deptList = []
+            console.error('获取执行部门列表失败:', err)
+            reject(err)
+          })
+        })
+      },
+      // 将部门树扁平化为列表
+      flattenDeptTree(treeData) {
+        const result = []
+        const flatten = (nodes) => {
+          nodes.forEach(node => {
+            result.push({
+              id: node.deptId,
+              name: node.deptName
+            })
+            if (node.children && node.children.length > 0) {
+              flatten(node.children)
+            }
+          })
+        }
+        flatten(treeData)
+        return result
+      },
+      // 根据部门ID获取部门名称
+      getDeptNameById(deptId) {
+        if (!deptId) return ''
+        const dept = this.deptList.find(item => item.id == deptId)
+        return dept ? dept.name : ''
+      },
+      // 处理部门树节点点击
+      handleDeptNodeClick(data) {
+        this.dataForm.executorDept = data.deptId
+        this.deptName = data.deptName
+        this.deptPopoverVisible = false
+        // 手动触发执行部门的验证
+        this.$refs.dataForm.validateField('executorDept')
+      },
       // 项目选择变化处理
       handleProjectChange(projectId) {
         this.dataForm.buildingId = '' // 重置楼栋选择
@@ -235,21 +388,71 @@
           this.dataForm.facilityId = facilityId || this.dataForm.facilityId
           this.dataForm.buildingId = buildingId || this.dataForm.buildingId
           this.dataForm.projectId = projectId || this.dataForm.projectId
+          
           // 获取项目列表
           this.getProjectList()
-          // 如果有项目ID，获取楼栋列表
-          if (this.dataForm.projectId) {
-            this.getBuildingList(this.dataForm.projectId)
-            // 如果有楼栋ID，获取设施列表
-            if (this.dataForm.buildingId) {
-              this.getFacilityList(this.dataForm.projectId, this.dataForm.buildingId)
+          // 获取执行人列表
+          this.getPersonList()
+          // 获取执行部门列表
+          this.getDeptList()
+          
+          // 如果有计划ID，获取计划详情
+          if (finalPlanId) {
+            apiByPlan.pmfacilitymaintenanceplanDetailApi(finalPlanId).then(res => {
+              if (res) {
+                // 自动填写项目名称、楼栋名称和设施名称
+                this.dataForm.projectId = res.projectId || this.dataForm.projectId
+                this.dataForm.buildingId = res.buildingId || this.dataForm.buildingId
+                this.dataForm.facilityId = res.facilityId || this.dataForm.facilityId
+                
+                // 如果有项目ID，获取楼栋列表
+                if (this.dataForm.projectId) {
+                  this.getBuildingList(this.dataForm.projectId)
+                  // 如果有楼栋ID，获取设施列表
+                  if (this.dataForm.buildingId) {
+                    this.getFacilityList(this.dataForm.projectId, this.dataForm.buildingId)
+                  }
+                }
+              }
+            }).catch(err => {
+              console.error('获取计划详情失败:', err)
+            })
+          } else {
+            // 如果有项目ID，获取楼栋列表
+            if (this.dataForm.projectId) {
+              this.getBuildingList(this.dataForm.projectId)
+              // 如果有楼栋ID，获取设施列表
+              if (this.dataForm.buildingId) {
+                this.getFacilityList(this.dataForm.projectId, this.dataForm.buildingId)
+              }
             }
           }
+          
           if (this.dataForm.id) {
             api.pmfacilitymaintenacerecordDetailApi(id).then(res => {
               this.dataForm = res;
+              // 处理文件列表
+              if (res.files && res.files.length > 0) {
+                this.fileList = res.files.map(file => ({
+                  id: file.attId || file.id || '',
+                  name: file.name || file.oldName || '',
+                  attDir: file.attDir || file.attachFileUrl || '',
+                  attSize: file.attSize || '',
+                  attType: file.attType || '',
+                  oldName: file.name || file.oldName || ''
+                }))
+              } else {
+                this.fileList = []
+              }
               // 获取项目列表
               this.getProjectList()
+              // 获取执行人列表
+              this.getPersonList()
+              // 获取执行部门列表
+              this.getDeptList().then(() => {
+                // 设置部门名称
+                this.deptName = this.getDeptNameById(this.dataForm.executorDept)
+              })
               // 如果有项目ID，获取楼栋列表
               if (this.dataForm.projectId) {
                 this.getBuildingList(this.dataForm.projectId)
@@ -259,6 +462,9 @@
                 }
               }
             })
+          } else {
+            // 新增时清空文件列表
+            this.fileList = []
           }
         })
       },
@@ -266,10 +472,27 @@
       dataSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            // 发送事件给父组件，将维保记录数据传递过去
-            this.$emit('saveMaintenanceRecord', this.dataForm)
-            this.$message.success('保存成功')
-            this.visible = false
+            if (this.dataForm.id) {
+              // 修改
+              api.pmfacilitymaintenacerecordUpdateApi(this.dataForm).then(res => {
+                this.$message.success('修改成功')
+                this.$emit('refreshDataList')
+                this.visible = false
+              }).catch(err => {
+                this.$message.error('修改失败')
+                console.error(err)
+              })
+            } else {
+              // 新增
+              api.pmfacilitymaintenacerecordCreateApi(this.dataForm).then(res => {
+                this.$message.success('保存成功')
+                this.$emit('refreshDataList')
+                this.visible = false
+              }).catch(err => {
+                this.$message.error('保存失败')
+                console.error(err)
+              })
+            }
           }
         })
       }
diff --git a/admin/src/views/pm/houser/pmhouse-add-and-update.vue b/admin/src/views/pm/houser/pmhouse-add-and-update.vue
index 26b6adb..b3ff3cf 100644
--- a/admin/src/views/pm/houser/pmhouse-add-and-update.vue
+++ b/admin/src/views/pm/houser/pmhouse-add-and-update.vue
@@ -221,7 +221,7 @@
               api.pmhouseUpdateApi(this.dataForm).then(function(res) {
                 this.$message.success('保存成功')
                 this.$emit('close')
-                this.$emit('refresh-data-list')
+                this.$emit('refreshDataList')
               }.bind(this));
             } else {
               // 新增模式：
@@ -230,7 +230,7 @@
                 api.pmhouseCreateApi(this.dataForm).then(function(res) {
                   this.$message.success('新增成功')
                   this.$emit('close')
-                  this.$emit('refresh-data-list')
+                  this.$emit('refreshDataList')
                 }.bind(this));
               } else {
                 // 如果没有楼栋ID，说明楼栋还未保存，将房屋数据传递给父组件暂时保存
diff --git a/admin/src/views/pm/maintenance/order/DispatchList.vue b/admin/src/views/pm/maintenance/order/DispatchList.vue
index a433e44..1cce9a2 100644
--- a/admin/src/views/pm/maintenance/order/DispatchList.vue
+++ b/admin/src/views/pm/maintenance/order/DispatchList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="margin-bottom: 10px;">
-      <el-button type="primary" size="small" @click="addDispatch">办理</el-button>
+      <el-button type="primary" size="small" @click="addDispatch">新增派单记录</el-button>
     </div>
     <el-table
       :data="dataList"
diff --git a/admin/src/views/pm/maintenance/order/index.vue b/admin/src/views/pm/maintenance/order/index.vue
index fcfd1b1..396b1e0 100644
--- a/admin/src/views/pm/maintenance/order/index.vue
+++ b/admin/src/views/pm/maintenance/order/index.vue
@@ -2,13 +2,37 @@
   <div class="divBox">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item label="业主类型">
-        <el-input v-model="dataForm.ownerType" placeholder="请输入业主类型" clearable></el-input>
+        <el-select v-model="dataForm.ownerType" placeholder="请选择业主类型" clearable>
+          <el-option
+            v-for="dict in dict.type.owner_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="报修单号">
         <el-input v-model="dataForm.orderNo" placeholder="请输入报修单号" clearable></el-input>
       </el-form-item>
       <el-form-item label="故障类型">
-        <el-input v-model="dataForm.faultType" placeholder="请输入故障类型" clearable></el-input>
+        <el-select v-model="dataForm.faultType" placeholder="请选择故障类型" clearable>
+          <el-option
+            v-for="dict in dict.type.fault_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="dataForm.status" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.fault_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
@@ -124,6 +148,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
+          <el-button v-if="scope.row.status !== '99'" type="text" size="small" @click="completeOrder(scope.row.id)">{{ '办结' }}</el-button>
           <el-button v-hasPermi="['autogencode:pmmaintenanceorder:delete']" type="text" size="small" @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除</el-button>
         </template>
       </el-table-column>
@@ -328,6 +353,28 @@ import DictTag from '@/components/DictTag'
           })
         })
       },
+      // 办结订单
+      completeOrder (id) {
+        this.$prompt('请输入办结备注', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputPlaceholder: '请输入备注信息'
+        }).then(({ value }) => {
+          // 调用更新状态和备注的API
+          api.pmmaintenanceorderUpdateStatusAndRemarkApi({
+            id: id,
+            status: '99', // 99是已办结状态
+            remark: value
+          }).then(res => {
+            this.$message.success('办结成功')
+            this.getDataList()
+          }).catch(() => {
+            this.$message.error('办结失败')
+          })
+        }).catch(() => {
+          this.$message.info('已取消办结')
+        })
+      },
     }
   }
 </script>
diff --git a/admin/src/views/pm/pmowner/index.vue b/admin/src/views/pm/pmowner/index.vue
index f8e6219..040658e 100644
--- a/admin/src/views/pm/pmowner/index.vue
+++ b/admin/src/views/pm/pmowner/index.vue
@@ -34,7 +34,7 @@
                        @click="addOrUpdateHandle()">新增业主
             </el-button>
             <el-button v-hasPermi="['autogencode:pmowner:delete']" type="danger" @click="deleteHandle()"
-                       :disabled="dataListSelections.length <= 0">批量删除
+                       :disabled="dataListSelections.length <= 0">批量移除
             </el-button>
           </el-form-item>
         </el-form>
@@ -75,7 +75,7 @@
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
               <el-button v-hasPermi="['autogencode:pmowner:delete']" type="text" size="small"
-                         @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除
+                         @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">移除
               </el-button>
             </template>
           </el-table-column>
@@ -207,31 +207,31 @@ export default {
         this.$refs.addOrUpdate.init(id)
       })
     },
-    // 删除处理（支持单个删除和批量删除）
+    // 移除处理（支持单个移除和批量移除）
     deleteHandle(id) {
       let ids = []
       let idText = ''
 
-      // 如果传入了单个id参数，则为单个删除
+      // 如果传入了单个id参数，则为单个移除
       if (id) {
         ids = [id]
         idText = id
       } else {
-        // 否则为批量删除
+        // 否则为批量移除
         ids = this.dataListSelections.map(item => {
           return item.id
         })
         idText = ids.join(',')
       }
 
-      this.$confirm(`确定进行删除操作?`, '提示', {
+      this.$confirm(`确定进行移除操作?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        // 调用批量删除API
+        // 调用批量移除API
         api.pmownerDeleteApi(ids).then(res => {
-          this.$message.success('删除成功')
+          this.$message.success('移除成功')
           this.getDataList()
         })
       })
diff --git a/admin/src/views/pm/pmowner/record/index.vue b/admin/src/views/pm/pmowner/record/index.vue
index de07393..4b38969 100644
--- a/admin/src/views/pm/pmowner/record/index.vue
+++ b/admin/src/views/pm/pmowner/record/index.vue
@@ -238,7 +238,7 @@ export default {
         if (id) {
           pmHouseApi.pmhouseFreeApi([id]).then(() => {
             this.$message.success('删除成功')
-            this.rentRecords.splice(index, 1)
+            this.getRentRecords() // 删除后重新加载数据
           }).catch(() => {
             this.$message.error('删除失败')
           })
diff --git a/admin/src/views/pm/project/DispatchList.vue b/admin/src/views/pm/project/DispatchList.vue
index aa1d418..a46b19f 100644
--- a/admin/src/views/pm/project/DispatchList.vue
+++ b/admin/src/views/pm/project/DispatchList.vue
@@ -1,8 +1,28 @@
 <template>
   <div>
-    <div style="margin-bottom: 10px;">
-      <el-button type="primary" size="small" @click="addBuilding">新增楼栋</el-button>
-    </div>
+
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" style="margin-bottom: 10px;">
+      <el-form-item label="楼栋编号">
+        <el-input v-model="dataForm.buildingNo" placeholder="请输入楼栋编号" clearable size="small"></el-input>
+      </el-form-item>
+      <el-form-item label="楼栋类型">
+        <el-select v-model="dataForm.buildingType" placeholder="请选择楼栋类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.building_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" @click="getDataList()">查询</el-button>
+        <el-button size="small" @click="resetForm()">重置</el-button>
+<!--        <div style="margin-bottom: 10px;">-->
+          <el-button type="primary" size="small" @click="addBuilding">新增楼栋</el-button>
+<!--        </div>-->
+      </el-form-item>
+    </el-form>
     <el-table
       :data="dataList"
       border
@@ -79,9 +99,6 @@
       :append-to-body="true"
       :before-close="handleHouseDialogClose">
       <div>
-        <div style="margin-bottom: 10px;">
-          <el-button type="primary" size="small" @click="addHouse">新增房屋</el-button>
-        </div>
         <el-form :inline="true" :model="houseSearchForm" @keyup.enter.native="getHouseDataList()" style="margin-bottom: 10px;">
           <el-form-item label="单元号">
             <el-input v-model="houseSearchForm.unitNo" placeholder="请输入单元号" clearable size="small"></el-input>
@@ -108,6 +125,7 @@
           <el-form-item>
             <el-button size="small" @click="getHouseDataList()">查询</el-button>
             <el-button size="small" @click="resetHouseSearchForm()">重置</el-button>
+            <el-button type="primary" size="small" @click="addHouse">新增房屋</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -291,6 +309,11 @@
           limit: this.pageSize,
           projectId: this.projectId
         }
+
+        // 添加搜索条件
+        if (this.dataForm.buildingNo) params.buildingNo = this.dataForm.buildingNo;
+        if (this.dataForm.buildingType) params.buildingType = this.dataForm.buildingType;
+
         api.pmbuildingListApi(params).then(res => {
           this.dataListLoading = false
           this.dataList = res.list || []
@@ -303,6 +326,16 @@
           this.dataListLoading = false
         })
       },
+
+      // 重置表单
+      resetForm() {
+        this.dataForm = {
+          buildingNo: '',
+          buildingType: ''
+        }
+        this.pageIndex = 1
+        this.getDataList()
+      },
       sizeChangeHandle (val) {
         this.pageSize = val
         this.pageIndex = 1
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillController.java
index 5f7ce1d..d1bb0a9 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CkBillController.java
@@ -15,10 +15,12 @@ import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.exception.ExceptionCodeEnum;
 import com.zbkj.modules.autogencode.entity.*;
+import com.zbkj.modules.autogencode.entity.CkStockChange;
 import com.zbkj.modules.autogencode.service.CkBillCargoService;
 import com.zbkj.modules.autogencode.service.CkBillStockService;
 import com.zbkj.modules.autogencode.service.CkCargoStockService;
 import com.zbkj.modules.autogencode.service.CkBillCargoMenuRelService;
+import com.zbkj.modules.autogencode.service.CkStockChangeService;
 import com.zbkj.modules.autogencode.service.PmDailyMenuDtlService;
 import com.zbkj.modules.autogencode.service.PmDailyMenuService;
 import com.zbkj.service.service.SystemAttachmentService;
@@ -67,6 +69,9 @@ public class CkBillController {
     
     @Autowired
     private PmDailyMenuService pmDailyMenuService;
+    
+    @Autowired
+    private CkStockChangeService ckStockChangeService;
 
     /**
      * 条件设置
@@ -438,10 +443,30 @@ public class CkBillController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Long[] ids){
-        if (ckBillService.removeByIds(Arrays.asList(ids))) {
-            return CommonResult.success();
+        for (int i = 0; i < ids.length; i++) {
+            Long id = ids[i];
+            CkBill ckBill = ckBillService.getById(id);
+            if (ckBill.getBillStatus().equals("1")) {
+                return CommonResult.failed("此单据已经提交，不允许删除");
+            }
+            LambdaQueryWrapper<CkBillCargo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.select(CkBillCargo::getId);
+            wrapper.eq(CkBillCargo::getBillId,id);
+            List<Object> list = ckBillCargoService.listObjs(wrapper);
+            ckBillCargoService.remove(wrapper);
+//            ckBillCargoService.removeBatchByIds(list);
+            //删除入库记录
+            ckStockChangeService.remove(new LambdaQueryWrapper<CkStockChange>().eq(CkStockChange::getBillId,id));
+            //单据明细下出入库信息
+            if (!list.isEmpty()) {
+                LambdaQueryWrapper<CkBillStock> stockWapper = new LambdaQueryWrapper<>();
+                stockWapper.in(CkBillStock::getBillCargoId,list);
+                ckBillStockService.remove(stockWapper);
+            }
+            ckBillService.removeById(id);
         }
-        return CommonResult.failed();
+
+        return CommonResult.success();
     }
 
 
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustQualifyController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustQualifyController.java
index 8364b02..8ab6d89 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustQualifyController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmCustQualifyController.java
@@ -19,7 +19,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.modules.autogencode.entity.CmCustQualify;
+import com.zbkj.modules.autogencode.entity.CmCustQualifyFile;
 import com.zbkj.modules.autogencode.service.CmCustQualifyService;
+import com.zbkj.modules.autogencode.service.CmCustQualifyFileService;
 
 
 
@@ -32,6 +34,9 @@ import com.zbkj.modules.autogencode.service.CmCustQualifyService;
 public class CmCustQualifyController {
     @Autowired
     private CmCustQualifyService cmCustQualifyService;
+    
+    @Autowired
+    private CmCustQualifyFileService cmCustQualifyFileService;
 
 
 
@@ -174,6 +179,17 @@ public class CmCustQualifyController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Long[] ids){
+        // 检查是否有已经提交的资质文件
+        for (Long id : ids) {
+            LambdaQueryWrapper<CmCustQualifyFile> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CmCustQualifyFile::getQualifyId, id);
+            queryWrapper.eq(CmCustQualifyFile::getDelFlag, "0");
+            long count = cmCustQualifyFileService.count(queryWrapper);
+            if (count > 0) {
+                return CommonResult.failed("删除失败，该资质下存在已经提交的资质文件，请先删除这些文件");
+            }
+        }
+
         if (cmCustQualifyService.removeByIds(Arrays.asList(ids))) {
             return CommonResult.success();
         }
@@ -181,3 +197,7 @@ public class CmCustQualifyController {
     }
 
 }
+
+
+
+
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
index c1a49c9..6d537bb 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/CmShelfController.java
@@ -60,12 +60,12 @@ public class CmShelfController {
                     
         // 货架代码
         if (StrUtil.isNotBlank(request.getShelfCode())) {
-            queryWrapper.eq(CmShelf::getShelfCode, request.getShelfCode());
+            queryWrapper.like(CmShelf::getShelfCode, request.getShelfCode());
         }
                     
         // 货架名称
         if (StrUtil.isNotBlank(request.getShelfName())) {
-            queryWrapper.eq(CmShelf::getShelfName, request.getShelfName());
+            queryWrapper.like(CmShelf::getShelfName, request.getShelfName());
         }
                     
         // 归属仓库ID
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmBuildingController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmBuildingController.java
index bc106f2..9b33121 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmBuildingController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmBuildingController.java
@@ -59,7 +59,7 @@ public class PmBuildingController {
                     
         // 楼栋编号
         if (StrUtil.isNotBlank(request.getBuildingNo())) {
-            queryWrapper.eq(PmBuilding::getBuildingNo, request.getBuildingNo());
+            queryWrapper.like(PmBuilding::getBuildingNo, request.getBuildingNo());
         }
                     
         // 总层数
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCheckInController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCheckInController.java
index bae4c10..f5936be 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCheckInController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCheckInController.java
@@ -673,6 +673,24 @@ public class PmCheckInController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Long[] ids){
+        // 检查是否有对应的退房信息
+        List<PmCheckIn> checkInList = pmCheckInService.listByIds(Arrays.asList(ids));
+        List<Long> tenantHouseIds = new ArrayList<>();
+        for (PmCheckIn checkIn : checkInList) {
+            if (checkIn.getTenantHouseId() != null) {
+                tenantHouseIds.add(checkIn.getTenantHouseId());
+            }
+        }
+        
+        if (!tenantHouseIds.isEmpty()) {
+            LambdaQueryWrapper<PmCheckOut> checkoutQuery = new LambdaQueryWrapper<>();
+            checkoutQuery.in(PmCheckOut::getTenantHouseId, tenantHouseIds);
+            long checkoutCount = pmCheckOutService.count(checkoutQuery);
+            if (checkoutCount > 0) {
+                return CommonResult.failed("删除失败，该入住记录下存在对应的退房信息，请先删除对应的退房信息");
+            }
+        }
+
         if (pmCheckInService.removeByIds(Arrays.asList(ids))) {
             return CommonResult.success();
         }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmComplaintSuggestionController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmComplaintSuggestionController.java
index f4087ea..19bf797 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmComplaintSuggestionController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmComplaintSuggestionController.java
@@ -575,6 +575,7 @@ public class PmComplaintSuggestionController {
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public CommonResult<String> delete(@RequestBody Long[] ids){
+
         if (pmComplaintSuggestionService.removeByIds(Arrays.asList(ids))) {
             return CommonResult.success();
         }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmFacilityMaintenaceRecordController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmFacilityMaintenaceRecordController.java
index 42576e0..3ba6f68 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmFacilityMaintenaceRecordController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmFacilityMaintenaceRecordController.java
@@ -1,13 +1,22 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Random;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zbkj.common.model.system.SysDept;
+import com.zbkj.common.model.system.SystemAttachment;
+import com.zbkj.common.model.user.User;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.service.service.SysDeptService;
+import com.zbkj.service.service.SystemAttachmentService;
+import com.zbkj.service.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +41,15 @@ import com.zbkj.modules.autogencode.service.PmFacilityMaintenaceRecordService;
 public class PmFacilityMaintenaceRecordController {
     @Autowired
     private PmFacilityMaintenaceRecordService pmFacilityMaintenaceRecordService;
+    
+    @Autowired
+    private SysDeptService sysDeptService;
+    
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private SystemAttachmentService systemAttachmentService;
 
 
 
@@ -90,6 +108,14 @@ public class PmFacilityMaintenaceRecordController {
         if (request.getExecTime() != null) {
             queryWrapper.eq(PmFacilityMaintenaceRecord::getExecTime, request.getExecTime());
         }
+        
+        // 执行时间范围查询
+        if (request.getExecTimeStart() != null) {
+            queryWrapper.ge(PmFacilityMaintenaceRecord::getExecTime, request.getExecTimeStart());
+        }
+        if (request.getExecTimeEnd() != null) {
+            queryWrapper.le(PmFacilityMaintenaceRecord::getExecTime, request.getExecTimeEnd());
+        }
                     
         // 实际维保内容
         if (StrUtil.isNotBlank(request.getContent())) {
@@ -160,6 +186,18 @@ public class PmFacilityMaintenaceRecordController {
         if (StrUtil.isNotBlank(request.getTenantId())) {
             queryWrapper.eq(PmFacilityMaintenaceRecord::getTenantId, request.getTenantId());
         }
+        
+        // 执行人名称（虚拟字段，通过子查询关联用户表）
+        if (StrUtil.isNotBlank(request.getExecutorName())) {
+            queryWrapper.inSql(PmFacilityMaintenaceRecord::getExecutorId,
+                    "select uid from eb_user where real_name like '%" + request.getExecutorName() + "%'");
+        }
+        
+        // 执行部门名称（虚拟字段，通过子查询关联部门表）
+        if (StrUtil.isNotBlank(request.getExecutorDeptName())) {
+            queryWrapper.inSql(PmFacilityMaintenaceRecord::getExecutorDept,
+                    "select dept_id from sys_dept where dept_name like '%" + request.getExecutorDeptName() + "%'");
+        }
             
     }
 
@@ -176,8 +214,44 @@ public class PmFacilityMaintenaceRecordController {
         
         // 应用搜索条件
         condition(queryWrapper, request);
+
+
+        List<PmFacilityMaintenaceRecord> pmFacilityMaintenaceRecords = pmFacilityMaintenaceRecordService.pageList(queryWrapper, pageParamRequest);
         
-        CommonPage<PmFacilityMaintenaceRecord> page = CommonPage.restPage(pmFacilityMaintenaceRecordService.pageList(queryWrapper, pageParamRequest));
+        // 查询出用户表和部门表，然后做成map，之后为pmFacilityMaintenaceRecords赋值，执行部门名称和执行人名称，也就是虚拟字段
+        if (pmFacilityMaintenaceRecords != null && !pmFacilityMaintenaceRecords.isEmpty()) {
+            // 查询用户表，做成map
+            LambdaQueryWrapper<User> userQueryWrapper = new LambdaQueryWrapper<>();
+            List<User> userList = userService.list(userQueryWrapper);
+            Map<Long, String> userMap = userList.stream()
+                    .collect(Collectors.toMap(
+                                    user -> Long.valueOf(user.getUid()),
+                                    User::getRealName,
+                                    (existing, replacement) -> existing
+                            ));
+            
+            // 查询部门表，做成map
+            LambdaQueryWrapper<SysDept> deptQueryWrapper = new LambdaQueryWrapper<>();
+            List<SysDept> deptList = sysDeptService.list(deptQueryWrapper);
+            Map<Long, String> deptMap = deptList.stream()
+                    .collect(Collectors.toMap(
+                                    SysDept::getDeptId,
+                                    SysDept::getDeptName,
+                                    (existing, replacement) -> existing
+                            ));
+            
+            // 为pmFacilityMaintenaceRecords赋值执行部门名称和执行人名称
+            for (PmFacilityMaintenaceRecord record : pmFacilityMaintenaceRecords) {
+                if (userMap != null && record.getExecutorId() != null) {
+                    record.setExecutorName(userMap.get(record.getExecutorId()));
+                }
+                if (deptMap != null && record.getExecutorDept() != null) {
+                    record.setExecutorDeptName(deptMap.get(record.getExecutorDept()));
+                }
+            }
+        }
+
+        CommonPage<PmFacilityMaintenaceRecord> page = CommonPage.restPage(pmFacilityMaintenaceRecords);
         return CommonResult.success(page);
     }
 
@@ -188,6 +262,9 @@ public class PmFacilityMaintenaceRecordController {
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     public CommonResult<PmFacilityMaintenaceRecord> info(@PathVariable("id") Long id){
 		PmFacilityMaintenaceRecord pmFacilityMaintenaceRecord = pmFacilityMaintenaceRecordService.getById(id);
+        
+        // 设置文件列表
+        setFile(pmFacilityMaintenaceRecord);
 
         return CommonResult.success(pmFacilityMaintenaceRecord);
     }
@@ -197,6 +274,11 @@ public class PmFacilityMaintenaceRecordController {
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public CommonResult<String> save(@RequestBody PmFacilityMaintenaceRecord pmFacilityMaintenaceRecord){
+        // 处理文件保存
+        if (pmFacilityMaintenaceRecord.getFiles() != null) {
+            updateFile(pmFacilityMaintenaceRecord);
+        }
+        
         if (pmFacilityMaintenaceRecordService.save(pmFacilityMaintenaceRecord)) {
             return CommonResult.success();
         }
@@ -208,11 +290,43 @@ public class PmFacilityMaintenaceRecordController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public CommonResult<String> update(@RequestBody PmFacilityMaintenaceRecord pmFacilityMaintenaceRecord){
+        // 处理文件保存
+        if (pmFacilityMaintenaceRecord.getFiles() != null) {
+            updateFile(pmFacilityMaintenaceRecord);
+        }
+        
         if (pmFacilityMaintenaceRecordService.updateById(pmFacilityMaintenaceRecord)) {
             return CommonResult.success();
         }
         return CommonResult.failed();
     }
+    
+    /**
+     * 更新文件
+     */
+    private void updateFile(PmFacilityMaintenaceRecord pmFacilityMaintenaceRecord) {
+        Long newId = System.currentTimeMillis() + new Random().nextInt(1000);
+        List<SystemAttachment> files = pmFacilityMaintenaceRecord.getFiles();
+        if (files != null && !files.isEmpty()) {
+            for (SystemAttachment attachment : files) {
+                attachment.setFileId(String.valueOf(newId));
+            }
+            systemAttachmentService.updateBatchById(files);
+            pmFacilityMaintenaceRecord.setFileId(newId);
+        }
+    }
+    
+    /**
+     * 设置文件列表
+     */
+    private void setFile(PmFacilityMaintenaceRecord pmFacilityMaintenaceRecord) {
+        Long fileId = pmFacilityMaintenaceRecord.getFileId();
+        if (fileId != null) {
+            List<SystemAttachment> list = systemAttachmentService.list(new LambdaQueryWrapper<SystemAttachment>()
+                    .eq(SystemAttachment::getFileId, fileId));
+            pmFacilityMaintenaceRecord.setFiles(list);
+        }
+    }
 
     /**
      * 删除:根据id集合
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmHouseController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmHouseController.java
index 8d0ac19..ce72e2e 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmHouseController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmHouseController.java
@@ -353,27 +353,36 @@ public class PmHouseController {
         }
         pmHouseService.updateBatchById(list);
 
-        // 对应的PmTenantHouse ，还有 PmOwnerHouseRel 删除掉
+        // 对应的PmOwnerHouseRel 删除掉
         // 查询与这些房屋相关的PmOwnerHouseRel记录
         List<PmOwnerHouseRel> rels = pmOwnerHouseRelService.list(new LambdaQueryWrapper<PmOwnerHouseRel>()
                 .in(PmOwnerHouseRel::getHouseId, ids));
 
         if (rels != null && !rels.isEmpty()) {
-            // 获取所有关联的tenantHouseId
-            List<Long> tenantHouseIds = rels.stream()
-                    .map(PmOwnerHouseRel::getTenantHouseId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-
             // 删除PmOwnerHouseRel记录
             pmOwnerHouseRelService.removeByIds(rels.stream()
                     .map(PmOwnerHouseRel::getId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList()));
 
-            // 删除对应的PmTenantHouse记录
-            if (!tenantHouseIds.isEmpty()) {
-                pmTenantHouseService.removeByIds(tenantHouseIds);
+            // 检查每个tenantHouseId是否还有其他关联的PmOwnerHouseRel记录
+            // 如果没有，则删除对应的PmTenantHouse记录
+            List<Long> tenantHouseIds = rels.stream()
+                    .map(PmOwnerHouseRel::getTenantHouseId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toList());
+
+            for (Long tenantHouseId : tenantHouseIds) {
+                // 查询该tenantHouseId是否还有其他关联的PmOwnerHouseRel记录
+                int count = pmOwnerHouseRelService.count(new LambdaQueryWrapper<PmOwnerHouseRel>()
+                        .eq(PmOwnerHouseRel::getTenantHouseId, tenantHouseId)
+                        .eq(PmOwnerHouseRel::getDelFlag, "0"));
+
+                // 如果没有其他关联记录，则删除PmTenantHouse记录
+                if (count == 0) {
+                    pmTenantHouseService.removeById(tenantHouseId);
+                }
             }
         }
 
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmMaintenanceOrderController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmMaintenanceOrderController.java
index 8b36777..919a7a2 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmMaintenanceOrderController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmMaintenanceOrderController.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -196,23 +198,71 @@ public class PmMaintenanceOrderController {
         
         CommonPage<PmMaintenanceOrder> page = CommonPage.restPage(pmMaintenanceOrderService.pageList(queryWrapper, pageParamRequest));
 
-        // 翻译业主名称和房屋名称
+        // 收集所有需要查询的ID
+        List<Long> ownerIds = new ArrayList<>();
+        List<Long> tenantIds = new ArrayList<>();
+        List<Long> houseIds = new ArrayList<>();
+        
+        for (PmMaintenanceOrder item : page.getList()) {
+            // 收集业主/租户ID
+            if (item.getOwnerId() != null) {
+                if ("1".equals(item.getOwnerType())) {
+                    ownerIds.add(item.getOwnerId());
+                } else if ("2".equals(item.getOwnerType())) {
+                    tenantIds.add(item.getOwnerId());
+                }
+            }
+            
+            // 收集房屋ID
+            if (item.getHouseId() != null) {
+                houseIds.add(item.getHouseId());
+            }
+        }
+        
+        // 批量查询并构建map
+        Map<Long, PmOwner> ownerMap = new HashMap<>();
+        if (!ownerIds.isEmpty()) {
+            List<PmOwner> owners = pmOwnerService.listByIds(ownerIds);
+            for (PmOwner owner : owners) {
+                ownerMap.put(owner.getId(), owner);
+            }
+        }
+        
+        Map<Long, PmTenant> tenantMap = new HashMap<>();
+        if (!tenantIds.isEmpty()) {
+            List<PmTenant> tenants = pmTenantService.listByIds(tenantIds);
+            for (PmTenant tenant : tenants) {
+                tenantMap.put(tenant.getId(), tenant);
+            }
+        }
+        
+        Map<Long, PmHouse> houseMap = new HashMap<>();
+        if (!houseIds.isEmpty()) {
+            List<PmHouse> houses = pmHouseService.listByIds(houseIds);
+            for (PmHouse house : houses) {
+                houseMap.put(house.getId(), house);
+            }
+        }
+        
+        // 翻译业主名称、房屋名称并设置文件信息
         for (PmMaintenanceOrder item : page.getList()) {
+            // 设置文件信息
+            setFile(item);
 
             // 翻译业主名称
             if (item.getOwnerId() != null) {
                 if ("1".equals(item.getOwnerType())) {
-                    PmOwner owner = pmOwnerService.getById(item.getOwnerId());
+                    PmOwner owner = ownerMap.get(item.getOwnerId());
                     item.setOwnerName(owner != null ? owner.getOwnerName() : "");
                 } else if ("2".equals(item.getOwnerType())) {
-                    PmTenant tenant = pmTenantService.getById(item.getOwnerId());
+                    PmTenant tenant = tenantMap.get(item.getOwnerId());
                     item.setOwnerName(tenant != null ? tenant.getTenantName() : "");
                 }
             }
             
             // 翻译房屋名称
             if (item.getHouseId() != null) {
-                PmHouse house = pmHouseService.getById(item.getHouseId());
+                PmHouse house = houseMap.get(item.getHouseId());
                 if (house != null) {
                     StringBuilder houseName = new StringBuilder();
                     if (house.getUnitNo() != null) {
@@ -404,6 +454,46 @@ public class PmMaintenanceOrderController {
         }
     }
 
+    /**
+     * 修改状态和备注
+     */
+    @RequestMapping(value = "/updateStatusAndRemark", method = RequestMethod.POST)
+    public CommonResult<String> updateStatusAndRemark(@RequestBody Map<String, Object> params) {
+        Long id = null;
+        Object idObj = params.get("id");
+        if (idObj != null) {
+            if (idObj instanceof Number) {
+                id = ((Number) idObj).longValue();
+            } else if (idObj instanceof String) {
+                try {
+                    id = Long.parseLong((String) idObj);
+                } catch (NumberFormatException e) {
+                    return CommonResult.failed("订单ID格式错误");
+                }
+            }
+        }
+        String status = (String) params.get("status");
+        String remark = (String) params.get("remark");
+        
+        if (id == null) {
+            return CommonResult.failed("订单ID不能为空");
+        }
+        
+        PmMaintenanceOrder pmMaintenanceOrder = pmMaintenanceOrderService.getById(id);
+        if (pmMaintenanceOrder == null) {
+            return CommonResult.failed("订单不存在");
+        }
+        
+        // 只修改状态和备注
+        pmMaintenanceOrder.setStatus(status);
+        pmMaintenanceOrder.setRemark(remark);
+        
+        if (pmMaintenanceOrderService.updateById(pmMaintenanceOrder)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
     /**
      * 删除:根据id集合
      */
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
index bca8bc4..0bd256a 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmTenantController.java
@@ -3,6 +3,7 @@ package com.zbkj.modules.autogencode.controller;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
@@ -290,7 +291,20 @@ public class PmTenantController {
             return CommonResult.failed("删除失败，该租户下存在关联的员工，请先处理相关员工");
         }
         
+        // 获取租户对应的部门ID
+        List<Long> deptIds = new ArrayList<>();
+        List<PmTenant> tenants = pmTenantService.listByIds(Arrays.asList(ids));
+        for (PmTenant tenant : tenants) {
+            if (tenant.getDeptId() != null) {
+                deptIds.add(tenant.getDeptId());
+            }
+        }
+        
         if (pmTenantService.removeByIds(Arrays.asList(ids))) {
+            // 删除对应的SysDept
+            if (!deptIds.isEmpty()) {
+                sysDeptService.removeByIds(deptIds);
+            }
             return CommonResult.success();
         }
         return CommonResult.failed();
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmComplaintSuggestion.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmComplaintSuggestion.java
index bfe7a56..d5336e2 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmComplaintSuggestion.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmComplaintSuggestion.java
@@ -3,6 +3,8 @@ package com.zbkj.modules.autogencode.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 	import java.io.Serializable;
@@ -19,7 +21,8 @@ public class PmComplaintSuggestion implements Serializable {
 		 * id
 	 */
 	@ApiModelProperty(value = "id")
-		@TableId
+	@TableId
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 	/**
 		 * 类型
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmFacilityMaintenaceRecord.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmFacilityMaintenaceRecord.java
index e61ad34..24de510 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmFacilityMaintenaceRecord.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmFacilityMaintenaceRecord.java
@@ -1,14 +1,17 @@
 package com.zbkj.modules.autogencode.entity;
 
 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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.zbkj.common.model.system.SystemAttachment;
 import io.swagger.annotations.ApiModelProperty;
 
 	import java.math.BigDecimal;
 	import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import lombok.Data;
 
 
@@ -134,5 +137,35 @@ public class PmFacilityMaintenaceRecord implements Serializable {
 	 */
 	@ApiModelProperty(value = "租户ID")
 	private String tenantId;
+	/**
+		 * 执行人名称（虚拟字段）
+	 */
+	@ApiModelProperty(value = "执行人名称")
+	@TableField(exist = false)
+	private String executorName;
+	/**
+		 * 执行部门名称（虚拟字段）
+	 */
+	@ApiModelProperty(value = "执行部门名称")
+	@TableField(exist = false)
+	private String executorDeptName;
+	/**
+		 * 执行时间开始（查询用虚拟字段）
+	 */
+	@ApiModelProperty(value = "执行时间开始")
+	@TableField(exist = false)
+	private String execTimeStart;
+	/**
+		 * 执行时间结束（查询用虚拟字段）
+	 */
+	@ApiModelProperty(value = "执行时间结束")
+	@TableField(exist = false)
+	private String execTimeEnd;
+	/**
+		 * 附件列表（虚拟字段）
+	 */
+	@ApiModelProperty(value = "附件列表")
+	@TableField(exist = false)
+	private List<SystemAttachment> files;
 
 }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PubNoticeRel.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PubNoticeRel.java
index f1b2cd5..f6b6414 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PubNoticeRel.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PubNoticeRel.java
@@ -4,96 +4,97 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 
-	import java.io.Serializable;
+import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
 @Data
 @TableName("pub_notice_rel")
 public class PubNoticeRel implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-		 * 通知关联ID
-	 */
-	@ApiModelProperty(value = "通知关联ID")
-		@TableId
-	private String relId;
-	/**
-		 * 通知ID
-	 */
-	@ApiModelProperty(value = "通知ID")
-	private String noticeId;
-	/**
-		 * 关联类型U用户D部门
-	 */
-	@ApiModelProperty(value = "关联类型U用户D部门")
-	private String relType;
-	/**
-		 * 通知人员
-	 */
-	@ApiModelProperty(value = "通知人员")
-	private String userCode;
-	/**
-		 * 是否已读
-	 */
-	@ApiModelProperty(value = "是否已读")
-	private String isRead;
-	/**
-		 * 阅读时间
-	 */
-	@ApiModelProperty(value = "阅读时间")
-	private Date readTime;
-	/**
-		 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	/**
-		 * 部门ID
-	 */
-	@ApiModelProperty(value = "部门ID")
-	private String deptId;
-	/**
-		 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
-	/**
-		 * 创建人
-	 */
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**
-		 * 创建时间
-	 */
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**
-		 * 修改人
-	 */
-	@ApiModelProperty(value = "修改人")
-	private String updateBy;
-	/**
-		 * 修改时间
-	 */
-	@ApiModelProperty(value = "修改时间")
-	private Date updateTime;
-	/**
-		 * 更新时间戳
-	 */
-	@ApiModelProperty(value = "更新时间戳")
-	private Date updatestamp;
-	/**
-		 * 同步时间戳
-	 */
-	@ApiModelProperty(value = "同步时间戳")
-	private Date syncstamp;
-	/**
-		 * 删除标志 1=正常 0=已删除
-	 */
-	@ApiModelProperty(value = "删除标志 1=正常 0=已删除")
-	private String delFlag;
+    /**
+     * 通知关联ID
+     */
+    @ApiModelProperty(value = "通知关联ID")
+    @TableId
+    private String relId;
+    /**
+     * 通知ID
+     */
+    @ApiModelProperty(value = "通知ID")
+    private String noticeId;
+    /**
+     * 关联类型U用户D部门
+     */
+    @ApiModelProperty(value = "关联类型U用户D部门")
+    private String relType;
+    /**
+     * 通知人员
+     */
+    @ApiModelProperty(value = "通知人员")
+    private String userCode;
+    /**
+     * 是否已读
+     */
+    @ApiModelProperty(value = "是否已读")
+    private String isRead;
+    /**
+     * 阅读时间
+     */
+    @ApiModelProperty(value = "阅读时间")
+    private Date readTime;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 部门ID
+     */
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    /**
+     * 更新时间戳
+     */
+    @ApiModelProperty(value = "更新时间戳")
+    private Date updatestamp;
+    /**
+     * 同步时间戳
+     */
+    @ApiModelProperty(value = "同步时间戳")
+    private Date syncstamp;
+    /**
+     * 删除标志 1=正常 0=已删除
+     */
+    @ApiModelProperty(value = "删除标志 1=正常 0=已删除")
+    private String delFlag;
 
 }
diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java
index 64b6706..5ebf18b 100644
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java
@@ -1,3 +1,11 @@
+/*
+ * @Author: zxf 1532322479@qq.com
+ * @Date: 2025-06-21 12:18:44
+ * @LastEditors: zxf 1532322479@qq.com
+ * @LastEditTime: 2026-03-21 15:39:21
+ * @FilePath: \crmebTwo\crmeb\crmeb-front\src\main\java\com\zbkj\front\config\JacksonConfig.java
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 package com.zbkj.front.config;
 
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;