Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

# Conflicts: # urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java

Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev
# Conflicts: # urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
戈灵虎
2 parents c1042752 8a638185
Showing 279 changed files with 10850 additions and 810 deletions
.gitignore
pom.xml
sql/mysql/garden_problem_type-fix.sql
sql/mysql/problem-type-menu-auto.sql
sql/mysql/problem-type-menu.sql
urbanops-dependencies/pom.xml
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/util/date/DateUtils.java
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/util/validation/ValidationUtils.java
urbanops-framework/urbanops-spring-boot-starter-excel/src/main/java/com/zteits/urbanops/framework/excel/core/convert/BusinessLineConvert.java
urbanops-framework/urbanops-spring-boot-starter-excel/src/main/java/com/zteits/urbanops/framework/excel/core/convert/ImageListConverter.java
urbanops-framework/urbanops-spring-boot-starter-excel/src/main/java/com/zteits/urbanops/framework/excel/core/convert/ListToStringConverter.java
urbanops-framework/urbanops-spring-boot-starter-excel/src/main/java/com/zteits/urbanops/framework/excel/core/handler/ImageColumnWidthHandler.java
urbanops-framework/urbanops-spring-boot-starter-excel/src/main/java/com/zteits/urbanops/framework/excel/core/util/ExcelUtils.java
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/BpmProcessInstanceController.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/BpmTaskController.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -53,3 +53,15 @@ application-my.yaml
 /urbanops-ui-app/unpackage/
 **/.DS_Store
 old/
+/.claudeignore
+/docs/all_test.html
+/docs/ppt-assets/animations.css
+/docs/ppt-assets/base.css
+/CLAUDE.md
+/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants_手动操作.java
+/docs/ppt-assets/fonts.css
+/docs/ppt-assets/runtime.js
+/.claude/settings.local.json
+/docs/ppt-assets/style.css
+/docs/urbanops-architecture-ppt.html
+/docs/urbanops-tech-sharing.html
@@ -49,6 +49,7 @@
         <spring.boot.version>3.5.5</spring.boot.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
     </properties>
  
     <dependencyManagement>
