diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/PrisonAreaController.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/PrisonAreaController.java
index ed12e49940..2f75f5c4fd 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/PrisonAreaController.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/PrisonAreaController.java
@@ -57,7 +57,7 @@ public class PrisonAreaController {
     @Operation(summary = "删除监区信息")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('prison:area:delete')")
-    public CommonResult<Boolean> deleteArea(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> deleteArea(@NotNull(message = "编号不能为空") @RequestParam("id") Long id) {
         areaService.deleteArea(id);
         return success(true);
     }
@@ -65,8 +65,8 @@ public class PrisonAreaController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除监区信息")
-                @PreAuthorize("@ss.hasPermission('prison:area:delete')")
-    public CommonResult<Boolean> deleteAreaList(@RequestParam("ids") List<Long> ids) {
+    @PreAuthorize("@ss.hasPermission('prison:area:delete')")
+    public CommonResult<Boolean> deleteAreaList(@NotEmpty(message = "编号列表不能为空") @RequestParam("ids") List<Long> ids) {
         areaService.deleteAreaListByIds(ids);
         return success(true);
     }
@@ -97,7 +97,7 @@ public class PrisonAreaController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<AreaDO> list = areaService.getAreaPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "监区信息.xls", "数据", AreaRespVO.class,
+        ExcelUtils.write(response, "监区信息.xlsx", "数据", AreaRespVO.class,
                         BeanUtils.toBean(list, AreaRespVO.class));
     }
 
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaPageReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaPageReqVO.java
index c6d641add9..7f7dfb2a88 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaPageReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaPageReqVO.java
@@ -13,28 +13,28 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class AreaPageReqVO extends PageParam {
 
-    @Schema(description = "监区名称", example = "李四")
+    @Schema(description = "监区名称", example = "第一监区")
     private String name;
 
     @Schema(description = "监区编码")
     private String code;
 
-    @Schema(description = "监区类型：1-普通监区 2-严管监区 3-医院 4-禁闭室", example = "1")
+    @Schema(description = "监区类型：1-普通监区 2-严管监区 3-集训监区 4-出监监区 5-医院 6-禁闭室", example = "1")
     private Integer type;
 
     @Schema(description = "容纳人数")
     private Integer capacity;
 
-    @Schema(description = "当前人数", example = "26596")
+    @Schema(description = "当前人数", example = "100")
     private Integer currentCount;
 
     @Schema(description = "排序")
     private Integer sort;
 
-    @Schema(description = "状态：1-启用 2-禁用", example = "2")
+    @Schema(description = "状态：1-启用 2-禁用", example = "1")
     private Integer status;
 
-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "备注", example = "正常运行的监区")
     private String remark;
 
     @Schema(description = "创建时间")
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaRespVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaRespVO.java
index bf68ccd666..51d9d2eb49 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaRespVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaRespVO.java
@@ -6,6 +6,7 @@ import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 @Schema(description = "管理后台 - 监区信息 Response VO")
 @Data
@@ -16,7 +17,7 @@ public class AreaRespVO {
     @ExcelProperty("监区ID")
     private Long id;
 
-    @Schema(description = "监区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "监区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "第一监区")
     @ExcelProperty("监区名称")
     private String name;
 
@@ -40,7 +41,7 @@ public class AreaRespVO {
     @ExcelProperty("容纳人数")
     private Integer capacity;
 
-    @Schema(description = "当前人数", example = "26596")
+    @Schema(description = "当前人数", example = "100")
     @ExcelProperty("当前人数")
     private Integer currentCount;
 
@@ -48,11 +49,11 @@ public class AreaRespVO {
     @ExcelProperty("排序")
     private Integer sort;
 
-    @Schema(description = "状态：1-启用 2-禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态：1-启用 2-禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("状态：1-启用 2-禁用")
     private Integer status;
 
-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "备注", example = "正常运行的监区")
     @ExcelProperty("备注")
     private String remark;
 
@@ -61,6 +62,7 @@ public class AreaRespVO {
     private LocalDateTime createTime;
 
     @Schema(description = "子监区列表，仅一级监区返回")
+    @JsonIgnore
     private List<AreaRespVO> children;
 
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaSaveReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaSaveReqVO.java
index 95909e5eb2..cb62230f42 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaSaveReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/area/vo/AreaSaveReqVO.java
@@ -12,7 +12,7 @@ public class AreaSaveReqVO {
     @Schema(description = "监区ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19443")
     private Long id;
 
-    @Schema(description = "监区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "监区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "第一监区")
     @NotEmpty(message = "监区名称不能为空")
     private String name;
 
@@ -24,25 +24,30 @@ public class AreaSaveReqVO {
     private Long parentId;
 
     @Schema(description = "级别：1-监区(大队) 2-分监区(中队)")
+    @NotNull(message = "级别不能为空")
     private Integer level;
 
     @Schema(description = "监区类型：1-普通监区 2-严管监区 3-集训监区 4-出监监区 5-医院 6-禁闭室", example = "1")
+    @NotNull(message = "监区类型不能为空")
     private Integer type;
 
     @Schema(description = "容纳人数")
+    @Min(value = 0, message = "容纳人数不能为负数")
     private Integer capacity;
 
-    @Schema(description = "当前人数", example = "26596")
+    @Schema(description = "当前人数", example = "100")
+    @Min(value = 0, message = "当前人数不能为负数")
     private Integer currentCount;
 
     @Schema(description = "排序")
+    @Min(value = 0, message = "排序不能为负数")
     private Integer sort;
 
-    @Schema(description = "状态：1-启用 2-禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态：1-启用 2-禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态：1-启用 2-禁用不能为空")
     private Integer status;
 
-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "备注", example = "正常运行的监区")
     private String remark;
 
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/PrisonCellController.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/PrisonCellController.java
index 97c88f0c5d..c690db5ba7 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/PrisonCellController.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/PrisonCellController.java
@@ -61,7 +61,7 @@ public class PrisonCellController {
     @Operation(summary = "删除监室信息")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('prison:cell:delete')")
-    public CommonResult<Boolean> deleteCell(@RequestParam("id") Long id) {
+    public CommonResult<Boolean> deleteCell(@NotNull(message = "编号不能为空") @RequestParam("id") Long id) {
         cellService.deleteCell(id);
         return success(true);
     }
@@ -69,8 +69,8 @@ public class PrisonCellController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除监室信息")
-                @PreAuthorize("@ss.hasPermission('prison:cell:delete')")
-    public CommonResult<Boolean> deleteCellList(@RequestParam("ids") List<Long> ids) {
+    @PreAuthorize("@ss.hasPermission('prison:cell:delete')")
+    public CommonResult<Boolean> deleteCellList(@NotEmpty(message = "编号列表不能为空") @RequestParam("ids") List<Long> ids) {
         cellService.deleteCellListByIds(ids);
         return success(true);
     }
@@ -111,7 +111,7 @@ public class PrisonCellController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<CellRespVO> list = cellService.getCellPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "监室信息.xls", "数据", CellRespVO.class, list);
+        ExcelUtils.write(response, "监室信息.xlsx", "数据", CellRespVO.class, list);
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellPageReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellPageReqVO.java
index 52a7f19602..872d8b76a4 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellPageReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellPageReqVO.java
@@ -16,7 +16,7 @@ public class CellPageReqVO extends PageParam {
     @Schema(description = "所属监区ID", example = "9889")
     private Long areaId;
 
-    @Schema(description = "监室名称", example = "张三")
+    @Schema(description = "监室名称", example = "101监室")
     private String name;
 
     @Schema(description = "监室编码")
@@ -25,7 +25,7 @@ public class CellPageReqVO extends PageParam {
     @Schema(description = "床位数量")
     private Integer capacity;
 
-    @Schema(description = "当前人数", example = "31423")
+    @Schema(description = "当前人数", example = "5")
     private Integer currentCount;
 
     @Schema(description = "排序")
@@ -34,11 +34,11 @@ public class CellPageReqVO extends PageParam {
     @Schema(description = "状态：1-启用 2-禁用", example = "1")
     private Integer status;
 
-    @Schema(description = "备注", example = "随便")
+    @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
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellSaveReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellSaveReqVO.java
index 2d537c1877..2aed827518 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellSaveReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/cell/vo/CellSaveReqVO.java
@@ -16,7 +16,7 @@ public class CellSaveReqVO {
     @NotNull(message = "所属监区ID不能为空")
     private Long areaId;
 
-    @Schema(description = "监室名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "监室名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "101监室")
     @NotEmpty(message = "监室名称不能为空")
     private String name;
 
@@ -24,20 +24,25 @@ public class CellSaveReqVO {
     @NotEmpty(message = "监室编码不能为空")
     private String code;
 
-    @Schema(description = "床位数量")
+    @Schema(description = "床位数量", example = "10")
+    @Min(value = 0, message = "床位数量不能小于0")
     private Integer capacity;
 
-    @Schema(description = "当前人数", example = "31423")
+    @Schema(description = "当前人数", example = "5")
+    @Min(value = 0, message = "当前人数不能小于0")
     private Integer currentCount;
 
-    @Schema(description = "排序")
+    @Schema(description = "排序", example = "1")
+    @Min(value = 0, message = "排序不能小于0")
     private Integer sort;
 
     @Schema(description = "状态：1-启用 2-禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态：1-启用 2-禁用不能为空")
+    @Min(value = 1, message = "状态最小值为1")
+    @Max(value = 2, message = "状态最大值为2")
     private Integer status;
 
-    @Schema(description = "备注", example = "随便")
+    @Schema(description = "备注", example = "正常使用的监室")
     private String remark;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnairePageReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnairePageReqVO.java
index f93893c0ed..de1e31882c 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnairePageReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnairePageReqVO.java
@@ -36,4 +36,21 @@ public class QuestionnairePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    // ==================== 新增字段 ====================
+
+    @Schema(description = "封面图片URL")
+    private String coverImage;
+
+    @Schema(description = "填写说明")
+    private String instruction;
+
+    @Schema(description = "预计耗时（分钟）")
+    private Integer estimatedTime;
+
+    @Schema(description = "分区数量")
+    private Integer partCount;
+
+    @Schema(description = "是否允许匿名")
+    private Boolean allowAnonymous;
+
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireRespVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireRespVO.java
index c9445362dd..90b0b5e03a 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireRespVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireRespVO.java
@@ -45,4 +45,26 @@ public class QuestionnaireRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    // ==================== 新增字段 ====================
+
+    @Schema(description = "封面图片URL")
+    @ExcelProperty("封面图片URL")
+    private String coverImage;
+
+    @Schema(description = "填写说明")
+    @ExcelProperty("填写说明")
+    private String instruction;
+
+    @Schema(description = "预计耗时（分钟）")
+    @ExcelProperty("预计耗时（分钟）")
+    private Integer estimatedTime;
+
+    @Schema(description = "分区数量")
+    @ExcelProperty("分区数量")
+    private Integer partCount;
+
+    @Schema(description = "是否允许匿名：false-不允许 true-允许")
+    @ExcelProperty("是否允许匿名")
+    private Boolean allowAnonymous;
+
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireSaveReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireSaveReqVO.java
index a8ee0cc013..78201ae18e 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireSaveReqVO.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnaire/vo/QuestionnaireSaveReqVO.java
@@ -31,7 +31,24 @@ public class QuestionnaireSaveReqVO {
     private BigDecimal passScore;
 
     @Schema(description = "状态：1-草稿 2-已发布 3-已禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "状态：1-草稿 2-已发布 3-已禁用不能为空")
+    @NotNull(message = "状态不能为空")
     private Integer status;
 
+    // ==================== 新增字段 ====================
+
+    @Schema(description = "封面图片URL")
+    private String coverImage;
+
+    @Schema(description = "填写说明")
+    private String instruction;
+
+    @Schema(description = "预计耗时（分钟）")
+    private Integer estimatedTime;
+
+    @Schema(description = "分区数量")
+    private Integer partCount;
+
+    @Schema(description = "是否允许匿名：false-不允许 true-允许")
+    private Boolean allowAnonymous;
+
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/questionnaire/QuestionnaireMapper.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/questionnaire/QuestionnaireMapper.java
index f74d55f019..2544b96633 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/questionnaire/QuestionnaireMapper.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/questionnaire/QuestionnaireMapper.java
@@ -25,6 +25,11 @@ public interface QuestionnaireMapper extends BaseMapperX<QuestionnaireDO> {
                 .eqIfPresent(QuestionnaireDO::getTotalScore, reqVO.getTotalScore())
                 .eqIfPresent(QuestionnaireDO::getPassScore, reqVO.getPassScore())
                 .eqIfPresent(QuestionnaireDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(QuestionnaireDO::getCoverImage, reqVO.getCoverImage())
+                .eqIfPresent(QuestionnaireDO::getInstruction, reqVO.getInstruction())
+                .eqIfPresent(QuestionnaireDO::getEstimatedTime, reqVO.getEstimatedTime())
+                .eqIfPresent(QuestionnaireDO::getPartCount, reqVO.getPartCount())
+                .eqIfPresent(QuestionnaireDO::getAllowAnonymous, reqVO.getAllowAnonymous())
                 .betweenIfPresent(QuestionnaireDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(QuestionnaireDO::getId));
     }
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordPassStatusEnum.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordPassStatusEnum.java
new file mode 100644
index 0000000000..a29644fc89
--- /dev/null
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordPassStatusEnum.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.prison.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 问卷答题记录及格状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum QuestionnaireRecordPassStatusEnum {
+
+    NOT_PASSED(0, "未及格"),
+    PASSED(1, "及格");
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+
+    /**
+     * 名称
+     */
+    private final String name;
+
+    public static boolean isValid(Integer status) {
+        if (status == null) {
+            return false;
+        }
+        for (QuestionnaireRecordPassStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static QuestionnaireRecordPassStatusEnum getByStatus(Integer status) {
+        for (QuestionnaireRecordPassStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordStatusEnum.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordStatusEnum.java
new file mode 100644
index 0000000000..a8b68196c2
--- /dev/null
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireRecordStatusEnum.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.prison.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 问卷答题记录状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum QuestionnaireRecordStatusEnum {
+
+    PENDING(1, "待评估"),
+    COMPLETED(2, "已完成");
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+
+    /**
+     * 名称
+     */
+    private final String name;
+
+    public static boolean isValid(Integer status) {
+        if (status == null) {
+            return false;
+        }
+        for (QuestionnaireRecordStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static QuestionnaireRecordStatusEnum getByStatus(Integer status) {
+        for (QuestionnaireRecordStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireStatusEnum.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireStatusEnum.java
new file mode 100644
index 0000000000..fe9ba501d5
--- /dev/null
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/enums/QuestionnaireStatusEnum.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.prison.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 问卷状态枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum QuestionnaireStatusEnum {
+
+    DRAFT(1, "草稿"),
+    PUBLISHED(2, "已发布"),
+    DISABLED(3, "已禁用");
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+
+    /**
+     * 名称
+     */
+    private final String name;
+
+    public static boolean isValid(Integer status) {
+        if (status == null) {
+            return false;
+        }
+        for (QuestionnaireStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static QuestionnaireStatusEnum getByStatus(Integer status) {
+        for (QuestionnaireStatusEnum value : values()) {
+            if (value.getStatus().equals(status)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/question/QuestionServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/question/QuestionServiceImpl.java
index 19f613062d..7dc1d94d64 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/question/QuestionServiceImpl.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/question/QuestionServiceImpl.java
@@ -60,10 +60,19 @@ public class QuestionServiceImpl implements QuestionService {
     }
 
     @Override
-        public void deleteQuestionListByIds(List<Long> ids) {
+    public void deleteQuestionListByIds(List<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        // 校验所有ID都存在
+        Long count = questionMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<QuestionDO>()
+                .in(QuestionDO::getId, ids));
+        if (count == null || count != ids.size()) {
+            throw exception(QUESTION_NOT_EXISTS);
+        }
         // 删除
         questionMapper.deleteByIds(ids);
-        }
+    }
 
 
     private void validateQuestionExists(Long id) {
@@ -88,18 +97,23 @@ public class QuestionServiceImpl implements QuestionService {
         if (CollUtil.isEmpty(updateList)) {
             return;
         }
-        // 批量更新
-        for (QuestionSaveReqVO updateReqVO : updateList) {
-            // 校验存在
-            validateQuestionExists(updateReqVO.getId());
-            // 更新（仅更新排序和分区相关字段）
-            QuestionDO updateObj = new QuestionDO();
-            updateObj.setId(updateReqVO.getId());
-            updateObj.setPartName(updateReqVO.getPartName());
-            updateObj.setPartSort(updateReqVO.getPartSort());
-            updateObj.setSort(updateReqVO.getSort());
-            questionMapper.updateById(updateObj);
+        // 校验所有ID存在性
+        List<Long> ids = convertList(updateList, QuestionSaveReqVO::getId);
+        Long count = questionMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<QuestionDO>()
+                .in(QuestionDO::getId, ids));
+        if (count == null || count != ids.size()) {
+            throw exception(QUESTION_NOT_EXISTS);
         }
+        // 批量更新 - 使用 updateBatchById 提升性能
+        List<QuestionDO> updateObjs = convertList(updateList, vo -> {
+            QuestionDO obj = new QuestionDO();
+            obj.setId(vo.getId());
+            obj.setPartName(vo.getPartName());
+            obj.setPartSort(vo.getPartSort());
+            obj.setSort(vo.getSort());
+            return obj;
+        });
+        this.updateBatchById(updateObjs);
     }
 
 }
\ No newline at end of file
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/questionnairerecord/QuestionnaireRecordServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/questionnairerecord/QuestionnaireRecordServiceImpl.java
index 9a7f76427f..5e963d4208 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/questionnairerecord/QuestionnaireRecordServiceImpl.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/questionnairerecord/QuestionnaireRecordServiceImpl.java
@@ -60,10 +60,19 @@ public class QuestionnaireRecordServiceImpl implements QuestionnaireRecordServic
     }
 
     @Override
-        public void deleteQuestionnaireRecordListByIds(List<Long> ids) {
+    public void deleteQuestionnaireRecordListByIds(List<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        // 校验所有ID都存在
+        Long count = questionnaireRecordMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<QuestionnaireRecordDO>()
+                .in(QuestionnaireRecordDO::getId, ids));
+        if (count == null || count != ids.size()) {
+            throw exception(QUESTIONNAIRE_RECORD_NOT_EXISTS);
+        }
         // 删除
         questionnaireRecordMapper.deleteByIds(ids);
-        }
+    }
 
 
     private void validateQuestionnaireRecordExists(Long id) {
diff --git a/yudao-module-prison/src/main/resources/sql/question_add_columns.sql b/yudao-module-prison/src/main/resources/sql/question_add_columns.sql
new file mode 100644
index 0000000000..418c156ec7
--- /dev/null
+++ b/yudao-module-prison/src/main/resources/sql/question_add_columns.sql
@@ -0,0 +1,18 @@
+-- 问题表新增字段
+-- 执行前请确保已备份数据库
+-- 连接数据库: mysql -h 192.168.10.130 -u xlcp_dev -p xlcp_dev
+
+ALTER TABLE prison_question
+ADD COLUMN part_name VARCHAR(100) DEFAULT NULL COMMENT '分区名称' AFTER `sort`,
+ADD COLUMN part_sort INT DEFAULT NULL COMMENT '分区排序' AFTER `part_name`,
+ADD COLUMN help_text VARCHAR(500) DEFAULT NULL COMMENT '帮助说明' AFTER `part_sort`,
+ADD COLUMN placeholder VARCHAR(200) DEFAULT NULL COMMENT '占位提示' AFTER `help_text`,
+ADD COLUMN default_value VARCHAR(500) DEFAULT NULL COMMENT '默认值' AFTER `placeholder`,
+ADD COLUMN auto_fill_type VARCHAR(20) DEFAULT NULL COMMENT '自动填充类型：NONE-无 AUTO-自动 MANUAL-手动' AFTER `default_value`,
+ADD COLUMN auto_fill_source VARCHAR(500) DEFAULT NULL COMMENT '自动填充来源' AFTER `auto_fill_type`,
+ADD COLUMN display_condition VARCHAR(1000) DEFAULT NULL COMMENT '显示条件JSON' AFTER `auto_fill_source`,
+ADD COLUMN min_value DECIMAL(10,2) DEFAULT NULL COMMENT '最小值' AFTER `display_condition`,
+ADD COLUMN max_value DECIMAL(10,2) DEFAULT NULL COMMENT '最大值' AFTER `min_value`;
+
+-- 验证字段是否添加成功
+DESCRIBE prison_question;
diff --git a/yudao-module-prison/src/main/resources/sql/questionnaire_add_columns.sql b/yudao-module-prison/src/main/resources/sql/questionnaire_add_columns.sql
new file mode 100644
index 0000000000..49d4dff5a2
--- /dev/null
+++ b/yudao-module-prison/src/main/resources/sql/questionnaire_add_columns.sql
@@ -0,0 +1,13 @@
+-- 问卷模板表新增字段
+-- 执行前请确保已备份数据库
+-- 连接数据库: mysql -h 192.168.10.130 -u xlcp_dev -p xlcp_dev
+
+ALTER TABLE prison_questionnaire
+ADD COLUMN cover_image VARCHAR(500) DEFAULT NULL COMMENT '封面图片URL' AFTER `status`,
+ADD COLUMN instruction VARCHAR(500) DEFAULT NULL COMMENT '填写说明' AFTER `cover_image`,
+ADD COLUMN estimated_time INT DEFAULT NULL COMMENT '预计耗时（分钟）' AFTER `instruction`,
+ADD COLUMN part_count INT DEFAULT NULL COMMENT '分区数量' AFTER `estimated_time`,
+ADD COLUMN allow_anonymous TINYINT(1) DEFAULT NULL COMMENT '是否允许匿名：0-否 1-是' AFTER `part_count`;
+
+-- 验证字段是否添加成功
+SELECT * FROM prison_questionnaire LIMIT 1;