+-- =================================================
+-- garden_problem_type 表结构补全
+-- 原因：BaseDO 包含 create_time/update_time/creator/updater/deleted
+--       MyBatis Plus @TableLogic 自动 WHERE deleted=0
+--       缺少这些列会导致 SQL 报错或无数据返回
+-- =================================================
+
+-- 如果表已存在数据，先备份
+-- CREATE TABLE garden_problem_type_bak AS SELECT * FROM garden_problem_type;
+
+-- 方案1：删表重建（无重要数据时）
+DROP TABLE IF EXISTS `garden_problem_type`;
+CREATE TABLE `garden_problem_type` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `type_code` varchar(32) NOT NULL COMMENT '问题类型编码',
+  `type_name` varchar(64) NOT NULL COMMENT '问题类型名称',
+  `level` tinyint NOT NULL COMMENT '层级：1一级 2二级 3三级',
+  `parent_code` varchar(32) DEFAULT NULL COMMENT '父级类型编码',
+  `sort` int DEFAULT 0 COMMENT '排序序号',
+  `status` tinyint DEFAULT 1 COMMENT '状态 1启用 0禁用',
+  `creator` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` tinyint NOT NULL DEFAULT 0 COMMENT '逻辑删除 0正常 1删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_type_code` (`type_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='问题类型三级分类表';
+
+-- 方案2：已有数据时，用 ALTER 补齐缺失列（按需执行）
+-- ALTER TABLE garden_problem_type ADD COLUMN `creator` varchar(64) DEFAULT '' COMMENT '创建者' AFTER `status`;
+-- ALTER TABLE garden_problem_type ADD COLUMN `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间' AFTER `creator`;
+-- ALTER TABLE garden_problem_type ADD COLUMN `updater` varchar(64) DEFAULT '' COMMENT '更新者' AFTER `create_time`;
+-- ALTER TABLE garden_problem_type ADD COLUMN `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' AFTER `updater`;
+-- ALTER TABLE garden_problem_type ADD COLUMN `deleted` tinyint NOT NULL DEFAULT 0 COMMENT '逻辑删除' AFTER `update_time`;
+-- =================================================
+-- 问题类型配置 - 菜单与权限 SQL（自动查找父菜单ID）
+-- 直接执行即可，自动从「工单管理」下挂载菜单
+-- =================================================
+
+-- 查询当前最大 ID 作为起始值
+SET @maxId = (SELECT IFNULL(MAX(id), 5000) FROM system_menu);
+
+-- 查询工单管理 菜单ID
+SET @parentId = (SELECT id FROM system_menu WHERE name = '工单管理' AND type = 1 LIMIT 1);
+
+-- 如果找不到工单管理，尝试匹配 workorder 关键字
+-- SET @parentId = (SELECT id FROM system_menu WHERE (name LIKE '%工单%' OR path LIKE '%workorder%') AND type = 1 LIMIT 1);
+
+-- 1. 二级菜单：问题类型
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@maxId + 1, '问题类型', '', 2, 10, @parentId, 'problem-type', 'ep:list', 'garden/problemType/index', 'ProblemType', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 2. 按钮：查询
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@maxId + 2, '问题类型查询', 'garden:problem-type:query', 3, 1, @maxId + 1, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 3. 按钮：创建
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@maxId + 3, '问题类型创建', 'garden:problem-type:create', 3, 2, @maxId + 1, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 4. 按钮：更新
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@maxId + 4, '问题类型更新', 'garden:problem-type:update', 3, 3, @maxId + 1, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 5. 按钮：删除
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@maxId + 5, '问题类型删除', 'garden:problem-type:delete', 3, 4, @maxId + 1, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+-- =================================================
+-- 问题类型配置 - 菜单与权限 SQL
+-- 说明：
+--   1. 请先查询「工单管理」的菜单 ID，替换下面 @parentId 为实际值
+--      查询语句：SELECT id FROM system_menu WHERE name = '工单管理' AND type = 1;
+--   2. 修改下面 @menuId 为可用的起始 ID（确保不与已有菜单 ID 冲突）
+--      查询最大ID：SELECT MAX(id) FROM system_menu;
+--   3. 执行前请备份 system_menu 表
+-- =================================================
+
+-- 请根据实际情况替换以下变量值：
+-- SET @parentId = (SELECT id FROM system_menu WHERE name = '工单管理' AND type = 1);
+-- SET @menuId = (SELECT IFNULL(MAX(id), 0) + 1 FROM system_menu);
+
+-- 示例：假设工单管理 parent_id = 2000，起始 menu_id = 5100
+
+-- 1. 二级菜单：问题类型
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@menuId, '问题类型', '', 2, 10, @parentId, 'problem-type', 'ep:list', 'garden/problemType/index', 'ProblemType', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 2. 按钮权限：查询
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@menuId + 1, '问题类型查询', 'garden:problem-type:query', 3, 1, @menuId, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 3. 按钮权限：创建
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@menuId + 2, '问题类型创建', 'garden:problem-type:create', 3, 2, @menuId, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 4. 按钮权限：更新
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@menuId + 3, '问题类型更新', 'garden:problem-type:update', 3, 3, @menuId, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- 5. 按钮权限：删除
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (@menuId + 4, '问题类型删除', 'garden:problem-type:delete', 3, 4, @menuId, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
@@ -76,6 +76,7 @@
         <jimureport.version>2.1.1</jimureport.version>
         <jimubi.version>2.1.0</jimubi.version>
         <weixin-java.version>4.7.7-20250808.182223</weixin-java.version>
+        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
     </properties>
  
     <dependencyManagement>
@@ -72,7 +72,8 @@ public class PageParam implements Serializable {
     public void setOrderByColumn(String orderByColumn) {
         if (!StringUtils.hasText(orderByColumn)) {
             this.orderByColumn = "id";
-            return;
+        } else {
+            this.orderByColumn = orderByColumn;
         }
  
     }
@@ -3,6 +3,7 @@ package com.zteits.urbanops.framework.common.util.date;
 import cn.hutool.core.date.LocalDateTimeUtil;
  
 import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
  
@@ -18,6 +19,9 @@ public class DateUtils {
      */
     public static final String TIME_ZONE_DEFAULT = "GMT+8";
  
+    public static final ZoneId DEFAULT_ZONE = ZoneId.of("GMT+8"); // 东八区
+
+
     /**
      * 秒转换成毫秒
      */
@@ -27,6 +31,10 @@ public class DateUtils {
  
     public static final String FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND = "yyyy-MM-dd HH:mm:ss";
  
+    public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+
     /**
      * 将 LocalDateTime 转换成 Date
      *
@@ -18,8 +18,9 @@ import java.util.regex.Pattern;
  */
 public class ValidationUtils {
  
-    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[0,1,4-9])|(?:5[0-3,5-9])|(?:6[2,5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[0-3,5-9]))\\d{8}$");
-
+    //private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[0,1,4-9])|(?:5[0-3,5-9])|(?:6[2,5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[0-3,5-9]))\\d{8}$");
+    //add by wq 20260327 手机号码校验覆盖全号段
+    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:\\+86|0086)?1[3-9]\\d{9}$");
     private static final Pattern PATTERN_URL = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
  
     private static final Pattern PATTERN_XML_NCNAME = Pattern.compile("[a-zA-Z_][\\-_.0-9_a-zA-Z$]*");
@@ -51,5 +52,4 @@ public class ValidationUtils {
             throw new ConstraintViolationException(constraintViolations);
         }
     }
-
 }
+package com.zteits.urbanops.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class BusinessLineConvert implements Converter<Object> {
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        throw new UnsupportedOperationException("暂不支持，也不需要");
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        throw new UnsupportedOperationException("暂不支持，也不需要");
+    }
+
+    /**
+     * 导入：业务线名称（园林,市政） → 编码（yl,sz）
+     */
+    @Override
+    public Object convertToJavaData(ReadCellData<?> readCellData, ExcelContentProperty contentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        String cellValue = readCellData.getStringValue();
+        if (cellValue == null || cellValue.isBlank()) {
+            return null;
+        }
+
+        try {
+            // 按逗号切割
+            String[] lineArray = cellValue.split(",");
+            StringBuilder codeSb = new StringBuilder();
+
+            for (String line : lineArray) {
+                String code = convertLineToCode(line.trim());
+                if (codeSb.length() > 0) {
+                    codeSb.append(",");
+                }
+                codeSb.append(code);
+            }
+
+            return codeSb.toString();
+        } catch (Exception e) {
+            log.error("[convertToJavaData][业务线转换异常] {}", cellValue, e);
+            return null;
+        }
+    }
+
+    /**
+     * 导出：业务线编码（yl,sz） → 名称（园林,市政）
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(Object value, ExcelContentProperty contentProperty,
+                                              GlobalConfiguration globalConfiguration) {
+        if (value == null) {
+            return new WriteCellData<>("");
+        }
+
+        try {
+            String codeValue = String.valueOf(value);
+            String[] codeArray = codeValue.split(",");
+            StringBuilder nameSb = new StringBuilder();
+
+            for (String code : codeArray) {
+                String name = convertCodeToLine(code.trim());
+                if (nameSb.length() > 0) {
+                    nameSb.append(",");
+                }
+                nameSb.append(name);
+            }
+
+            return new WriteCellData<>(nameSb.toString());
+        } catch (Exception e) {
+            log.error("[convertToExcelData][业务线转换异常] {}", value, e);
+            return new WriteCellData<>("");
+        }
+    }
+
+    /**
+     * 名称 → 编码
+     */
+    private String convertLineToCode(String line) {
+        return switch (line) {
+            case "园林" -> "yl";
+            case "市政" -> "sz";
+            case "物业" -> "wy";
+            case "秩序管理" -> "zx";
+            case "环境卫生" -> "hj";
+            default -> "";
+        };
+    }
+
+    /**
+     * 编码 → 名称
+     */
+    private String convertCodeToLine(String code) {
+        return switch (code) {
+            case "yl" -> "园林";
+            case "sz" -> "市政";
+			case "wy" -> "物业";
+            case "zx" -> "秩序管理";
+            case "hj" -> "环境卫生";
+            default -> "";
+        };
+    }
+}
+package com.zteits.urbanops.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ImageData;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import cn.idev.excel.util.FileUtils;
+import cn.idev.excel.util.ListUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+
+@Slf4j
+public class ImageListConverter implements Converter<List<String>> {
+
+    // 横向排列：每张图片宽度 + 间距
+    private static final int IMAGE_WIDTH = 120;
+    private static final int IMAGE_GAP = 15;
+    private static final int MAX_IMAGE_SIZE = 10 * 1024 * 1024;
+    private static final int CONNECT_TIMEOUT = 5000;
+    private static final int READ_TIMEOUT = 10000;
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return List.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.EMPTY;
+    }
+
+    @Override
+    public List<String> convertToJavaData(ReadCellData readCellData, ExcelContentProperty contentProperty,
+                                          GlobalConfiguration globalConfiguration) {
+        return null;
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(List<String> imageList, ExcelContentProperty contentProperty,
+                                              GlobalConfiguration globalConfiguration) {
+        try {
+            if (imageList == null || imageList.isEmpty()) {
+                return new WriteCellData<>("无图片");
+            }
+
+            List<ImageData> imageDataList = ListUtils.newArrayList();
+            int leftOffset = 0; // 横向偏移量
+
+            for (String path : imageList) {
+                if (!StringUtils.hasText(path)) continue;
+
+                byte[] imageBytes = path.startsWith("http") ? loadNetworkImage(path) : loadLocalImage(path);
+                if (imageBytes == null || imageBytes.length == 0 || imageBytes.length > MAX_IMAGE_SIZE) {
+                    log.warn("跳过无效图片：{}", path);
+                    continue;
+                }
+
+                ImageData imageData = new ImageData();
+                imageData.setImage(imageBytes);
+                imageData.setImageType(ImageData.ImageType.PICTURE_TYPE_PNG);
+
+                // ====================== 核心：横向偏移 ======================
+                imageData.setLeft(leftOffset);
+                // =============================================================
+
+                imageDataList.add(imageData);
+                leftOffset += IMAGE_WIDTH + IMAGE_GAP;
+            }
+
+            if (imageDataList.isEmpty()) {
+                return new WriteCellData<>("无有效图片");
+            }
+
+            WriteCellData<?> writeCellData = new WriteCellData<>();
+            writeCellData.setType(CellDataTypeEnum.EMPTY);
+            writeCellData.setImageDataList(imageDataList);
+
+            return writeCellData;
+
+        } catch (Exception e) {
+            log.error("图片导出失败", e);
+            return new WriteCellData<>("图片加载失败");
+        }
+    }
+
+    private byte[] loadLocalImage(String imagePath) throws Exception {
+        File file = new File(imagePath);
+        if (!file.exists() || !file.isFile()) {
+            log.warn("本地图片不存在：{}", imagePath);
+            return null;
+        }
+        return FileUtils.readFileToByteArray(file);
+    }
+
+    private byte[] loadNetworkImage(String imageUrl) throws Exception {
+        URL url = new URL(imageUrl);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setConnectTimeout(CONNECT_TIMEOUT);
+        conn.setReadTimeout(READ_TIMEOUT);
+        try {
+            if (conn.getResponseCode() != 200) return null;
+            try (InputStream in = conn.getInputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                byte[] buffer = new byte[4096];
+                int len;
+                while ((len = in.read(buffer)) != -1) out.write(buffer, 0, len);
+                return out.toByteArray();
+            }
+        } finally {
+            conn.disconnect();
+        }
+    }
+}
+package com.zteits.urbanops.framework.excel.core.convert;
+import cn.idev.excel.converters.Converter;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.util.List;
+
+/**
+ * List 转 Excel 字符串转换器（将List用逗号拼接成字符串）
+ */
+public class ListToStringConverter implements Converter<List<?>> {
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 声明支持的Java类型：List
+        return List.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        // Excel单元格类型：字符串
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(List<?> value, ExcelContentProperty contentProperty,
+                                               GlobalConfiguration globalConfiguration) {
+        // 核心转换逻辑：List为空返回空字符串，否则用逗号拼接
+        if (CollectionUtil.isEmpty(value)) {
+            return new WriteCellData<>("");
+        }
+        String joinStr = String.join(",", value.stream()
+                .map(Object::toString)
+                .toArray(String[]::new));
+        return new WriteCellData<>(joinStr);
+    }
+}
 \ No newline at end of file
+package com.zteits.urbanops.framework.excel.core.handler;
+
+import cn.idev.excel.write.handler.SheetWriteHandler;
+import cn.idev.excel.write.handler.context.SheetWriteHandlerContext;
+import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.usermodel.Sheet;
+
+/**
+ * 图片列自动加宽处理器
+ */
+@RequiredArgsConstructor
+public class ImageColumnWidthHandler implements SheetWriteHandler {
+
+    // 需要加宽的列索引（从0开始），比如你的图片列在第3列，就传2
+    private final int imageColumnIndex;
+    // 加宽后的列宽（单位：字符宽度，Excel默认1个字符宽度≈256像素）
+    private final int columnWidth;
+
+    @Override
+    public void afterSheetCreate(SheetWriteHandlerContext context) {
+        Sheet sheet = context.getWriteSheetHolder().getSheet();
+        // 设置指定列的宽度
+        sheet.setColumnWidth(imageColumnIndex, columnWidth);
+    }
+}
@@ -44,9 +44,27 @@ public class ExcelUtils {
     }
  
     public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
-        return FastExcelFactory.read(file.getInputStream(), head, null)
-                .autoCloseStream(false)  // 不要自动关闭，交给 Servlet 自己处理
-                .doReadAllSync();
+        List<T> list = FastExcelFactory.read(file.getInputStream(), head, null)
+            .autoCloseStream(false) // 不要自动关闭，交给 Servlet 自己处理
+            .doReadAllSync();
+
+        // 过滤：对象不为 null + 不是全字段 null
+        if (list != null) {
+            list.removeIf(item -> {
+                if (item == null) return true;
+                // 判断所有字段是否都为 null
+                for (java.lang.reflect.Field field : item.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    try {
+                        if (field.get(item) != null) {
+                            return false;
+                        }
+                    } catch (Exception e) { }
+                }
+                return true;
+            });
+        }
+        return list;
     }
  
     public static <T> List<T> read(MultipartFile file, Class<T> head, Integer startIndex) throws IOException {
@@ -17,6 +17,9 @@ public class MaterialInventoryOutDto {
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
  
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long inventoryId;
+
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
     @NotNull(message = "物料ID不能为空")
     private Long materialId;
@@ -22,4 +22,6 @@ public class RoadReqDTO {
     @Schema(description = "维度", example = "121.40476")
     private String latitude;
  
+    @Schema(description = "道路名称", example = "中国")
+    private String roadName;
 }
@@ -15,6 +15,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
  
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
  
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
@@ -69,8 +70,13 @@ public class BpmTaskApiImpl implements BpmTaskApi{
             Set<Long> userIds = convertSetByFlatMap(taskList, task ->
                     Stream.of(NumberUtils.parseLong(task.getAssignee()), NumberUtils.parseLong(task.getOwner())));
             Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+
+            // 过滤掉所有deleteReason = MI_END的任务，再进行遍历
+            List<HistoricTaskInstance> nonMIEndTaskList = taskList.stream()
+                    .filter(task -> !"MI_END".equals(task.getDeleteReason()))
+                    .collect(Collectors.toList());
             // 5. 按任务结束时间倒序→创建时间倒序排序，确保取到最新任务
-            HistoricTaskInstance lastTask = taskList.stream()
+            HistoricTaskInstance lastTask = nonMIEndTaskList.stream()
                     .reduce((first, last) -> last) // 遍历到最后一个元素
                     .orElse(null); // 空列表返回null
             // 存储最后一个任务，后续封装VO
@@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
 import jakarta.validation.Valid;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -173,7 +174,8 @@ public class BpmProcessInstanceController {
     @GetMapping("/get-approval-detail")
     @Operation(summary = "获得审批详情")
     @Parameter(name = "id", description = "流程实例的编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
+    //@PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
+    @PermitAll
     @SuppressWarnings("unchecked")
     public CommonResult<BpmApprovalDetailRespVO> getApprovalDetail(@Valid BpmApprovalDetailReqVO reqVO) {
         if (StrUtil.isNotEmpty(reqVO.getProcessVariablesStr())) {
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
 import jakarta.validation.Valid;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.history.HistoricProcessInstance;
@@ -124,7 +125,8 @@ public class BpmTaskController {
     @GetMapping("/list-by-process-instance-id")
     @Operation(summary = "获得指定流程实例的任务列表", description = "包括完成的、未完成的")
     @Parameter(name = "processInstanceId", description = "流程实例的编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:task:query')")
+    //@PreAuthorize("@ss.hasPermission('bpm:task:query')")
+    @PermitAll
     public CommonResult<List<BpmTaskRespVO>> getTaskListByProcessInstanceId(
             @RequestParam("processInstanceId") String processInstanceId) {
         List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(processInstanceId, true);
@@ -286,7 +286,14 @@ public class BpmTaskServiceImpl implements BpmTaskService {
                     || task.getCreateTime().before(DateUtils.of(pageVO.getCreateTime()[0]))
                     || task.getCreateTime().after(DateUtils.of(pageVO.getCreateTime()[1])));
         }
-        return new PageResult<>(tasks, count);
+
+        // 过滤掉所有deleteReason = MI_END的任务，再进行遍历 解决管理端 或签任务展示 系统自动取消的问题
+        List<HistoricTaskInstance> nonMIEndTaskList = tasks.stream()
+                .filter(task -> !"MI_END".equals(task.getDeleteReason()))
+                .collect(Collectors.toList());
+
+
+        return new PageResult<>(nonMIEndTaskList, count);
     }
  
     @Override
@@ -14,6 +14,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
  
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,9 +45,12 @@ public class RoadApiImpl implements RoadApi {
         param.put("companyCode", reqDTO.getBusiLine());
         param.put("longitude", reqDTO.getLongitude());
         param.put("latitude", reqDTO.getLatitude());
+        if (StringUtils.hasText(reqDTO.getRoadName())) {
+            param.put("roadName", reqDTO.getRoadName());
+        }
  
         String responseBody = HttpUtils.post(roadInfoUrl, null, JSON.toJSONString(param));
-        log.info("获取道路信息接口,系统：{},经度：{},维度:{},返回结果:{}", reqDTO.getBusiLine(), reqDTO.getLongitude(), reqDTO.getLatitude(), responseBody);
+        log.info("获取道路信息接口,系统：{},经度：{},维度:{},roadName:{},返回结果:{}", reqDTO.getBusiLine(), reqDTO.getLongitude(), reqDTO.getLatitude(), reqDTO.getRoadName(), responseBody);
         JSONObject response = JSONUtil.parseObj(responseBody);
         if (response.getInt("code") != 200) {
             return new ArrayList<>();
 package com.zteits.urbanops.module.garden.controller.admin.assigntasks;
  
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
-import com.zteits.urbanops.framework.translate.core.TranslateUtils;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal.vo.UnitIntegralRespVO;
+import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
+import com.zteits.urbanops.module.garden.service.unitintegraltotal.UnitIntegralService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -46,6 +47,9 @@ public class AssignTasksController {
     @Resource
     private AssignTasksInfoService asignTasksInfoService;
  
+    @Resource
+    private UnitIntegralService unitIntegralService;
+
     @PostMapping("/create")
     @Operation(summary = "创建派单任务主表（记录派单任务基本信息）")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks:create')")
@@ -90,7 +94,13 @@ public class AssignTasksController {
         }
         AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class);
         List<AssignTasksInfoDO> assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId());
-        assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList);
+        //add by 20260307 convert 转换获取任务积分
+        List<Long> taskIds = assignTaskInfoList.stream()
+                .map(AssignTasksInfoDO::getId)
+                .distinct() // 去重重复的taskId
+                .collect(Collectors.toList());
+        List<UnitIntegralRespVO> unitIntegralList = unitIntegralService.queryIntegralByRelatedTaskIds(taskIds);
+        assignTasksRespVO.setAssignTaskInfoList(AssignTaskConvert.INSTANCE.buildTaskInfo(assignTaskInfoList, unitIntegralList));
         //获取单位集合
         List<Long> companyIds = CollectionUtil.isEmpty(assignTaskInfoList)
                 ? Collections.emptyList()
@@ -3,8 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fhs.core.trans.vo.VO;
-import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
+import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
  
@@ -12,6 +11,7 @@ import java.util.Date;
 import java.util.List;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
  
 @Schema(description = "管理后台 - 派单任务主表（记录派单任务基本信息） Response VO")
 @Data
@@ -38,12 +38,12 @@ public class AssignTasksRespVO {
  
     @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("派达时间")
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT )
     private Date createTime;
  
     @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("任务截止时间")
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private Date deadline;
  
     @Schema(description = "任务备注（如：特殊要求、注意事项等）")
@@ -64,7 +64,7 @@ public class AssignTasksRespVO {
     private String updater;
  
     private List<Long> companyIds;
-    private List<AssignTasksInfoDO> assignTaskInfoList;
+    private List<AssignTasksInfoRespVO> assignTaskInfoList;
  
     public void setParentFinish(Integer parentFinish) {
         this.parentFinish = parentFinish;
@@ -43,7 +43,11 @@ public class AssignTasksSaveReqVO {
     private Integer parentFinish;
  
     @Schema(description = "整体完成时间（仅当parent_finish=1时有值）")
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(
+            pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,
+            timezone = "GMT+8",
+            shape = JsonFormat.Shape.STRING
+    )
     private Date finishTime;
  
     @Schema(description = "任务备注（如：特殊要求、注意事项等）")
@@ -10,11 +10,14 @@ import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.Ass
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal.vo.UnitIntegralRespVO;
 import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
+import com.zteits.urbanops.module.garden.service.assigntasksinfo.QuartzRemindService;
+import com.zteits.urbanops.module.garden.service.unitintegraltotal.UnitIntegralService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,7 +29,12 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
  
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
@@ -42,6 +50,8 @@ public class AssignTasksInfoController {
     private AssignTasksInfoService assignTasksInfoService;
     @Resource
     private AssignTasksService assignTasksService;
+    @Resource
+    private UnitIntegralService unitIntegralService;
  
     @PostMapping("/create")
     @Operation(summary = "创建派单任务-单位关联表（记录单位接收派单后的执行详情）")
@@ -83,7 +93,11 @@ public class AssignTasksInfoController {
     public CommonResult<AssignTasksInfoRespVO> getAssignTasksInfo(@RequestParam("id") Long id) {
         AssignTasksInfoDO assignTasksInfo = assignTasksInfoService.getAssignTasksInfo(id);
         AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
-        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
+        //add by 20260307 convert 转换获取任务积分
+        List<Long> taskIds = new ArrayList<>();
+        taskIds.add(assignTasksInfo.getId());
+        List<UnitIntegralRespVO> unitIntegralList = unitIntegralService.queryIntegralByRelatedTaskIds(taskIds);
+        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO, unitIntegralList));
         //return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
     }
  
@@ -93,26 +107,16 @@ public class AssignTasksInfoController {
     public CommonResult<PageResult<AssignTasksInfoRespVO>> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) {
         pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
-//        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
-//            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
-//        }
-//        List<Long> assignIds = pageResult.getList().stream()
-//                .map(AssignTasksInfoDO::getTaskId)
-//                .distinct()
-//                .collect(Collectors.toList());
-//        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
-//        if (CollectionUtils.isNotEmpty(taskList)) {
-//            Map<Long, AssignTasksDO> taskMap = taskList.stream()
-//                    .collect(Collectors.toMap(
-//                            AssignTasksDO::getId,    // Key：任务ID
-//                            task -> task,
-//                            (existing, replacement) -> replacement
-//                    ));
-//            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
-//        } else {
-//            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
-//        }
-        return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
+            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+        }
+        //add by 20260307 convert 转换获取任务积分
+        List<Long> taskIds = pageResult.getList().stream()
+                .map(AssignTasksInfoDO::getId)
+                .distinct() // 去重重复的taskId
+                .collect(Collectors.toList());
+        List<UnitIntegralRespVO> unitIntegralList = unitIntegralService.queryIntegralByRelatedTaskIds(taskIds);
+        return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, unitIntegralList));
     }
     @GetMapping("/list")
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
@@ -120,26 +124,13 @@ public class AssignTasksInfoController {
     public CommonResult<PageResult<AssignTasksInfoRespVO>> list(@Valid AssignTasksInfoPageReqVO pageReqVO) {
         pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
-//        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
-//            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
-//        }
-//        List<Long> assignIds = pageResult.getList().stream()
-//                .map(AssignTasksInfoDO::getTaskId)
-//                .distinct()
-//                .collect(Collectors.toList());
-//        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
-//        if (CollectionUtils.isNotEmpty(taskList)) {
-//            Map<Long, AssignTasksDO> taskMap = taskList.stream()
-//                    .collect(Collectors.toMap(
-//                            AssignTasksDO::getId,    // Key：任务ID
-//                            task -> task,
-//                            (existing, replacement) -> replacement
-//                    ));
-//            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
-//        } else {
-//            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
-//        }
-        return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+        //add by 20260307 convert 转换获取任务积分
+        List<Long> taskIds = pageResult.getList().stream()
+                .map(AssignTasksInfoDO::getId)
+                .distinct() // 去重重复的taskId
+                .collect(Collectors.toList());
+        List<UnitIntegralRespVO> unitIntegralList = unitIntegralService.queryIntegralByRelatedTaskIds(taskIds);
+        return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, unitIntegralList));
     }
     @GetMapping("/export-excel")
     @Operation(summary = "导出派单任务-单位关联表（记录单位接收派单后的执行详情） Excel")
@@ -179,4 +170,28 @@ public class AssignTasksInfoController {
     public CommonResult feedback(@RequestBody AssignTasksInfoUpdReqVO assignTaskCompany) {
         return success(assignTasksInfoService.feedbackAssignTaskCompany(assignTaskCompany));
     }
+
+
+    @Resource
+    private QuartzRemindService quartzRemindService;
+
+    @Operation(summary = "到期提醒")
+    @GetMapping(value = "/createDeadlineRemind")
+    public void deadlineRemindTest(@RequestParam("id") Long id) {
+        // 2. 注册Quartz任务：到期前3小时触发
+        try {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime triggerTime = now.plusHours(3).plusMinutes(3); // 现在往后推3小时3分钟
+            Date triggerDate = Date.from(
+                    triggerTime.atZone(ZoneId.systemDefault())  // 绑定时区
+                            .toInstant()                    // 转为Instant（含时区的时间戳）
+            );
+            //quartzRemindService.registerRemindJob(id, triggerDate);
+
+            unitIntegralService.resetUnitIntegralTotal();
+        } catch (Exception e) {
+            throw new RuntimeException("任务创建失败");
+        }
+    }
+
 }
@@ -139,4 +139,9 @@ public class AssignTasksInfoRespVO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List templateFile;
  
+
+    /*当前积分*/
+    private Integer totalIntegral;
+
+
 }
@@ -5,16 +5,24 @@ import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.WaterFeeImport;
 import com.zteits.urbanops.module.garden.enums.TemplateEnum;
 import com.zteits.urbanops.module.garden.service.costfee.CostFeeService;
+import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
  
@@ -23,7 +31,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
  
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
@@ -49,6 +56,12 @@ public class CostFeeController{
     @Value("${static.resource.server.enable}")
     private Boolean staticResourceServerenable;
  
+    @Autowired
+    private ResourceLoader resourceLoader;
+
+    @jakarta.annotation.Resource
+    private DeptApi deptApi;
+
     // Excel文件校验相关
     private static final List<String> ALLOWED_EXCEL_SUFFIX = Arrays.asList(".xlsx", ".xlsm");
     private static final String EXCEL_MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
@@ -59,6 +72,7 @@ public class CostFeeController{
      */
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入用户模板")
+    @PermitAll
     public void importTemplate(HttpServletResponse response,
                                @RequestParam("templateName") String templateName) throws IOException {
         // 参数校验
@@ -74,29 +88,150 @@ public class CostFeeController{
             return;
         }
  
-        if (staticResourceServerenable) {
-            // 构建完整的静态服务器URL（确保路径正确）
-            String serverUrl = staticResourceServerUrl;
-            if (serverUrl != null && !serverUrl.endsWith("/")) {
-                serverUrl += "/"; // 确保URL以/结尾，避免拼接错误
-            }
+        writeAndModifyTemplate(response, template.getName(), template.getStartIndex());
+    }
+
+    private void writeAndModifyTemplate(HttpServletResponse response,
+                                    String downloadFileName,
+                                    int startIndexRow) throws IOException {
+
+        // 拼接模板路径
+        String serverUrl = staticResourceServerUrl;
+        if (serverUrl != null && !serverUrl.endsWith("/")) {
+            serverUrl += "/";
+        }
+        String fullPath = serverUrl + downloadFileName;
+        fullPath = fullPath.replace("\\", "/");
+
+        Resource resource = resourceLoader.getResource(fullPath);
+
+        // 检查文件是否存在
+        if (!resource.exists()) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND, "模板文件不存在");
+            return;
+        }
+
+        // 设置下载响应头
+        response.reset();
+        response.setContentType(EXCEL_MIME_TYPE);
+        // response.setCharacterEncoding("UTF-8");
+        String encodedName = URLEncoder.encode(downloadFileName, "UTF-8");
+        // 标准文件名编码（Chrome / Edge / Firefox 全兼容）
+        response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedName);
+        // 浏览器缓存配置（必须）
+        response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+        response.setHeader("Pragma", "no-cache");
+        response.setHeader("Expires", "0");
+
+
+        try (InputStream in = resource.getInputStream();
+             XSSFWorkbook workbook = new XSSFWorkbook(in);
+             OutputStream out = response.getOutputStream()) {
  
-            String encodedFileName = URLEncoder.encode(template.getName().split("\\.")[0], StandardCharsets.UTF_8.name());
+             Sheet sheet = workbook.getSheetAt(0);
  
-            String templateFileName = encodedFileName + "." + template.getName().split("\\.")[1];
+            // ==============================================
+            // 获取最新单位列表
+            // ==============================================
+            List<DeptRespDTO> companyList = deptApi.getSubDeptList();
+            List<String> newUnits = companyList.stream()
+                    .map(DeptRespDTO::getName)
+                    .filter(Objects::nonNull)
+                    .toList();
  
-            String templateUrl = serverUrl +  templateFileName; // 包含templates目录
+            log.info("加载到单位列表：{}，共{}条", newUnits, newUnits.size());
  
-            // 方式1：重定向到静态资源服务器
-            response.sendRedirect(templateUrl);
-        } else {
-            String templateFileName = templateName + "." + template.getName().split("\\.")[1];
+            // ==============================================
+            // 生成新下拉 + 自动赋值
+            // ==============================================
+            createDropdownAndSetValue(sheet, newUnits, startIndexRow);
+
+            // 写入并强制刷新
+            workbook.write(out);
+            out.flush();
  
-            // 写入模板文件到响应
-            writeTemplateToResponse(response, template.getName(), templateFileName);
+        } catch (Exception e) {
+            log.error("模板处理失败", e);
+            throw new IOException("文件处理失败", e);
         }
     }
  
+    /**
+     * 创建下拉框 + 给单元格赋值
+     */
+    private void createDropdownAndSetValue(Sheet sheet, List<String> options, int startRow) {
+        if (options.isEmpty()) {
+            log.error("下拉选项为空，不创建");
+            return;
+        }
+
+        // 获取表头行
+        Row headerRow = sheet.getRow(startRow - 1);
+        if (headerRow == null) {
+            log.error("表头行不存在：{}", startRow - 1);
+            return;
+        }
+
+        // 查找“所属单位”列
+        int targetCol = -1;
+        for (Cell cell : headerRow) {
+            if (cell != null && cell.getCellType() == CellType.STRING) {
+                String val = cell.getStringCellValue().trim();
+                if (val.contains("所属单位") || val.contains("所属公司") ) {
+                    targetCol = cell.getColumnIndex();
+                    break;
+                }
+            }
+        }
+
+        if (targetCol == -1) {
+            log.error("未找到【所属单位】列表头");
+            return;
+        }
+
+        // 取消列隐藏
+        sheet.setColumnHidden(targetCol, false);
+
+        // ==============================================
+        // 遍历行：清空原有内容 + 设置默认值
+        // ==============================================
+        int endRow = 100;
+        for (int r = startRow; r <= endRow; r++) {
+            Row row = sheet.getRow(r);
+            if (row == null) {
+                row = sheet.createRow(r);
+            }
+
+            Cell cell = row.getCell(targetCol);
+            if (cell == null) {
+                cell = row.createCell(targetCol);
+            }
+            String unit = cell.getStringCellValue();
+            // 默认赋值【第一个单位】，你可以根据业务改成其他值
+            if (!StringUtils.isEmpty(unit)) {
+                cell.setCellValue(options.get(0));
+            }
+        }
+
+        // ==============================================
+        // 创建下拉框（作用范围：startRow ~ 1000行）
+        // ==============================================
+        CellRangeAddressList regions = new CellRangeAddressList(startRow, endRow, targetCol, targetCol);
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(
+                options.toArray(new String[0])
+        );
+        DataValidation validation = helper.createValidation(constraint, regions);
+        // 下拉框基础配置
+        validation.setEmptyCellAllowed(true);
+        validation.setSuppressDropDownArrow(true); // 显示箭头
+        validation.setShowErrorBox(true);
+        validation.setShowPromptBox(true); // 启用点击弹出提示
+        sheet.addValidationData(validation);
+
+        log.info("【成功】为列{}添加下拉并赋值，行{}~{}，选项数：{}",
+                targetCol, startRow, endRow, options.size());
+    }
  
     /**
      * Excel文件上传预览
@@ -214,31 +349,6 @@ public class CostFeeController{
     }
  
     /**
-     * 写入模板文件到响应流
-     */
-    private void writeTemplateToResponse(HttpServletResponse response, String filename, String templatePath) throws IOException {
-        // 设置响应头
-        response.setContentType(EXCEL_MIME_TYPE);
-        response.setCharacterEncoding("UTF-8");
-        String encodedFileName = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
-        response.setHeader("Cache-Control", "no-store"); // 禁止缓存
-
-        // 读取模板文件并写入响应
-        try (InputStream in = new ClassPathResource("template/" + templatePath).getInputStream();
-             OutputStream out = response.getOutputStream()) {
-
-            byte[] buffer = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = in.read(buffer)) != -1) {
-                out.write(buffer, 0, bytesRead);
-            }
-            out.flush();
-        }
-    }
-
-
-    /**
      * 校验Excel文件有效性（后缀+MIME类型）
      */
     private boolean isValidExcelFile(MultipartFile file) {
+package com.zteits.urbanops.module.garden.controller.admin.costfee.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @Classname MaterialInventoryInImport
+ * @Description 物料批量入库
+ * @Date 2026/1/15 22:22
+ * @Created by wangqian
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MaterialInventoryInImport {
+
+
+    @ExcelProperty(index = 1)
+    @NotEmpty(message = "物料名称不能为空")
+    private String materialName;
+
+    @NotEmpty(message = "耗材类型不能为空")
+    @ExcelProperty(index = 2)
+    private String materialTypeName;
+
+    @NotEmpty(message = "类别名称不能为空")
+    @ExcelProperty(index = 3)
+    private String typeName;
+
+
+    @NotEmpty(message = "类别明细不能为空")
+    @ExcelProperty(index = 4)
+    private String typeDetailName;
+
+    @NotEmpty(message = "物料规格不能为空")
+    @ExcelProperty(index = 5)
+    private String specifications;
+
+    @NotEmpty(message = "物料单位不能为空")
+    @ExcelProperty(index = 6)
+    private String unitName;
+
+    @NotNull(message = "单价不能为空")
+    @ExcelProperty(index = 7)
+    private BigDecimal materialPrice;
+
+    @NotNull(message = "入库数量不能为空")
+    @ExcelProperty(index = 8)
+    @Positive(message = "数量必须为正整数")
+    private Long inInventoryNum;
+
+    @NotNull(message = "采购日期不能为空")
+    @ExcelProperty(index = 9)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate buyDate;
+
+    @NotEmpty(message = "供应商名称不能为空")
+    @ExcelProperty(index = 10)
+    private String supplierName;
+
+    @NotEmpty(message = "联系人不能为空")
+    @ExcelProperty(index = 11)
+    private String contactsName;
+
+    @NotEmpty(message = "联系电话不能为空")
+    @ExcelProperty(index = 12)
+    private String contactsPhone;
+
+    @NotEmpty(message = "归属公司不能为空")
+    @ExcelProperty(index = 13)
+    private String belongCompanyName;
+}
+package com.zteits.urbanops.module.garden.controller.admin.costfee.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Classname MaterialInventoryOutImport
+ * @Description 物料批量出库
+ * @Date 2026/1/15 22:22
+ * @Created by wangqian
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MaterialInventoryOutImport {
+
+
+
+    @ExcelProperty(index = 1)
+    @NotEmpty(message = "物料名称不能为空")
+    private String materialName;
+
+    @NotEmpty(message = "耗材类型不能为空")
+    @ExcelProperty(index = 2)
+    private String materialTypeName;
+
+    @NotEmpty(message = "类别名称不能为空")
+    @ExcelProperty(index = 3)
+    private String typeName;
+
+    @NotEmpty(message = "类别明细不能为空")
+    @ExcelProperty(index = 4)
+    private String typeDetailName;
+
+    @NotEmpty(message = "物料规格不能为空")
+    @ExcelProperty(index = 5)
+    private String specifications;
+
+    @NotEmpty(message = "物料单位不能为空")
+    @ExcelProperty(index = 6)
+    private String unitName;
+
+    @ExcelProperty(index = 7)
+    @NotNull(message = "出库数量不能为空")
+    @Positive(message = "数量必须为正整数")
+    private Long outInventoryNum;
+
+    @NotNull(message = "出库日期不能为空")
+    @ExcelProperty(index = 8)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate outDate;
+
+    @NotEmpty(message = "归属公司不能为空")
+    @ExcelProperty(index = 9)
+    private String belongCompanyName;
+}
@@ -84,7 +84,7 @@ public class MechanicalCostImport {
     @ExcelProperty(index = 9)
     @NotNull(message = "使用年限不能为空")
     @Positive(message = "使用年限必须为正整数")
-    private Long serviceLife;
+    private Integer serviceLife;
  
     /**
      * 结束使用时间
+package com.zteits.urbanops.module.garden.controller.admin.device;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.device.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.device.DeviceClockRecordDO;
+import com.zteits.urbanops.module.garden.service.device.DeviceClockRecordService;
+
+@Tag(name = "管理后台 - 员工打卡记录")
+@RestController
+@RequestMapping("/garden/device-clock-record")
+@Validated
+public class DeviceClockRecordController {
+
+    @Resource
+    private DeviceClockRecordService deviceClockRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建员工打卡记录")
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:create')")
+    public CommonResult<Integer> createDeviceClockRecord(@Valid @RequestBody DeviceClockRecordSaveReqVO createReqVO) {
+        return success(deviceClockRecordService.createDeviceClockRecord(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新员工打卡记录")
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:update')")
+    public CommonResult<Boolean> updateDeviceClockRecord(@Valid @RequestBody DeviceClockRecordSaveReqVO updateReqVO) {
+        deviceClockRecordService.updateDeviceClockRecord(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除员工打卡记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:delete')")
+    public CommonResult<Boolean> deleteDeviceClockRecord(@RequestParam("id") Integer id) {
+        deviceClockRecordService.deleteDeviceClockRecord(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除员工打卡记录")
+                @PreAuthorize("@ss.hasPermission('garden:device-clock-record:delete')")
+    public CommonResult<Boolean> deleteDeviceClockRecordList(@RequestParam("ids") List<Integer> ids) {
+        deviceClockRecordService.deleteDeviceClockRecordListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得员工打卡记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:query')")
+    public CommonResult<DeviceClockRecordRespVO> getDeviceClockRecord(@RequestParam("id") Integer id) {
+        DeviceClockRecordDO deviceClockRecord = deviceClockRecordService.getDeviceClockRecord(id);
+        return success(BeanUtils.toBean(deviceClockRecord, DeviceClockRecordRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得员工打卡记录分页")
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:query')")
+    public CommonResult<PageResult<DeviceClockRecordRespVO>> getDeviceClockRecordPage(@Valid DeviceClockRecordPageReqVO pageReqVO) {
+        PageResult<DeviceClockRecordDO> pageResult = deviceClockRecordService.getDeviceClockRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, DeviceClockRecordRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出员工打卡记录 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:device-clock-record:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportDeviceClockRecordExcel(@Valid DeviceClockRecordPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<DeviceClockRecordDO> list = deviceClockRecordService.getDeviceClockRecordPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "员工打卡记录.xls", "数据", DeviceClockRecordRespVO.class,
+                        BeanUtils.toBean(list, DeviceClockRecordRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.device.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 员工打卡记录分页 Request VO")
+@Data
+public class DeviceClockRecordPageReqVO extends PageParam {
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", example = "李四")
+    private String deviceName;
+
+    @Schema(description = "打卡类型：上班/下班", example = "2")
+    private String punchType;
+
+    @Schema(description = "高德GCJ02坐标系纬度")
+    private BigDecimal latGcj02;
+
+    @Schema(description = "高德GCJ02坐标系经度")
+    private BigDecimal lngGcj02;
+
+    @Schema(description = "详细地址")
+    private String address;
+
+    @Schema(description = "84坐标经度")
+    private BigDecimal lng;
+
+    @Schema(description = "84坐标纬度")
+    private BigDecimal lat;
+
+    @Schema(description = "状态位")
+    private Integer statusBit;
+
+    @Schema(description = "警告位")
+    private Integer warnBit;
+
+    @Schema(description = "提交人用户ID", example = "20708")
+    private Long userId;
+
+    @Schema(description = "用户昵称", example = "张三")
+    private String nickname;
+
+    @Schema(description = "归属(一级部门id)", example = "10917")
+    private Long companyId;
+
+    @Schema(description = "部门ID", example = "126")
+    private Long deptId;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy")
+    private String busiLine;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.device.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 员工打卡记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DeviceClockRecordRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10971")
+    @ExcelProperty("主键ID")
+    private Integer id;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "打卡类型：上班/下班", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("打卡类型：上班/下班")
+    private String punchType;
+
+    @Schema(description = "高德GCJ02坐标系纬度")
+    @ExcelProperty("高德GCJ02坐标系纬度")
+    private BigDecimal latGcj02;
+
+    @Schema(description = "高德GCJ02坐标系经度")
+    @ExcelProperty("高德GCJ02坐标系经度")
+    private BigDecimal lngGcj02;
+
+    @Schema(description = "详细地址")
+    @ExcelProperty("详细地址")
+    private String address;
+
+    @Schema(description = "84坐标经度")
+    @ExcelProperty("84坐标经度")
+    private BigDecimal lng;
+
+    @Schema(description = "84坐标纬度")
+    @ExcelProperty("84坐标纬度")
+    private BigDecimal lat;
+
+    @Schema(description = "状态位")
+    @ExcelProperty("状态位")
+    private Integer statusBit;
+
+    @Schema(description = "警告位")
+    @ExcelProperty("警告位")
+    private Integer warnBit;
+
+    @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20708")
+    @ExcelProperty("提交人用户ID")
+    private Long userId;
+
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("用户昵称")
+    private String nickname;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "10917")
+    @ExcelProperty("归属(一级部门id)")
+    private Long companyId;
+
+    @Schema(description = "部门ID", example = "126")
+    @ExcelProperty("部门ID")
+    private Long deptId;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy")
+    private String busiLine;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.device.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 员工打卡记录新增/修改 Request VO")
+@Data
+public class DeviceClockRecordSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10971")
+    private Integer id;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "设备编码不能为空")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @Schema(description = "打卡类型：上班/下班", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "打卡类型：上班/下班不能为空")
+    private String punchType;
+
+    @Schema(description = "高德GCJ02坐标系纬度")
+    private BigDecimal latGcj02;
+
+    @Schema(description = "高德GCJ02坐标系经度")
+    private BigDecimal lngGcj02;
+
+    @Schema(description = "详细地址")
+    private String address;
+
+    @Schema(description = "84坐标经度")
+    private BigDecimal lng;
+
+    @Schema(description = "84坐标纬度")
+    private BigDecimal lat;
+
+    @Schema(description = "状态位")
+    private Integer statusBit;
+
+    @Schema(description = "警告位")
+    private Integer warnBit;
+
+    @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20708")
+    @NotNull(message = "提交人用户ID不能为空")
+    private Long userId;
+
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "用户昵称不能为空")
+    private String nickname;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "10917")
+    @NotNull(message = "归属(一级部门id)不能为空")
+    private Long companyId;
+
+    @Schema(description = "部门ID", example = "126")
+    private Long deptId;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy不能为空")
+    private String busiLine;
+
+}
 \ No newline at end of file
@@ -40,25 +40,32 @@ public class DeviceUserController {
  
     @PostMapping("/create")
     @Operation(summary = "创建设备用户关系")
-    @PreAuthorize("@ss.hasPermission('garden:device-user:create')")
+   // @PreAuthorize("@ss.hasPermission('garden:device-user:create')")
     public CommonResult<Long> createDeviceUser(@Valid @RequestBody DeviceUserSaveReqVO createReqVO) {
         return success(deviceUserService.createDeviceUser(createReqVO));
     }
  
-    @PutMapping("/update")
+    @PutMapping("/update/device")
     @Operation(summary = "更新设备用户关系")
-    @PreAuthorize("@ss.hasPermission('garden:device-user:update')")
-    public CommonResult<Boolean> updateDeviceUser(@Valid @RequestBody DeviceUserSaveReqVO updateReqVO) {
-        deviceUserService.updateDeviceUser(updateReqVO);
+    //@PreAuthorize("@ss.hasPermission('garden:device-user:update')")
+    public CommonResult<Boolean> updateDevice(@Valid @RequestBody DeviceUserUpdateReqVO updateReqVO) {
+        deviceUserService.updateDevice(updateReqVO);
         return success(true);
     }
  
+    @GetMapping("/get/device_no")
+    @Operation(summary = "通过设备编码获取设备绑定信息")
+    public CommonResult<DeviceUserRespVO> getDeviceUserByDeviceNo(@RequestParam("deviceNo") @NotBlank String deviceNo) {
+        DeviceUserRespVO deviceUser = deviceUserService.getDeviceUserByDeviceNo(deviceNo);
+        return success(deviceUser);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除设备用户关系")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('garden:device-user:delete')")
-    public CommonResult<Boolean> deleteDeviceUser(@RequestParam("user_id") @NotNull Long userId,
-                                                  @RequestParam("device_no") @NotBlank String deviceNo) {
+    public CommonResult<Boolean> deleteDeviceUser(@RequestParam("userId") @NotNull Long userId,
+                                                  @RequestParam("deviceNo") @NotBlank String deviceNo) {
         deviceUserService.deleteDeviceUser(userId, deviceNo);
         return success(true);
     }
@@ -85,8 +92,8 @@ public class DeviceUserController {
     @Operation(summary = "获得设备用户关系分页")
     //@PreAuthorize("@ss.hasPermission('garden:device-user:query')")
     public CommonResult<PageResult<DeviceUserRespVO>> getDeviceUserPage(@Valid DeviceUserPageReqVO pageReqVO) {
-        PageResult<DeviceUserDO> pageResult = deviceUserService.getDeviceUserPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DeviceUserRespVO.class));
+        PageResult<DeviceUserRespVO> pageResult = deviceUserService.getDeviceUserPage(pageReqVO);
+        return success(pageResult);
     }
  
     @GetMapping("/export-excel")
@@ -96,10 +103,20 @@ public class DeviceUserController {
     public void exportDeviceUserExcel(@Valid DeviceUserPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DeviceUserDO> list = deviceUserService.getDeviceUserPage(pageReqVO).getList();
+        List<DeviceUserRespVO> list = deviceUserService.getDeviceUserPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "设备用户关系.xls", "数据", DeviceUserRespVO.class,
-                        BeanUtils.toBean(list, DeviceUserRespVO.class));
+                        list);
     }
  
+    @PostMapping("/findDeviceDeptTree")
+    @Operation(summary = "获取IOT设备tree")
+    //@PreAuthorize("@ss.hasPermission('garden:device-user:query')")
+    public CommonResult<DeviceDeptTreeRespVO> findDeviceDeptTree(@Valid @RequestBody DeviceDeptTreeReqVO reqVO) {
+        DeviceDeptTreeRespVO deviceUser = deviceUserService.findDeviceDeptTree(reqVO);
+        return success(deviceUser);
+    }
+
+
+
 }
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.deviceuser.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - IOT设备")
+@Data
+public class DeviceDeptTreeReqVO {
+
+    /**
+     * 设备编码 精确查询
+     */
+    private  String deviceCode;
+
+    /**
+     * 设备名称 模糊查询
+     */
+    private  String deviceName;
+
+    /**
+     * 设备归属部门名称 模糊查询
+     */
+    private  String deviceDeptName;
+}
+package com.zteits.urbanops.module.garden.controller.admin.deviceuser.vo;
+
+
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备部门树响应数据
+ *
+ * @author your-name
+ * @since 2023-xx-xx
+ */
+@Data
+public class DeviceDeptTreeRespVO {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 父编码
+     */
+    private String parentCode;
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 部门状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 设备数量
+     */
+    private Integer deviceCount;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 节点类型：1部门 3设备
+     */
+    private Integer nodeType;
+
+    /**
+     * 节点类型为设备时，该值有值
+     * 产品名称
+     */
+    private String productName;
+    /**
+     * 节点类型为设备时，该值有值
+     * 产品编码
+     */
+    private String productCode;
+    /**
+     * 子节点，和当前一样的结构
+     */
+    private List<DeviceDeptTreeRespVO> children;
+}
@@ -57,5 +57,12 @@ public class DeviceUserRespVO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
  
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
+    @ExcelProperty("归属(一级部门id)")
+    private String companyName;
+
+    @ExcelProperty("部门(道路负责部门)")
+    private String deptName;
+
  
 }
@@ -35,8 +35,10 @@ public class DeviceUserSaveReqVO {
  
     @Data
     public static class DeviceInfoDO {
+
+        private String productCode;
+
         @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-        @NotEmpty(message = "产品名称不能为空")
         private String productName;
  
         @Schema(description = "设备标识", requiredMode = Schema.RequiredMode.REQUIRED)
+package com.zteits.urbanops.module.garden.controller.admin.deviceuser.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 设备用户关系新增/修改 Request VO")
+@Data
+public class DeviceUserUpdateReqVO {
+
+    @Schema(description = "设备信息")
+    @NotNull
+    @Size(min = 1, message = "道路信息不能为空")
+    @Valid
+    private List<DeviceUserSaveReqVO.DeviceInfoDO> deviceInfoList;
+
+    @Data
+    public static class DeviceInfoDO {
+        @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+        @NotEmpty(message = "产品名称不能为空")
+        private String productName;
+
+        @Schema(description = "设备标识", requiredMode = Schema.RequiredMode.REQUIRED)
+        @NotEmpty(message = "设备标识不能为空")
+        private String deviceNo;
+
+        @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+        @NotEmpty(message = "设备名称不能为空")
+        private String deviceName;
+
+        @Schema(description = "连接状态 : 在线：ONLINE || 离线：OFFLINE || 未连接：INIT", requiredMode = Schema.RequiredMode.REQUIRED)
+        @NotEmpty(message = "连接状态 : 在线：ONLINE || 离线：OFFLINE || 未连接：INIT")
+        private String deviceState;
+
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask;
+
+import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+import java.util.stream.Collectors;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*;
+import com.zteits.urbanops.module.garden.service.emergencytask.EmergencyTaskService;
+
+@Tag(name = "管理后台 - 抢险任务主")
+@RestController
+@RequestMapping("/garden/emergency-task")
+@Validated
+public class EmergencyTaskController {
+
+    @Resource
+    private EmergencyTaskService emergencyTaskService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建抢险任务主")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:create')")
+    public CommonResult<Long> createEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO createReqVO) {
+        return success(emergencyTaskService.createEmergencyTask(createReqVO, true));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新抢险任务主")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:update')")
+    public CommonResult<Boolean> updateEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO updateReqVO) {
+        emergencyTaskService.updateEmergencyTask(updateReqVO);
+        return success(true);
+    }
+
+    @PostMapping("/approval")
+    @Operation(summary = "抢险任务审批")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:approval')")
+    public CommonResult<Integer> approvalEmergencyTask(@Valid @RequestBody EmergencyTaskApprovalReqVO createReqVO) {
+        return success(emergencyTaskService.approvalEmergencyTask(createReqVO));
+    }
+
+    @DeleteMapping("/delete/task_no")
+    @Operation(summary = "删除抢险任务主")
+    @Parameter(name = "task_no", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:delete')")
+    public CommonResult<Boolean> deleteEmergencyTask(@RequestParam("task_no") String taskNo) {
+        emergencyTaskService.deleteEmergencyTaskByTaskNo(taskNo);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除抢险任务主")
+                @PreAuthorize("@ss.hasPermission('garden:emergency-task:delete')")
+    public CommonResult<Boolean> deleteEmergencyTaskList(@RequestParam("ids") List<Long> ids) {
+        emergencyTaskService.deleteEmergencyTaskListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get/task_no")
+    @Operation(summary = "获得抢险任务主")
+    @Parameter(name = "task_no", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
+    public CommonResult<EmergencyTaskRespVO> getEmergencyTask(@RequestParam("task_no") String taskNo) {
+        EmergencyTaskRespVO emergencyTask = emergencyTaskService.getEmergencyTaskByTaskNo(taskNo);
+        return success(emergencyTask);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得抢险任务主分页")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
+    public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) {
+        PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出抢险任务主 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportEmergencyTaskExcel(@Valid EmergencyTaskPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<EmergencyTaskRespVO> list = emergencyTaskService.getEmergencyTaskPage(pageReqVO).getList();
+        List<EmergencyTaskExcleRespVO> respList = new ArrayList<>();
+
+        //险情类型 1:树木倒伏 2:树木折枝
+        List<DictDataRespDTO> dictDataList = emergencyTaskService.getDictDataList("hazard_type");
+
+        //险情危害 1:砸车 2:砸房 3:砸人 4:无
+        List<DictDataRespDTO> hazardRiskList = emergencyTaskService.getDictDataList("hazard_risk");
+        //树木权属 1:专业权属 2:街道权属 3:其他
+        List<DictDataRespDTO> treePermissionsList = emergencyTaskService.getDictDataList("tree_permissions");
+        //机械类型 1:三轮车；2:货车；3:挖掘机
+        List<DictDataRespDTO> mechanicalTypeNameList = emergencyTaskService.getDictDataList("mechanical_type_name");
+
+        //案件状态 1-待提交 2-待审核 3-驳回
+        List<DictDataRespDTO> rescueStatusList = emergencyTaskService.getDictDataList("rescue_status");
+
+
+        list.forEach(emergencyTask -> {
+            EmergencyTaskExcleRespVO emergencyTaskExcleRespVO = new EmergencyTaskExcleRespVO();
+            emergencyTaskExcleRespVO.setTaskNo(emergencyTask.getTaskNo());
+            emergencyTaskExcleRespVO.setDiscoveryTime(emergencyTask.getDiscoveryTime());
+            emergencyTaskExcleRespVO.setEmergencyTypeName(getLabel(dictDataList, emergencyTask.getEmergencyTypeId()));
+            emergencyTaskExcleRespVO.setEmergencyHarmName(getLabel(hazardRiskList, emergencyTask.getEmergencyHarmId()));
+            emergencyTaskExcleRespVO.setTreeOwnershipName(getLabel(treePermissionsList, emergencyTask.getTreeOwnershipId()));
+            emergencyTaskExcleRespVO.setEmergencyLocation(emergencyTask.getEmergencyLocation());
+            emergencyTaskExcleRespVO.setReporter(emergencyTask.getReporter());
+            emergencyTaskExcleRespVO.setContactPhone(emergencyTask.getContactPhone());
+            emergencyTaskExcleRespVO.setEmergencyImg(emergencyTask.getEmergencyImg());
+            emergencyTaskExcleRespVO.setTreeSpecies(emergencyTask.getTreeSpecies());
+            emergencyTaskExcleRespVO.setTreeSpec(emergencyTask.getTreeSpec());
+            emergencyTaskExcleRespVO.setRescueStartTime(emergencyTask.getRescueStartTime());
+            emergencyTaskExcleRespVO.setRescueCompleteTime(emergencyTask.getRescueCompleteTime());
+            emergencyTaskExcleRespVO.setPersonnelCount(emergencyTask.getPersonnelCount());
+            emergencyTaskExcleRespVO.setEmergencyEndImg(emergencyTask.getEmergencyEndImg());
+            emergencyTaskExcleRespVO.setRemarks(emergencyTask.getRemarks());
+            emergencyTaskExcleRespVO.setBusiStatus(getLabel(rescueStatusList, emergencyTask.getBusiStatus()));
+            emergencyTaskExcleRespVO.setCompanyName(emergencyTask.getCompanyName());
+            emergencyTaskExcleRespVO.setApprovalUserName(emergencyTask.getApprovalUserName());
+            emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks());
+            emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName());
+            emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime());
+            emergencyTaskExcleRespVO.setUpdaterName(emergencyTask.getUpdaterName());
+            List<String> machineryList = new ArrayList<>();
+            if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){
+                emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList());
+            }else{
+                emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> {
+                    String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId());
+                    Integer machineryCount = emergencyMachinery.getMachineryCount();
+                    machineryList.add(machineryName + ":" + machineryCount);
+                });
+                emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
+            }
+            respList.add(emergencyTaskExcleRespVO);
+        });
+
+
+        // 导出 Excel
+        ExcelUtils.write(response, "抢险任务主.xls", "数据", EmergencyTaskExcleRespVO.class, respList);
+    }
+
+    private String getLabel(List<DictDataRespDTO> dictDataList, Integer id){
+        if(CollectionUtils.isEmpty(dictDataList)){
+            return "";
+        }
+        Map<String, String> nameMap = dictDataList.stream()
+                .collect(Collectors.toMap(
+                        DictDataRespDTO::getValue,  // Key=id
+                        DictDataRespDTO::getLabel // Value=name
+                ));
+
+        return nameMap.get(String.valueOf( id));
+    }
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 抢险机械子分页 Request VO")
+@Data
+public class EmergencyMachineryPageReqVO extends PageParam {
+
+    @Schema(description = "关联任务主表ID", example = "24066")
+    private Long taskId;
+
+    @Schema(description = "机械名称（如：三轮车）", example = "21485")
+    private Integer machineryNameId;
+
+    @Schema(description = "机械数量", example = "28764")
+    private Integer machineryCount;
+
+    @Schema(description = "创建者", example = "李四")
+    private String creatorName;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "更新者", example = "张三")
+    private String updaterName;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 抢险机械子 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EmergencyMachineryRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1541")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "关联任务主表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24066")
+    @ExcelProperty("关联任务主表ID")
+    private Long taskId;
+
+    @Schema(description = "机械名称（如：三轮车）", requiredMode = Schema.RequiredMode.REQUIRED, example = "21485")
+    @ExcelProperty("机械名称（如：三轮车）")
+    private Integer machineryNameId;
+
+    @Schema(description = "机械数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "28764")
+    @ExcelProperty("机械数量")
+    private Integer machineryCount;
+
+    @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("创建者")
+    private String creatorName;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("更新者")
+    private String updaterName;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 抢险机械子新增/修改 Request VO")
+@Data
+public class EmergencyMachinerySaveReqVO {
+
+    @Schema(description = "机械名称（如：三轮车）", requiredMode = Schema.RequiredMode.REQUIRED, example = "21485")
+    @NotNull(message = "机械名称（如：三轮车）不能为空")
+    private Integer machineryNameId;
+
+    @Schema(description = "机械数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "28764")
+    @NotNull(message = "机械数量不能为空")
+    private Integer machineryCount;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 抢险任务主新增/修改 Request VO")
+@Data
+public class EmergencyTaskApprovalReqVO {
+
+    @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "任务编号（唯一标识，如生成规则：TASK+时间戳）不能为空")
+    private String taskNo;
+
+
+    @Schema(description = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结 不能为空")
+    @Min(value = 1, message = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结不能小于 1")
+    @Max(value = 5, message = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结不能大于 5")
+    private Integer busiStatus;
+
+    @Schema(description = "审批备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "审批备注")
+    private String approvalRemarks;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.write.style.ColumnWidth;
+import com.zteits.urbanops.framework.excel.core.convert.ImageListConverter;
+import com.zteits.urbanops.framework.excel.core.convert.ListToStringConverter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 抢险任务主 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EmergencyTaskExcleRespVO {
+
+    @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("案件编号")
+    private String taskNo;
+
+    @Schema(description = "发现险情时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("发现险情时间")
+    private LocalDateTime discoveryTime;
+
+    @Schema(description = "险情类型（如：树木倒伏）", requiredMode = Schema.RequiredMode.REQUIRED, example = "5209")
+    @ExcelProperty("险情类型")
+    private String emergencyTypeName;
+
+    @Schema(description = "险情危害（如：无）", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325")
+    @ExcelProperty("险情危害")
+    private String emergencyHarmName;
+
+    @Schema(description = "树木权属（如：专业权属）", requiredMode = Schema.RequiredMode.REQUIRED, example = "19498")
+    @ExcelProperty("树木权属")
+    private String treeOwnershipName;
+
+    @Schema(description = "险情地点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("险情地点")
+    private String emergencyLocation;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报人")
+    private String reporter;
+
+    @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("联系电话")
+    private String contactPhone;
+
+    @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("抢险开始时间")
+    private LocalDateTime rescueStartTime;
+
+    @Schema(description = "抢险中照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    //@ExcelProperty(value="抢险中照片", converter = ListToStringConverter.class)
+    @ExcelProperty(value = "抢险中照片", converter = ImageListConverter.class)
+    @ColumnWidth(70)
+    private List<String> emergencyImg;
+
+    @Schema(description = "树种（如：国槐）")
+    @ExcelProperty("树种")
+    private String treeSpecies;
+
+    @Schema(description = "树木规格")
+    @ExcelProperty("树木规格")
+    private String treeSpec;
+
+    @Schema(description = "抢险完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("抢险完成时间")
+    private LocalDateTime rescueCompleteTime;
+
+    @Schema(description = "出动人员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371")
+    @ExcelProperty("出动人员数量")
+    private Integer personnelCount;
+
+    @Schema(description = "抢险结束照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    //@ExcelProperty(value="抢险结束照片", converter = ListToStringConverter.class)
+    @ExcelProperty(value = "抢险结束照片", converter = ImageListConverter.class)
+    @ColumnWidth(70)
+    private List<String> emergencyEndImg;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("案件状态")
+    private String busiStatus;
+
+    @Schema(description = "审批人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("审批人")
+    private String approvalUserName;
+
+    @Schema(description = "审批备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "审批备注")
+    @ExcelProperty("审批备注")
+    private String approvalRemarks;
+
+
+    @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("创建者")
+    private String creatorName;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("更新者")
+    private String updaterName;
+
+    @ExcelProperty(value="机械信息", converter = ListToStringConverter.class)
+    private List<String> machineryInfo;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
+    @ExcelProperty("归属公司")
+    private String companyName;
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 抢险任务主分页 Request VO")
+@Data
+public class EmergencyTaskPageReqVO extends PageParam {
+
+    @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）")
+    private String taskNo;
+
+    @Schema(description = "险情类型（如：树木倒伏）", example = "5209")
+    private Integer emergencyTypeId;
+
+    @Schema(description = "险情危害（如：无）", example = "16325")
+    private Integer emergencyHarmId;
+
+    @Schema(description = "树木权属（如：专业权属）", example = "19498")
+    private Integer treeOwnershipId;
+
+    @Schema(description = "险情地点")
+    private String emergencyLocation;
+
+    @Schema(description = "抢险开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate startTime;
+
+    @Schema(description = "抢险结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate endTime;
+
+
+    @Schema(description = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结", example = "1")
+    private Integer busiStatus;
+
+    @Schema(description = "归属(一级部门id)", example = "6353")
+    private Long companyId;
+
+
+    private List<Integer> busiStatusList;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import com.zteits.urbanops.framework.excel.core.convert.ListToStringConverter;
+import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyMachineryDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 抢险任务主 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EmergencyTaskRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10092")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("任务编号（唯一标识，如生成规则：TASK+时间戳）")
+    private String taskNo;
+
+    @Schema(description = "发现险情时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("发现险情时间")
+    private LocalDateTime discoveryTime;
+
+    @Schema(description = "险情类型（如：树木倒伏）", requiredMode = Schema.RequiredMode.REQUIRED, example = "5209")
+    @ExcelProperty("险情类型:1:树木倒伏 2:树木折枝")
+    private Integer emergencyTypeId;
+
+    @Schema(description = "险情危害（如：无）", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325")
+    @ExcelProperty("险情危害（如：无）")
+    private Integer emergencyHarmId;
+
+    @Schema(description = "树木权属（如：专业权属）", requiredMode = Schema.RequiredMode.REQUIRED, example = "19498")
+    @ExcelProperty("树木权属 1:砸车 2:砸房 3:砸人 4:无")
+    private Integer treeOwnershipId;
+
+    @Schema(description = "险情地点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("险情地点")
+    private String emergencyLocation;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("上报人")
+    private String reporter;
+
+    @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("联系电话")
+    private String contactPhone;
+
+    @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("抢险开始时间")
+    private LocalDateTime rescueStartTime;
+
+    @Schema(description = "抢险中照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty(value="抢险中照片", converter = ListToStringConverter.class)
+    private List<String> emergencyImg;
+
+    @Schema(description = "树种（如：国槐）")
+    @ExcelProperty("树种（如：国槐）")
+    private String treeSpecies;
+
+    @Schema(description = "树木规格（如：胸径20厘米）")
+    @ExcelProperty("树木规格（如：胸径20厘米）")
+    private String treeSpec;
+
+    @Schema(description = "抢险完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("抢险完成时间")
+    private LocalDateTime rescueCompleteTime;
+
+    @Schema(description = "出动人员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371")
+    @ExcelProperty("出动人员数量")
+    private Integer personnelCount;
+
+    @Schema(description = "抢险结束照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty(value="抢险结束照片", converter = ListToStringConverter.class)
+    private List<String> emergencyEndImg;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结")
+    private Integer busiStatus;
+
+    @Schema(description = "工作流审批状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("工作流审批状态")
+    private Integer status;
+
+    @Schema(description = "流程实例的编号", example = "30197")
+    @ExcelProperty("流程实例的编号")
+    private String processInstanceId;
+
+    @Schema(description = "审批人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20789")
+    @ExcelProperty("审批人ID")
+    private String approvalUserId;
+
+    @Schema(description = "审批人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("审批人")
+    private String approvalUserName;
+
+    @Schema(description = "审批备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "审批备注")
+    @ExcelProperty("审批备注")
+    private String approvalRemarks;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "6353")
+    @ExcelProperty("归属(一级部门id)")
+    private Long companyId;
+
+    @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "27559")
+    @ExcelProperty("部门ID(道路负责部门id)")
+    private Long deptId;
+
+    @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("创建者")
+    private String creatorName;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("更新者")
+    private String updaterName;
+
+    @ExcelProperty(value="机械信息", converter = ListToStringConverter.class)
+    private List<EmergencyMachineryDO> emergencyMachineryList;
+
+    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
+    @ExcelProperty("归属(一级部门id)")
+    private String companyName;
+
+    @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055")
+    @ExcelProperty("部门")
+    private String deptName;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 抢险任务主新增/修改 Request VO")
+@Data
+public class EmergencyTaskSaveReqVO {
+
+    @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30197")
+    private String taskNo;
+
+    @Schema(description = "发现险情时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "发现险情时间不能为空")
+    private LocalDateTime discoveryTime;
+
+    @Schema(description = "险情类型（如：树木倒伏）", requiredMode = Schema.RequiredMode.REQUIRED, example = "5209")
+    @NotNull(message = "险情类型（如：树木倒伏）不能为空")
+    private Integer emergencyTypeId;
+
+    @Schema(description = "险情危害（如：无）", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325")
+    @NotNull(message = "险情危害（如：无）不能为空")
+    private Integer emergencyHarmId;
+
+    @Schema(description = "树木权属（如：专业权属）", requiredMode = Schema.RequiredMode.REQUIRED, example = "19498")
+    @NotNull(message = "树木权属（如：专业权属）不能为空")
+    private Integer treeOwnershipId;
+
+    @Schema(description = "险情地点", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "险情地点不能为空")
+    @Size(max = 100, message = "险情地点长度不能超过 100 个字符")
+    private String emergencyLocation;
+
+    @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String reporter;
+
+    @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "联系电话不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，应为 11 位手机号")
+    private String contactPhone;
+
+    @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "抢险开始时间不能为空")
+    private LocalDateTime rescueStartTime;
+
+    @Schema(description = "抢险中照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "抢险中照片不能为空")
+    @Size(min = 1, message = "抢险中照片最少1张")
+    private List<String> emergencyImg;
+
+    @Schema(description = "树种（如：国槐）")
+    @Size(max = 100, message = "险情地点长度不能超过 255 个字符")
+    private String treeSpecies;
+
+    @Schema(description = "树木规格（如：胸径20厘米）")
+    @Size(max = 100, message = "树木规格100个字符")
+    private String treeSpec;
+
+    @Schema(description = "抢险完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "抢险完成时间不能为空")
+    private LocalDateTime rescueCompleteTime;
+
+    @Schema(description = "出动人员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371")
+    @NotNull(message = "出动人员数量不能为空")
+    private Integer personnelCount;
+
+    @Schema(description = "抢险结束照片", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<String> emergencyEndImg;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "案件状态 1-待提交 2-待审核 3-驳回 4-关闭；5-完结不能为空")
+    private Integer busiStatus;
+
+    @Schema(description = "工作流审批状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "工作流审批状态不能为空")
+    private Integer status;
+
+    @Schema(description = "流程实例的编号", example = "30197")
+    private String processInstanceId;
+
+    @Schema(description = "审批人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20789")
+    @NotEmpty(message = "审批人ID不能为空")
+    private String approvalUserId;
+
+    @Schema(description = "审批人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "审批人不能为空")
+    private String approvalUserName;
+
+    @Schema(description = "使用机械", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+   private List<EmergencyMachinerySaveReqVO> emergencyMachineryList;
+
+}
 \ No newline at end of file
@@ -13,6 +13,8 @@ public class CommitTaskStatisticsRespVo {
  
     private String dateValue;
  
+    private String currentDate;
+
     private String busiLine;
  
     private String busiLineName;
@@ -19,7 +19,7 @@ public class WorkOrderTrendRespVo {
  
     private String companyName;
  
-    private String totalCount;
+    private Integer totalCount;
  
  
 }
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan;
  
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +40,9 @@ public class InspectionPlanCommitController {
     @Resource
     private InspectionPlanCommitService inspectionPlanCommitService;
  
+    @Resource
+    private PermissionApi permissionApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建巡检计划提交明细")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:create')")
@@ -83,6 +89,9 @@ public class InspectionPlanCommitController {
     @Operation(summary = "获得巡检计划提交明细分页")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')")
     public CommonResult<PageResult<InspectionPlanCommitRespVO>> getInspectionPlanCommitPage(@Valid InspectionPlanCommitPageReqVO pageReqVO) {
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<InspectionPlanCommitRespVO> pageResult = inspectionPlanCommitService.getInspectionPlanCommitPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, InspectionPlanCommitRespVO.class));
     }
@@ -100,4 +109,4 @@ public class InspectionPlanCommitController {
                         BeanUtils.toBean(list, InspectionPlanCommitRespVO.class));
     }
  
-}
 \ No newline at end of file
+}
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan;
  
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
 import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
@@ -40,6 +42,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA
 @RequestMapping("/garden/inspection-plan")
 @Validated
 @Slf4j
+@DataPermission(enable = false)
 public class InspectionPlanController {
  
     @Resource
@@ -123,14 +126,22 @@ public class InspectionPlanController {
     @Operation(summary = "获得巡检计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan:query')")
     public CommonResult<PageResult<InspectionPlanRespVO>> getInspectionPlanPage(@Valid InspectionPlanPageReqVO pageReqVO) {
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-        if(pageReqVO.getCompanyId() == null){
-            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
-                pageReqVO.setCompanyId( null);
-            }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
-            }
-        }
+//        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//        if(pageReqVO.getCompanyId() == null){
+//            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+//                pageReqVO.setCompanyId( null);
+//            }else{
+//                Long companyId = SecurityFrameworkUtils.getCompanyId();
+//                if(null == companyId || companyId == 0L || companyId == 100L){
+//                    companyId = null;
+//                }
+//                pageReqVO.setCompanyId(companyId);
+//            }
+//        }
+
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<InspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -4,6 +4,7 @@ import lombok.*;
  
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Set;
  
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
@@ -71,4 +72,6 @@ public class InspectionPlanCommitPageReqVO extends PageParam {
     @Schema(description = "创建结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate createTimeEnd;
-}
 \ No newline at end of file
+
+    private Set<Long> deptIds;
+}
@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.Set;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -52,4 +53,5 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "完成状态	: 1:未完成；2:已完成")
     private Integer finishState;
  
-}
 \ No newline at end of file
+    private Set<Long> deptIds;
+}
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan;
  
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +40,10 @@ public class MaintainPlanCommitController {
     @Resource
     private MaintainPlanCommitService maintainPlanCommitService;
  
+    @Resource
+    private PermissionApi permissionApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建养护计划明细")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:create')")
@@ -92,6 +99,9 @@ public class MaintainPlanCommitController {
     @Operation(summary = "获得养护计划明细分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
     public CommonResult<PageResult<MaintainPlanCommitRespVO>> getMaintainPlanCommitPage(@Valid MaintainPlanCommitPageReqVO pageReqVO) {
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<MaintainPlanCommitRespVO> pageResult = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO);
         return success(pageResult);
     }
@@ -109,4 +119,4 @@ public class MaintainPlanCommitController {
                         BeanUtils.toBean(list, MaintainPlanCommitRespVO.class));
     }
  
-}
 \ No newline at end of file
+}
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan;
  
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO;
@@ -39,6 +41,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RA
 @RequestMapping("/garden/maintain-plan")
 @Validated
 @Slf4j
+@DataPermission(enable = false)
 public class MaintainPlanController {
  
     @Resource
@@ -122,14 +125,21 @@ public class MaintainPlanController {
     @Operation(summary = "获得养护计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
     public CommonResult<PageResult<MaintainPlanRespVO>> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) {
-        if(pageReqVO.getCompanyId() == null){
-            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
-                pageReqVO.setCompanyId( null);
-            }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
-            }
-        }
+//        if(pageReqVO.getCompanyId() == null){
+//            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+//                pageReqVO.setCompanyId( null);
+//            }else{
+//                Long companyId = SecurityFrameworkUtils.getCompanyId();
+//                if(null == companyId || companyId == 0L || companyId == 100L){
+//                    companyId = null;
+//                }
+//                pageReqVO.setCompanyId(companyId);
+//            }
+//        }
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<MaintainPlanRespVO> pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.List;
+import java.util.Set;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -68,4 +69,5 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate createTimeEnd;
  
+    private Set<Long> deptIds;
 }
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.Set;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -53,4 +54,6 @@ public class MaintainPlanPageReqVO extends PageParam {
     @Schema(description = "完成状态	: 1:未完成；2:已完成")
     private Integer finishState;
  
-}
 \ No newline at end of file
+    private Set<Long> deptIds;
+
+}
@@ -69,7 +69,6 @@ public class MaterialSaveReqVO {
     private String unitName;
  
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
-    @NotEmpty(message = "备注不能为空")
     private String remark;
  
     @Schema(description = "是否关联工单：0-否，1-是")
@@ -71,4 +71,6 @@ public class MaterialInventoryPageReqVO extends PageParam {
     @Schema(description = "部门ID", example = "11349")
     private Long deptId;
  
-}
 \ No newline at end of file
+    @Schema(description = "出库查询", example = "0")
+    private Integer outInventoryQuery;
+}
@@ -13,6 +13,9 @@ public class MaterialInventoryOutSaveReqVO {
  
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "库存ID不能为空")
+    private Long inventoryId;
  
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
     @NotNull(message = "物料ID不能为空")
+package com.zteits.urbanops.module.garden.controller.admin.materialname;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.materialname.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.materialname.MaterialNameDO;
+import com.zteits.urbanops.module.garden.service.materialname.MaterialNameService;
+
+@Tag(name = "管理后台 - 物料名称")
+@RestController
+@RequestMapping("/garden/material-name")
+@Validated
+public class MaterialNameController {
+
+    @Resource
+    private MaterialNameService materialNameService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建物料名称")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:create')")
+    public CommonResult<Long> createMaterialName(@Valid @RequestBody MaterialNameSaveReqVO createReqVO) {
+        return success(materialNameService.createMaterialName(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新物料名称")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:update')")
+    public CommonResult<Boolean> updateMaterialName(@Valid @RequestBody MaterialNameSaveReqVO updateReqVO) {
+        materialNameService.updateMaterialName(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除物料名称")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:material-name:delete')")
+    public CommonResult<Boolean> deleteMaterialName(@RequestParam("id") Long id) {
+        materialNameService.deleteMaterialName(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物料名称")
+                @PreAuthorize("@ss.hasPermission('garden:material-name:delete')")
+    public CommonResult<Boolean> deleteMaterialNameList(@RequestParam("ids") List<Long> ids) {
+        materialNameService.deleteMaterialNameListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得物料名称")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:query')")
+    public CommonResult<MaterialNameRespVO> getMaterialName(@RequestParam("id") Long id) {
+        MaterialNameDO materialName = materialNameService.getMaterialName(id);
+        return success(BeanUtils.toBean(materialName, MaterialNameRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得物料名称分页")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:query')")
+    public CommonResult<PageResult<MaterialNameRespVO>> getMaterialNamePage(@Valid MaterialNamePageReqVO pageReqVO) {
+        PageResult<MaterialNameDO> pageResult = materialNameService.getMaterialNamePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialNameRespVO.class));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得物料名称列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:query')")
+    public CommonResult<List<MaterialNameRespVO>> getMaterialNameList(
+            @RequestParam(value = "materialName", required = false) String materialName) {
+        // 构建查询条件
+        MaterialNamePageReqVO pageReqVO = new MaterialNamePageReqVO();
+        pageReqVO.setMaterialName(materialName);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialNameDO> list = materialNameService.getMaterialNamePage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialNameRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出物料名称 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMaterialNameExcel(@Valid MaterialNamePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MaterialNameDO> list = materialNameService.getMaterialNamePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物料名称.xls", "数据", MaterialNameRespVO.class,
+                        BeanUtils.toBean(list, MaterialNameRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialname.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 物料名称分页 Request VO")
+@Data
+public class MaterialNamePageReqVO extends PageParam {
+
+    @Schema(description = "物料名称ID", example = "14631")
+    private Long materialId;
+
+    @Schema(description = "物料名称", example = "张三")
+    private String materialName;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门ID", example = "23084")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialname.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 物料名称 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MaterialNameRespVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32592")
+    @ExcelProperty("自增主键")
+    private Long id;
+
+    @Schema(description = "物料名称ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14631")
+    @ExcelProperty("物料名称ID")
+    private Long materialId;
+
+    @Schema(description = "物料名称", example = "张三")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门ID", example = "23084")
+    @ExcelProperty("部门ID")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialname.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 物料名称新增/修改 Request VO")
+@Data
+public class MaterialNameSaveReqVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32592")
+    private Long id;
+
+    @Schema(description = "物料名称ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14631")
+    private Long materialId;
+
+    @NotEmpty(message = "物料名称不能为空")
+    @Schema(description = "物料名称", example = "张三")
+    private String materialName;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    private String remark;
+
+    @Schema(description = "部门ID", example = "23084")
+    private Long deptId;
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.materialspecification;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.materialspecification.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.materialspecification.MaterialSpecificationDO;
+import com.zteits.urbanops.module.garden.service.materialspecification.MaterialSpecificationService;
+
+@Tag(name = "管理后台 - 物料规格")
+@RestController
+@RequestMapping("/garden/material-specification")
+@Validated
+public class MaterialSpecificationController {
+
+    @Resource
+    private MaterialSpecificationService materialSpecificationService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建物料规格")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:create')")
+    public CommonResult<Long> createMaterialSpecification(@Valid @RequestBody MaterialSpecificationSaveReqVO createReqVO) {
+        return success(materialSpecificationService.createMaterialSpecification(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新物料规格")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:update')")
+    public CommonResult<Boolean> updateMaterialSpecification(@Valid @RequestBody MaterialSpecificationSaveReqVO updateReqVO) {
+        materialSpecificationService.updateMaterialSpecification(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除物料规格")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:delete')")
+    public CommonResult<Boolean> deleteMaterialSpecification(@RequestParam("id") Long id) {
+        materialSpecificationService.deleteMaterialSpecification(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物料规格")
+                @PreAuthorize("@ss.hasPermission('garden:material-specification:delete')")
+    public CommonResult<Boolean> deleteMaterialSpecificationList(@RequestParam("ids") List<Long> ids) {
+        materialSpecificationService.deleteMaterialSpecificationListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得物料规格")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:query')")
+    public CommonResult<MaterialSpecificationRespVO> getMaterialSpecification(@RequestParam("id") Long id) {
+        MaterialSpecificationDO materialSpecification = materialSpecificationService.getMaterialSpecification(id);
+        return success(BeanUtils.toBean(materialSpecification, MaterialSpecificationRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得物料规格分页")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:query')")
+    public CommonResult<PageResult<MaterialSpecificationRespVO>> getMaterialSpecificationPage(@Valid MaterialSpecificationPageReqVO pageReqVO) {
+        PageResult<MaterialSpecificationDO> pageResult = materialSpecificationService.getMaterialSpecificationPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialSpecificationRespVO.class));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得物料规格列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:query')")
+    public CommonResult<List<MaterialSpecificationRespVO>> getMaterialSpecificationList(
+            @RequestParam(value = "specifications", required = false) String specifications) {
+        // 构建查询条件
+        MaterialSpecificationPageReqVO pageReqVO = new MaterialSpecificationPageReqVO();
+        pageReqVO.setSpecifications(specifications);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialSpecificationDO> list = materialSpecificationService.getMaterialSpecificationPage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialSpecificationRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出物料规格 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMaterialSpecificationExcel(@Valid MaterialSpecificationPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MaterialSpecificationDO> list = materialSpecificationService.getMaterialSpecificationPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物料规格.xls", "数据", MaterialSpecificationRespVO.class,
+                        BeanUtils.toBean(list, MaterialSpecificationRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialspecification.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 物料规格分页 Request VO")
+@Data
+public class MaterialSpecificationPageReqVO extends PageParam {
+
+    @Schema(description = "规格编码")
+    private String specCode;
+
+    @Schema(description = "规格名称")
+    private String specifications;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门ID", example = "18158")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialspecification.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 物料规格 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MaterialSpecificationRespVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15081")
+    @ExcelProperty("自增主键")
+    private Long id;
+
+    @Schema(description = "规格编码")
+    @ExcelProperty("规格编码")
+    private String specCode;
+
+    @Schema(description = "规格名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("规格名称")
+    private String specifications;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门ID", example = "18158")
+    @ExcelProperty("部门ID")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialspecification.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 物料规格新增/修改 Request VO")
+@Data
+public class MaterialSpecificationSaveReqVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15081")
+    private Long id;
+
+    @Schema(description = "规格编码")
+    private String specCode;
+
+    @Schema(description = "规格名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "规格名称不能为空")
+    private String specifications;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    private String remark;
+
+    @Schema(description = "部门ID", example = "18158")
+    private Long deptId;
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.materialunit;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.materialunit.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.materialunit.MaterialUnitDO;
+import com.zteits.urbanops.module.garden.service.materialunit.MaterialUnitService;
+
+@Tag(name = "管理后台 - 物料单位")
+@RestController
+@RequestMapping("/garden/material-unit")
+@Validated
+public class MaterialUnitController {
+
+    @Resource
+    private MaterialUnitService materialUnitService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建物料单位")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:create')")
+    public CommonResult<Long> createMaterialUnit(@Valid @RequestBody MaterialUnitSaveReqVO createReqVO) {
+        return success(materialUnitService.createMaterialUnit(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新物料单位")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:update')")
+    public CommonResult<Boolean> updateMaterialUnit(@Valid @RequestBody MaterialUnitSaveReqVO updateReqVO) {
+        materialUnitService.updateMaterialUnit(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除物料单位")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:delete')")
+    public CommonResult<Boolean> deleteMaterialUnit(@RequestParam("id") Long id) {
+        materialUnitService.deleteMaterialUnit(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物料单位")
+                @PreAuthorize("@ss.hasPermission('garden:material-unit:delete')")
+    public CommonResult<Boolean> deleteMaterialUnitList(@RequestParam("ids") List<Long> ids) {
+        materialUnitService.deleteMaterialUnitListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得物料单位")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:query')")
+    public CommonResult<MaterialUnitRespVO> getMaterialUnit(@RequestParam("id") Long id) {
+        MaterialUnitDO materialUnit = materialUnitService.getMaterialUnit(id);
+        return success(BeanUtils.toBean(materialUnit, MaterialUnitRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得物料单位分页")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:query')")
+    public CommonResult<PageResult<MaterialUnitRespVO>> getMaterialUnitPage(@Valid MaterialUnitPageReqVO pageReqVO) {
+        PageResult<MaterialUnitDO> pageResult = materialUnitService.getMaterialUnitPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialUnitRespVO.class));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得物料单位列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:query')")
+    public CommonResult<List<MaterialUnitRespVO>> getMaterialUnitList(
+            @RequestParam(value = "unitName", required = false) String unitName) {
+        // 构建查询条件
+        MaterialUnitPageReqVO pageReqVO = new MaterialUnitPageReqVO();
+        pageReqVO.setUnitName(unitName);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialUnitDO> list = materialUnitService.getMaterialUnitPage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialUnitRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出物料单位 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMaterialUnitExcel(@Valid MaterialUnitPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MaterialUnitDO> list = materialUnitService.getMaterialUnitPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物料单位.xls", "数据", MaterialUnitRespVO.class,
+                        BeanUtils.toBean(list, MaterialUnitRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialunit.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 物料单位分页 Request VO")
+@Data
+public class MaterialUnitPageReqVO extends PageParam {
+
+    @Schema(description = "单位ID", example = "22342")
+    private Long unitId;
+
+    @Schema(description = "单位名称", example = "张三")
+    private String unitName;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门ID", example = "8809")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialunit.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 物料单位 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MaterialUnitRespVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8413")
+    @ExcelProperty("自增主键")
+    private Long id;
+
+    @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22342")
+    @ExcelProperty("单位ID")
+    private Long unitId;
+
+    @Schema(description = "单位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("单位名称")
+    private String unitName;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门ID", example = "8809")
+    @ExcelProperty("部门ID")
+    private Long deptId;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.materialunit.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 物料单位新增/修改 Request VO")
+@Data
+public class MaterialUnitSaveReqVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8413")
+    private Long id;
+
+    @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22342")
+    private Long unitId;
+
+    @Schema(description = "单位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "单位名称不能为空")
+    private String unitName;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
+    private String remark;
+
+    @Schema(description = "部门ID", example = "8809")
+    private Long deptId;
+
+}
 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
  
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.AssertTrue;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
  
@@ -9,6 +13,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -44,14 +49,16 @@ public class MechanicalCostPageReqVO extends PageParam {
     private String vehicleType;
  
     @Schema(description = "开始使用时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate[] startUseTime;
  
     @Schema(description = "使用年限")
     private Long serviceLife;
  
     @Schema(description = "结束使用时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate[] endUseTime;
  
     @Schema(description = "归属公司", example = "张三")
@@ -67,6 +74,16 @@ public class MechanicalCostPageReqVO extends PageParam {
     private String remark;
  
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+
+    //对应前端排序字段
+    public static final Map<String, SFunction<MechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", MechanicalCostDO::getId,
+            "unitPrice", MechanicalCostDO::getUnitPrice,
+            "quantity", MechanicalCostDO::getQuantity,
+            "serviceLife", MechanicalCostDO::getServiceLife,
+            "startUseTime", MechanicalCostDO::getStartUseTime,
+            "endUseTime" , MechanicalCostDO::getEndUseTime
+    );
+
 }
 package com.zteits.urbanops.module.garden.controller.admin.mechanicaldepreciation.vo;
  
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -51,4 +51,4 @@ public class MechanicalDepreciationPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
  
-}
 \ No newline at end of file
+}
 package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
  
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -8,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -46,4 +49,11 @@ public class PersonalCostPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
  
+    public static final Map<String, SFunction<PersonalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", PersonalCostDO::getId,
+            "salaryMonth", PersonalCostDO::getSalaryMonth,
+            "salaryAmount", PersonalCostDO::getSalaryAmount,
+            "createTime", PersonalCostDO::getCreateTime
+    );
+
 }
@@ -119,8 +119,7 @@ public class PlanRateController {
     @Operation(summary = "获得计划频次分页")
     @PreAuthorize("@ss.hasPermission('garden:plan-rate:query')")
     public CommonResult<PageResult<PlanRateRespVO>> getPlanRatePage(@Valid PlanRatePageReqVO pageReqVO) {
-        PageResult<PlanRateDO> pageResult = planRateService.getPlanRatePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PlanRateRespVO.class));
+        return success(planRateService.getPlanRatePage(pageReqVO));
     }
  
     @GetMapping("/export-excel")
@@ -130,7 +129,7 @@ public class PlanRateController {
     public void exportPlanRateExcel(@Valid PlanRatePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PlanRateDO> list = planRateService.getPlanRatePage(pageReqVO).getList();
+        List<PlanRateRespVO> list = planRateService.getPlanRatePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "计划频次.xls", "数据", PlanRateRespVO.class,
                         BeanUtils.toBean(list, PlanRateRespVO.class));
@@ -82,8 +82,9 @@ public class PlanRateDetailController {
     @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')")
     public CommonResult<PlanRateDetailRespVO> getPlanRateValue(@RequestParam("busi_Line") @NotBlank String busiLine,
                                                                @RequestParam("plan_type_id") @NotNull Integer planTypeId,
-                                                               @RequestParam("level_id") @NotNull Integer levelId) {
-        return success(planRateDetailService.getPlanRateValue(busiLine, planTypeId, levelId));
+                                                               @RequestParam("level_id") @NotNull Integer levelId,
+                                                               @RequestParam("company_id")  Long companyId) {
+        return success(planRateDetailService.getPlanRateValue(busiLine, planTypeId, levelId, companyId));
     }
  
     @GetMapping("/page")
 package com.zteits.urbanops.module.garden.controller.admin.planrate.vo;
  
+import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import java.util.*;
@@ -30,4 +31,8 @@ public class PlanRatePageReqVO extends PageParam {
     @NotNull(message = "类型：1:养护；2:巡查不能为空")
     private Integer type;
  
+    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Hidden
+    private Long companyId;
+
 }
 \ No newline at end of file
@@ -36,4 +36,10 @@ public class PlanRateRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
  
+    @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long companyId;
+
+    @Schema(description = "公司", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String companyName;
+
 }
 \ No newline at end of file
@@ -29,6 +29,9 @@ public class PlanRateSaveReqVO {
     @NotNull(message = "类型：1:养护；2:巡查不能为空")
     private Integer type;
  
+    @Schema(description = "公司ID")
+    private Long companyId;
+
     @NotNull@NotNull(message = "频次明细不能为空")
     @Size(min = 1)
     @Valid
+package com.zteits.urbanops.module.garden.controller.admin.problemtype;
+
+import com.zteits.urbanops.module.garden.controller.admin.problemtype.vo.ProblemTypePageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.problemtype.vo.ProblemTypeRespVO;
+import com.zteits.urbanops.module.garden.controller.admin.problemtype.vo.ProblemTypeSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import java.util.*;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.module.garden.dal.dataobject.problemtype.GardenProblemTypeDO;
+import com.zteits.urbanops.module.garden.dal.mysql.problemtype.GardenProblemTypeMapper;
+import com.zteits.urbanops.module.garden.service.problemtype.GardenProblemTypeService;
+
+@Tag(name = "管理后台 - 问题类型配置")
+@RestController
+@RequestMapping("/garden/problem-type")
+@Validated
+public class GardenProblemTypeController {
+
+    @Resource
+    private GardenProblemTypeService gardenProblemTypeService;
+
+    @Resource
+    private GardenProblemTypeMapper gardenProblemTypeMapper;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建问题类型（二级/三级）")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:create')")
+    public CommonResult<Long> createProblemType(@Valid @RequestBody ProblemTypeSaveReqVO createReqVO) {
+        return success(gardenProblemTypeService.createProblemType(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新问题类型（二级/三级）")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:update')")
+    public CommonResult<Boolean> updateProblemType(@Valid @RequestBody ProblemTypeSaveReqVO updateReqVO) {
+        gardenProblemTypeService.updateProblemType(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除问题类型")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:delete')")
+    public CommonResult<Boolean> deleteProblemType(@RequestParam("id") Long id) {
+        gardenProblemTypeService.deleteProblemType(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得问题类型")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:query')")
+    public CommonResult<ProblemTypeRespVO> getProblemType(@RequestParam("id") Long id) {
+        GardenProblemTypeDO problemType = gardenProblemTypeService.getProblemType(id);
+        ProblemTypeRespVO respVO = BeanUtils.toBean(problemType, ProblemTypeRespVO.class);
+        fillParentNames(Arrays.asList(respVO));
+        return success(respVO);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得问题类型分页")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:query')")
+    public CommonResult<PageResult<ProblemTypeRespVO>> getProblemTypePage(@Valid ProblemTypePageReqVO pageReqVO) {
+        PageResult<GardenProblemTypeDO> pageResult = gardenProblemTypeService.getProblemTypePage(pageReqVO);
+        PageResult<ProblemTypeRespVO> voPageResult = BeanUtils.toBean(pageResult, ProblemTypeRespVO.class);
+        fillParentNames(voPageResult.getList());
+        return success(voPageResult);
+    }
+
+    @GetMapping("/list-by-parent")
+    @Operation(summary = "根据父级编码和层级查询子类型列表（级联下拉用）")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:query')")
+    public CommonResult<List<ProblemTypeRespVO>> getProblemTypeListByParent(
+            @RequestParam(value = "parentCode", required = false) String parentCode,
+            @RequestParam("level") Integer level) {
+        List<GardenProblemTypeDO> list = gardenProblemTypeService.getProblemTypeByParentCode(parentCode, level);
+        return success(BeanUtils.toBean(list, ProblemTypeRespVO.class));
+    }
+
+    @GetMapping("/generate-next-code")
+    @Operation(summary = "根据父级编码生成下一个类型编码")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:create')")
+    public CommonResult<String> generateNextCode(@RequestParam("parentCode") String parentCode) {
+        return success(gardenProblemTypeService.generateNextCode(parentCode));
+    }
+
+    @PostMapping("/sync-level-one")
+    @Operation(summary = "从字典表同步一级类型")
+    @PreAuthorize("@ss.hasPermission('garden:problem-type:create')")
+    public CommonResult<Integer> syncLevelOne() {
+        return success(gardenProblemTypeService.syncLevelOneFromDict());
+    }
+
+    /**
+     * 填充每个记录的层级名称：
+     * level 1 → levelOneName = 自身 typeName
+     * level 2 → levelTwoName = 自身 typeName, levelOneName = 父级 typeName
+     * level 3 → levelOneName = 祖父 typeName, levelTwoName = 父级 typeName
+     */
+    private void fillParentNames(List<ProblemTypeRespVO> list) {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        for (ProblemTypeRespVO vo : list) {
+            if (vo.getLevel() == null) continue;
+            if (vo.getLevel() == 1) {
+                vo.setLevelOneName(vo.getTypeName());
+            } else if (vo.getLevel() == 2) {
+                vo.setLevelTwoName(vo.getTypeName());
+                if (vo.getParentCode() != null) {
+                    GardenProblemTypeDO parent = gardenProblemTypeMapper.selectByTypeCode(vo.getParentCode());
+                    if (parent != null) {
+                        vo.setLevelOneName(parent.getTypeName());
+                    }
+                }
+            } else if (vo.getLevel() == 3) {
+                if (vo.getParentCode() != null) {
+                    GardenProblemTypeDO parent = gardenProblemTypeMapper.selectByTypeCode(vo.getParentCode());
+                    if (parent != null) {
+                        vo.setLevelTwoName(parent.getTypeName());
+                        if (parent.getParentCode() != null) {
+                            GardenProblemTypeDO grandParent = gardenProblemTypeMapper
+                                    .selectByTypeCode(parent.getParentCode());
+                            if (grandParent != null) {
+                                vo.setLevelOneName(grandParent.getTypeName());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.problemtype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+
+@Schema(description = "管理后台 - 问题类型分页 Request VO")
+@Data
+public class ProblemTypePageReqVO extends PageParam {
+
+    @Schema(description = "问题类型编码", example = "PT001")
+    private String typeCode;
+
+    @Schema(description = "问题类型名称", example = "树木倒伏")
+    private String typeName;
+
+    @Schema(description = "层级：1一级 2二级 3三级", example = "2")
+    private Integer level;
+
+    @Schema(description = "父级类型编码", example = "BIZ_GARDEN")
+    private String parentCode;
+
+    @Schema(description = "一级类型编码（级联筛选）", example = "yl")
+    private String levelOneCode;
+
+    @Schema(description = "状态 1启用 0禁用", example = "1")
+    private Integer status;
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.problemtype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 问题类型 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProblemTypeRespVO {
+
+    @Schema(description = "主键ID", example = "1")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "问题类型编码", example = "PT001")
+    @ExcelProperty("问题类型编码")
+    private String typeCode;
+
+    @Schema(description = "问题类型名称", example = "树木倒伏")
+    @ExcelProperty("问题类型名称")
+    private String typeName;
+
+    @Schema(description = "层级：1一级 2二级 3三级", example = "2")
+    @ExcelProperty("层级")
+    private Integer level;
+
+    @Schema(description = "父级类型编码", example = "BIZ_GARDEN")
+    @ExcelProperty("父级类型编码")
+    private String parentCode;
+
+    @Schema(description = "排序序号", example = "1")
+    @ExcelProperty("排序序号")
+    private Integer sort;
+
+    @Schema(description = "状态 1启用 0禁用", example = "1")
+    @ExcelProperty("状态")
+    private Integer status;
+
+    @Schema(description = "一级类型名称")
+    private String levelOneName;
+
+    @Schema(description = "二级类型名称")
+    private String levelTwoName;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String creator;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private String createTime;
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.problemtype.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 问题类型新增/修改 Request VO")
+@Data
+public class ProblemTypeSaveReqVO {
+
+    @Schema(description = "主键ID", example = "1")
+    private Long id;
+
+    @Schema(description = "问题类型编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "PT001")
+    @NotEmpty(message = "问题类型编码不能为空")
+    private String typeCode;
+
+    @Schema(description = "问题类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "树木倒伏")
+    @NotEmpty(message = "问题类型名称不能为空")
+    private String typeName;
+
+    @Schema(description = "层级：1一级 2二级 3三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "层级不能为空")
+    private Integer level;
+
+    @Schema(description = "父级类型编码", example = "BIZ_GARDEN")
+    private String parentCode;
+
+    @Schema(description = "排序序号", example = "1")
+    private Integer sort;
+
+    @Schema(description = "状态 1启用 0禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}
 package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo;
  
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.AssertTrue;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
  
@@ -25,14 +27,17 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     @Schema(description = "租赁总价格", example = "316")
     private BigDecimal rentalTotalPriceMax;
     @Schema(description = "开始使用时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date startUseTime;
+    private LocalDate[] startUseTime;
  
     @Schema(description = "使用时长（天）")
     private Integer useDuration;
  
     @Schema(description = "结束日期")
-    private LocalDate endUseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate[] endUseTime;
  
     @Schema(description = "数量")
     private Integer quantity;
@@ -42,9 +47,11 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
  
     public static final Map<String, SFunction<RentalMechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", RentalMechanicalCostDO::getId,
+            "rentalTotalPrice",RentalMechanicalCostDO::getRentalTotalPrice,
             "quantity", RentalMechanicalCostDO::getQuantity,
             "useDuration", RentalMechanicalCostDO::getUseDuration,
             "startUseTime", RentalMechanicalCostDO::getStartUseTime,
             "endUseTime", RentalMechanicalCostDO::getEndUseTime
     );
+
 }
@@ -2,6 +2,9 @@ package com.zteits.urbanops.module.garden.controller.admin.road;
  
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.system.api.permission.PermissionApi;
+import jakarta.annotation.security.PermitAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -36,6 +39,7 @@ import com.zteits.urbanops.module.garden.service.road.RoadService;
 @RequestMapping("/garden/road")
 @Validated
 public class RoadController {
+    private static final Logger log = LoggerFactory.getLogger(RoadController.class);
  
     @Resource
     private RoadService roadService;
@@ -93,7 +97,11 @@ public class RoadController {
             if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
                 pageReqVO.setCompanyId( null);
             }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+                Long companyId = SecurityFrameworkUtils.getCompanyId();
+                if(null == companyId || companyId == 0L || companyId == 100L){
+                    companyId = null;
+                }
+                pageReqVO.setCompanyId(companyId);
             }
         }
         PageResult<RoadRespVO> pageResult = roadService.getRoadPage(pageReqVO);
@@ -124,19 +132,30 @@ public class RoadController {
  
     @Operation(summary = "物联网查询道路")
     @GetMapping("/queryAllRoadList")
-    public CommonResult<List<SysRoadRespVO>> queryAllRoadList(@RequestParam(required = false)String roadName,@RequestParam(required = false)String deptCode,@RequestParam(required = false)String companyCode) {
+    @PermitAll
+    public Map<String, Object> queryAllRoadList(@RequestParam(required = false) String roadName, @RequestParam(required = false) String deptCode, @RequestParam(required = false) String companyCode) {
+        log.info("物联网查询道路:companyCode:{},roadName:{},deptCode:{}",companyCode,roadName,deptCode);
         RoadListReqVO reqVO = new RoadListReqVO();
         reqVO.setRoadName(roadName);
-        reqVO.setCompanyId(Long.valueOf(deptCode));
+        // 处理deptCode为空的情况
+        if (deptCode != null && !deptCode.isEmpty()) {
+            reqVO.setDeptId(Long.valueOf(deptCode));
+        }
         reqVO.setBusiLine(companyCode);
         List<RoadDO> roadList = roadService.getRoadList(reqVO);
-        List<SysRoadRespVO> deptResps = roadList.stream().map(manager -> {
-            SysRoadRespVO sysDeptResp = new SysRoadRespVO();
-            sysDeptResp.setRoadCode(manager.getId()+"");
-            sysDeptResp.setRoadName(manager.getRoadName());
-            return sysDeptResp;
+        List<Map<String, Object>> roadResps = roadList.stream().map(manager -> {
+            Map<String, Object> roadMap = new HashMap<>();
+            roadMap.put("roadCode", manager.getId() + "");
+            roadMap.put("roadName", manager.getRoadName());
+            return roadMap;
         }).collect(Collectors.toList());
-        return success(deptResps);
+
+        // 构建返回格式
+        Map<String, Object> result = new HashMap<>();
+        result.put("msg", "操作成功");
+        result.put("code", 200);
+        result.put("data", roadResps);
+        return result;
     }
  
 }
@@ -26,8 +26,11 @@ public class RoadListReqVO {
     @NotNull(message = "归属(一级部门id)不能为空")
     private Long companyId;
  
+    @Schema(description = "部门ID", example = "126")
+    private Long deptId;
+
     @Schema(description = "业务看", example = "yl")
     @NotEmpty(message = "创建者不能为空")
     private String busiLine;
  
-}
 \ No newline at end of file
+}
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraladd;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.unitintegraladd.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.unitintegraladd.UnitIntegralAddDO;
+import com.zteits.urbanops.module.garden.service.unitintegraladd.UnitIntegralAddService;
+
+@Tag(name = "管理后台 - 积分增加记录")
+@RestController
+@RequestMapping("/garden/unit-integral-add")
+@Validated
+public class UnitIntegralAddController {
+
+    @Resource
+    private UnitIntegralAddService unitIntegralAddService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建积分增加记录")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:create')")
+    public CommonResult<Long> createUnitIntegralAdd(@Valid @RequestBody UnitIntegralAddSaveReqVO createReqVO) {
+        return success(unitIntegralAddService.createUnitIntegralAdd(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新积分增加记录")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:update')")
+    public CommonResult<Boolean> updateUnitIntegralAdd(@Valid @RequestBody UnitIntegralAddSaveReqVO updateReqVO) {
+        unitIntegralAddService.updateUnitIntegralAdd(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除积分增加记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralAdd(@RequestParam("id") Long id) {
+        unitIntegralAddService.deleteUnitIntegralAdd(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除积分增加记录")
+                @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralAddList(@RequestParam("ids") List<Long> ids) {
+        unitIntegralAddService.deleteUnitIntegralAddListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得积分增加记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:query')")
+    public CommonResult<UnitIntegralAddRespVO> getUnitIntegralAdd(@RequestParam("id") Long id) {
+        UnitIntegralAddDO unitIntegralAdd = unitIntegralAddService.getUnitIntegralAdd(id);
+        return success(BeanUtils.toBean(unitIntegralAdd, UnitIntegralAddRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得积分增加记录分页")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:query')")
+    public CommonResult<PageResult<UnitIntegralAddRespVO>> getUnitIntegralAddPage(@Valid UnitIntegralAddPageReqVO pageReqVO) {
+        PageResult<UnitIntegralAddDO> pageResult = unitIntegralAddService.getUnitIntegralAddPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, UnitIntegralAddRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出积分增加记录 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-add:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUnitIntegralAddExcel(@Valid UnitIntegralAddPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<UnitIntegralAddDO> list = unitIntegralAddService.getUnitIntegralAddPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "积分增加记录.xls", "数据", UnitIntegralAddRespVO.class,
+                        BeanUtils.toBean(list, UnitIntegralAddRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraladd.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 积分增加记录分页 Request VO")
+@Data
+public class UnitIntegralAddPageReqVO extends PageParam {
+
+    @Schema(description = "来源类型 01:派单", example = "1")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", example = "1")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", example = "26490")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", example = "芋艿")
+    private String unitName;
+
+    @Schema(description = "关联ID（关联业务表主键）", example = "24947")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "张三")
+    private String relatedTaskName;
+
+    @Schema(description = "本次增加积分（正数）")
+    private Integer addIntegral;
+
+    @Schema(description = "增加原因（如：到期前上报奖励、到期后上报奖励等）", example = "不好")
+    private String addReason;
+
+    @Schema(description = "增加前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "增加后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充积分增加的特殊说明）", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "积分增加操作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraladd.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 积分增加记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class UnitIntegralAddRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12471")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("来源类型 01:派单")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("单位类型：01:公司 02:班组 03:个人")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "26490")
+    @ExcelProperty("单位ID(部门表 id)")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("单位名称（冗余，避免联表查询）")
+    private String unitName;
+
+    @Schema(description = "关联ID（关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "24947")
+    @ExcelProperty("关联ID（关联业务表主键）")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "张三")
+    @ExcelProperty("业务名称（冗余）")
+    private String relatedTaskName;
+
+    @Schema(description = "本次增加积分（正数）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("本次增加积分（正数）")
+    private Integer addIntegral;
+
+    @Schema(description = "增加原因（如：到期前上报奖励、到期后上报奖励等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "不好")
+    @ExcelProperty("增加原因（如：到期前上报奖励、到期后上报奖励等）")
+    private String addReason;
+
+    @Schema(description = "增加前总积分（对账用）")
+    @ExcelProperty("增加前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "增加后总积分（对账用）")
+    @ExcelProperty("增加后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    @ExcelProperty("工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充积分增加的特殊说明）", example = "你说的对")
+    @ExcelProperty("备注（补充积分增加的特殊说明）")
+    private String remark;
+
+    @Schema(description = "积分增加操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("积分增加操作时间")
+    private LocalDateTime createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraladd.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 积分增加记录新增/修改 Request VO")
+@Data
+public class UnitIntegralAddSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12471")
+    private Long id;
+
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "来源类型 01:派单不能为空")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "单位类型：01:公司 02:班组 03:个人不能为空")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "26490")
+    @NotEmpty(message = "单位ID(部门表 id)不能为空")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "单位名称（冗余，避免联表查询）不能为空")
+    private String unitName;
+
+    @Schema(description = "关联ID（关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "24947")
+    @NotNull(message = "关联ID（关联业务表主键）不能为空")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "张三")
+    private String relatedTaskName;
+
+    @Schema(description = "本次增加积分（正数）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "本次增加积分（正数）不能为空")
+    private Integer addIntegral;
+
+    @Schema(description = "增加原因（如：到期前上报奖励、到期后上报奖励等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "不好")
+    @NotEmpty(message = "增加原因（如：到期前上报奖励、到期后上报奖励等）不能为空")
+    private String addReason;
+
+    @Schema(description = "增加前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "增加后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充积分增加的特殊说明）", example = "你说的对")
+    private String remark;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegralsub;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.unitintegralsub.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.unitintegralsub.UnitIntegralSubDO;
+import com.zteits.urbanops.module.garden.service.unitintegralsub.UnitIntegralSubService;
+
+@Tag(name = "管理后台 - 积分扣减记录")
+@RestController
+@RequestMapping("/garden/unit-integral-sub")
+@Validated
+public class UnitIntegralSubController {
+
+    @Resource
+    private UnitIntegralSubService unitIntegralSubService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建积分扣减记录")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:create')")
+    public CommonResult<Long> createUnitIntegralSub(@Valid @RequestBody UnitIntegralSubSaveReqVO createReqVO) {
+        return success(unitIntegralSubService.createUnitIntegralSub(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新积分扣减记录")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:update')")
+    public CommonResult<Boolean> updateUnitIntegralSub(@Valid @RequestBody UnitIntegralSubSaveReqVO updateReqVO) {
+        unitIntegralSubService.updateUnitIntegralSub(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除积分扣减记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralSub(@RequestParam("id") Long id) {
+        unitIntegralSubService.deleteUnitIntegralSub(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除积分扣减记录")
+                @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralSubList(@RequestParam("ids") List<Long> ids) {
+        unitIntegralSubService.deleteUnitIntegralSubListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得积分扣减记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:query')")
+    public CommonResult<UnitIntegralSubRespVO> getUnitIntegralSub(@RequestParam("id") Long id) {
+        UnitIntegralSubDO unitIntegralSub = unitIntegralSubService.getUnitIntegralSub(id);
+        return success(BeanUtils.toBean(unitIntegralSub, UnitIntegralSubRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得积分扣减记录分页")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:query')")
+    public CommonResult<PageResult<UnitIntegralSubRespVO>> getUnitIntegralSubPage(@Valid UnitIntegralSubPageReqVO pageReqVO) {
+        PageResult<UnitIntegralSubDO> pageResult = unitIntegralSubService.getUnitIntegralSubPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, UnitIntegralSubRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出积分扣减记录 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-sub:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUnitIntegralSubExcel(@Valid UnitIntegralSubPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<UnitIntegralSubDO> list = unitIntegralSubService.getUnitIntegralSubPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "积分扣减记录.xls", "数据", UnitIntegralSubRespVO.class,
+                        BeanUtils.toBean(list, UnitIntegralSubRespVO.class));
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegralsub.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 积分扣减记录分页 Request VO")
+@Data
+public class UnitIntegralSubPageReqVO extends PageParam {
+
+    @Schema(description = "来源类型 01:派单", example = "1")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", example = "1")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", example = "13254")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", example = "芋艿")
+    private String unitName;
+
+    @Schema(description = "关联任务ID（外键，关联业务表主键）", example = "21804")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "芋艿")
+    private String relatedTaskName;
+
+    @Schema(description = "本次扣减积分（正数，存储扣减数值）")
+    private Integer subIntegral;
+
+    @Schema(description = "扣减原因（如：任务打回等）", example = "不香")
+    private String subReason;
+
+    @Schema(description = "扣减前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "扣减后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充扣减的特殊说明）", example = "随便")
+    private String remark;
+
+    @Schema(description = "积分扣减操作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegralsub.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 积分扣减记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class UnitIntegralSubRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "499")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("来源类型 01:派单")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("单位类型：01:公司 02:班组 03:个人")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "13254")
+    @ExcelProperty("单位ID(部门表 id)")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("单位名称（冗余，避免联表查询）")
+    private String unitName;
+
+    @Schema(description = "关联任务ID（外键，关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "21804")
+    @ExcelProperty("关联任务ID（外键，关联业务表主键）")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "芋艿")
+    @ExcelProperty("业务名称（冗余）")
+    private String relatedTaskName;
+
+    @Schema(description = "本次扣减积分（正数，存储扣减数值）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("本次扣减积分（正数，存储扣减数值）")
+    private Integer subIntegral;
+
+    @Schema(description = "扣减原因（如：任务打回等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "不香")
+    @ExcelProperty("扣减原因（如：任务打回等）")
+    private String subReason;
+
+    @Schema(description = "扣减前总积分（对账用）")
+    @ExcelProperty("扣减前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "扣减后总积分（对账用）")
+    @ExcelProperty("扣减后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    @ExcelProperty("工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充扣减的特殊说明）", example = "随便")
+    @ExcelProperty("备注（补充扣减的特殊说明）")
+    private String remark;
+
+    @Schema(description = "积分扣减操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("积分扣减操作时间")
+    private LocalDateTime createTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegralsub.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 积分扣减记录新增/修改 Request VO")
+@Data
+public class UnitIntegralSubSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "499")
+    private Long id;
+
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "来源类型 01:派单不能为空")
+    private String sourceType;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "单位类型：01:公司 02:班组 03:个人不能为空")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "13254")
+    @NotEmpty(message = "单位ID(部门表 id)不能为空")
+    private String unitId;
+
+    @Schema(description = "单位名称（冗余，避免联表查询）", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "单位名称（冗余，避免联表查询）不能为空")
+    private String unitName;
+
+    @Schema(description = "关联任务ID（外键，关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "21804")
+    @NotNull(message = "关联任务ID（外键，关联业务表主键）不能为空")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "芋艿")
+    private String relatedTaskName;
+
+    @Schema(description = "本次扣减积分（正数，存储扣减数值）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "本次扣减积分（正数，存储扣减数值）不能为空")
+    private Integer subIntegral;
+
+    @Schema(description = "扣减原因（如：任务打回等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "不香")
+    @NotEmpty(message = "扣减原因（如：任务打回等）不能为空")
+    private String subReason;
+
+    @Schema(description = "扣减前总积分（对账用）")
+    private Integer beforeIntegral;
+
+    @Schema(description = "扣减后总积分（对账用）")
+    private Integer afterIntegral;
+
+    @Schema(description = "工单号")
+    private String workNo;
+
+    @Schema(description = "备注（补充扣减的特殊说明）", example = "随便")
+    private String remark;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal;
+
+import com.zteits.urbanops.module.garden.service.unitintegraltotal.UnitIntegralService;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.unitintegraltotal.UnitIntegralTotalDO;
+import com.zteits.urbanops.module.garden.service.unitintegraltotal.UnitIntegralTotalService;
+
+@Tag(name = "管理后台 - 单位积分累计")
+@RestController
+@RequestMapping("/garden/unit-integral-total")
+@Validated
+public class UnitIntegralTotalController {
+
+    @Resource
+    private UnitIntegralTotalService unitIntegralTotalService;
+
+    @Resource
+    private UnitIntegralService unitIntegralService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建单位积分累计")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:create')")
+    public CommonResult<Long> createUnitIntegralTotal(@Valid @RequestBody UnitIntegralTotalSaveReqVO createReqVO) {
+        return success(unitIntegralTotalService.createUnitIntegralTotal(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新单位积分累计")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:update')")
+    public CommonResult<Boolean> updateUnitIntegralTotal(@Valid @RequestBody UnitIntegralTotalSaveReqVO updateReqVO) {
+        unitIntegralTotalService.updateUnitIntegralTotal(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除单位积分累计")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralTotal(@RequestParam("id") Long id) {
+        unitIntegralTotalService.deleteUnitIntegralTotal(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除单位积分累计")
+                @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:delete')")
+    public CommonResult<Boolean> deleteUnitIntegralTotalList(@RequestParam("ids") List<Long> ids) {
+        unitIntegralTotalService.deleteUnitIntegralTotalListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得单位积分累计")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:query')")
+    public CommonResult<UnitIntegralTotalRespVO> getUnitIntegralTotal(@RequestParam("id") Long id) {
+        UnitIntegralTotalDO unitIntegralTotal = unitIntegralTotalService.getUnitIntegralTotal(id);
+        return success(BeanUtils.toBean(unitIntegralTotal, UnitIntegralTotalRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得单位积分累计分页")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:query')")
+    public CommonResult<PageResult<UnitIntegralTotalRespVO>> getUnitIntegralTotalPage(@Valid UnitIntegralTotalPageReqVO pageReqVO) {
+        PageResult<UnitIntegralTotalDO> pageResult = unitIntegralTotalService.getUnitIntegralTotalPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, UnitIntegralTotalRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出单位积分累计 Excel")
+    @PreAuthorize("@ss.hasPermission('garden:unit-integral-total:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUnitIntegralTotalExcel(@Valid UnitIntegralTotalPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<UnitIntegralTotalDO> list = unitIntegralTotalService.getUnitIntegralTotalPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "单位积分累计.xls", "数据", UnitIntegralTotalRespVO.class,
+                        BeanUtils.toBean(list, UnitIntegralTotalRespVO.class));
+    }
+
+    @PostMapping ("/unitIntegralCreate")
+    public void testCreate() {
+        unitIntegralService.createUnitIntegral("01", "200", "测试");
+    }
+
+    @PostMapping ("/unitIntegralAdd")
+    public void testAdd() {
+        UnitIntegralSaveReqVO updateReqVO = new UnitIntegralSaveReqVO();
+        updateReqVO.setTotalIntegral(100);
+        updateReqVO.setUnitType("01");
+        updateReqVO.setUnitId("100");
+        updateReqVO.setUnitName("西城园林");
+        updateReqVO.setSourceType("01");
+        updateReqVO.setReason("测试");
+        updateReqVO.setRelatedTaskId(11111111111L);
+        updateReqVO.setRelatedTaskName("任务派发");
+
+        unitIntegralService.addUnitIntegral(updateReqVO);
+    }
+    @PostMapping ("/unitIntegralSub")
+    public void testSub() {
+        UnitIntegralSaveReqVO updateReqVO = new UnitIntegralSaveReqVO();
+        updateReqVO.setTotalIntegral(100);
+        updateReqVO.setUnitType("01");
+        updateReqVO.setUnitId("100");
+        updateReqVO.setUnitName("西城园林");
+        updateReqVO.setSourceType("01");
+        updateReqVO.setReason("测试");
+        updateReqVO.setRelatedTaskId(11111111112L);
+        updateReqVO.setRelatedTaskName("任务派发");
+
+        unitIntegralService.subUnitIntegral(updateReqVO);
+    }
+}
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 单位积分累计新增/修改 Request VO")
+@Data
+public class UnitIntegralRespVO {
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private String sourceType;
+
+    @Schema(description = "关联ID（关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "24947")
+    private Long relatedTaskId;
+
+    @Schema(description = "当前总积分")
+    private Integer totalIntegral;
+
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.unitintegraltotal.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Schema(description = "管理后台 - 单位积分累计新增/修改 Request VO")
+@Data
+public class UnitIntegralSaveReqVO {
+    @Schema(description = "查询日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "yyyy")
+    private String statDate;
+
+    @Schema(description = "单位类型：01:公司 02:班组 03:个人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "单位类型：01:公司 02:班组 03:个人不能为空")
+    private String unitType;
+
+    @Schema(description = "单位ID(部门表 id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "22785")
+    @NotEmpty(message = "单位ID(部门表 id)不能为空")
+    private String unitId;
+
+    @Schema(description = "单位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "西城")
+    @NotEmpty(message = "单位名称不能为空")
+    private String unitName;
+
+    @Schema(description = "当前总积分")
+    private Integer totalIntegral;
+
+    @Schema(description = "来源类型 01:派单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "来源类型 01:派单不能为空")
+    private String sourceType;
+
+    @Schema(description = "关联ID（关联业务表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "24947")
+    @NotNull(message = "关联ID（关联业务表主键）不能为空")
+    private Long relatedTaskId;
+
+    @Schema(description = "业务名称（冗余）", example = "张三")
+    private String relatedTaskName;
+
+    @Schema(description = "原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不好")
+    private String reason;
+
+    @Schema(description = "工单号")
+    private String workNo;
+
+    public String getStatDate() {
+        if (StringUtils.isBlank(statDate)) {
+            // 获取当前年份，转为字符串（如 2026）
+            return LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy"));
+        }
+        // 2. 若有值，直接返回（兼容传入的年份）
+        return statDate;
+    }
+
+    public void setStatDate(String statDate) {
+        this.statDate = statDate;
+    }
+}