diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
index e69de29b..a54cdfe7 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
@@ -0,0 +1,95 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.QuestionnaireVo;
+import org.dromara.property.domain.bo.QuestionnaireBo;
+import org.dromara.property.service.IQuestionnaireService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 调查问卷
+ * 前端访问路由地址为:/property/questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/questionnaire")
+public class QuestionnaireController extends BaseController {
+
+    private final IQuestionnaireService questionnaireService;
+
+    /**
+     * 查询调查问卷列表
+     */
+    @SaCheckPermission("property:questionnaire:list")
+    @GetMapping("/list")
+    public TableDataInfo<QuestionnaireVo> list(QuestionnaireBo bo, PageQuery pageQuery) {
+        return questionnaireService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取调查问卷详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:questionnaire:query")
+    @GetMapping("/{id}")
+    public R<QuestionnaireVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(questionnaireService.queryById(id));
+    }
+
+    /**
+     * 新增调查问卷
+     */
+    @SaCheckPermission("property:questionnaire:add")
+    @Log(title = "调查问卷", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody QuestionnaireBo bo) {
+        return toAjax(questionnaireService.insertByBo(bo));
+    }
+
+    /**
+     * 修改调查问卷
+     */
+    @SaCheckPermission("property:questionnaire:edit")
+    @Log(title = "调查问卷", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QuestionnaireBo bo) {
+        return toAjax(questionnaireService.updateByBo(bo));
+    }
+
+    /**
+     * 删除调查问卷
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:questionnaire:remove")
+    @Log(title = "调查问卷", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(questionnaireService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
index e69de29b..f27003c2 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
@@ -0,0 +1,63 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 调查问卷对象 questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire")
+public class Questionnaire extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String head;
+
+    /**
+     * 描述
+     */
+    private String depict;
+
+    /**
+     * 是否匿名收集
+     */
+    private String isAnonyCollec;
+
+    /**
+     * 是否多次提交
+     */
+    private String isCommit;
+
+    /**
+     * 截止日期
+     */
+    private Date deadline;
+
+    /**
+     * 状态(1草稿2已发布3未发布)
+     */
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java
index e69de29b..9cdbbdf4 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java
@@ -0,0 +1,61 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 调查问卷问题对象 questionnaire_question
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire_question")
+public class QuestionnaireQuestion extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 调查问卷id
+     */
+    private Long questionnaireId;
+
+    /**
+     * 标题
+     */
+    private String head;
+
+    /**
+     * 问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)
+     */
+    private String type;
+
+    /**
+     * 是否必填(1不必填2必填)
+     */
+    private String isRequired;
+
+    /**
+     * 描述
+     */
+    private String depict;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java
index e69de29b..b257f780 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java
@@ -0,0 +1,51 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 调查问卷问题选项对象 questionnaire_question_item
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("questionnaire_question_item")
+public class QuestionnaireQuestionItem extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 问题id
+     */
+    private Long questionId;
+
+    /**
+     * 选项内容
+     */
+    private String itemContent;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
index e69de29b..9ef514d2 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
@@ -0,0 +1,70 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.Questionnaire;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 调查问卷业务对象 questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Questionnaire.class, reverseConvertGenerate = false)
+public class QuestionnaireBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String head;
+
+    /**
+     * 描述
+     */
+    @NotBlank(message = "问卷描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String depict;
+
+    /**
+     * 是否匿名收集
+     */
+    private String isAnonyCollec;
+
+    /**
+     * 是否多次提交
+     */
+    private String isCommit;
+
+    /**
+     * 截止日期
+     */
+    @NotNull(message = "截止日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date deadline;
+
+    /**
+     * 状态(1草稿2已发布3未发布)
+     */
+    @NotBlank(message = "状态(1草稿2已发布3未发布)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+    /**
+     * 问卷问题列表
+     */
+    private List<QuestionnaireQuestionBo> questionnaireQuestions;
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java
index e69de29b..8cd9c922 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java
@@ -0,0 +1,69 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.QuestionnaireQuestion;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.List;
+
+/**
+ * 调查问卷问题业务对象 questionnaire_question
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = QuestionnaireQuestion.class, reverseConvertGenerate = false)
+public class QuestionnaireQuestionBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 调查问卷id
+     */
+    @NotNull(message = "调查问卷id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long questionnaireId;
+
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String head;
+
+    /**
+     * 问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)
+     */
+    @NotBlank(message = "问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String type;
+
+    /**
+     * 是否必填(1不必填2必填)
+     */
+    @NotBlank(message = "是否必填(1不必填2必填)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String isRequired;
+
+    /**
+     * 描述
+     */
+    private String depict;
+
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long sort;
+
+    /**
+     * 问题项目列表多选题必传
+     */
+    private List<QuestionnaireQuestionItemBo> questionnaireQuestionItems;
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java
index e69de29b..1b5c09ff 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java
@@ -0,0 +1,51 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.QuestionnaireQuestionItem;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 调查问卷问题选项业务对象 questionnaire_question_item
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = QuestionnaireQuestionItem.class, reverseConvertGenerate = false)
+public class QuestionnaireQuestionItemBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 问题id
+     */
+    @NotNull(message = "问题id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long questionId;
+
+    /**
+     * 选项内容
+     */
+    @NotBlank(message = "选项内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String itemContent;
+
+    /**
+     * 排序
+     */
+    private Long sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java
index e69de29b..798fa053 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java
@@ -0,0 +1,62 @@
+package org.dromara.property.domain.vo;
+
+import org.dromara.property.domain.QuestionnaireQuestionItem;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 调查问卷问题选项视图对象 questionnaire_question_item
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = QuestionnaireQuestionItem.class)
+public class QuestionnaireQuestionItemVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 问题id
+     */
+    @ExcelProperty(value = "问题id")
+    private Long questionId;
+
+    /**
+     * 选项内容
+     */
+    @ExcelProperty(value = "选项内容")
+    private String itemContent;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sort;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
index e69de29b..964bf8ec 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
@@ -0,0 +1,74 @@
+package org.dromara.property.domain.vo;
+
+import org.dromara.property.domain.QuestionnaireQuestion;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 调查问卷问题视图对象 questionnaire_question
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = QuestionnaireQuestion.class)
+public class QuestionnaireQuestionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 调查问卷id
+     */
+    @ExcelProperty(value = "调查问卷id")
+    private Long questionnaireId;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String head;
+
+    /**
+     * 问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)
+     */
+    @ExcelProperty(value = "问题类型(1单行文本2多行文本3单选题4多选题5评分题6日期选择)")
+    private String type;
+
+    /**
+     * 是否必填(1不必填2必填)
+     */
+    @ExcelProperty(value = "是否必填(1不必填2必填)")
+    private String isRequired;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String depict;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Long sort;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
index e69de29b..b50fe3c8 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
@@ -0,0 +1,76 @@
+package org.dromara.property.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.property.domain.Questionnaire;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 调查问卷视图对象 questionnaire
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = Questionnaire.class)
+public class QuestionnaireVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String head;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String depict;
+
+    /**
+     * 是否匿名收集
+     */
+    @ExcelProperty(value = "是否匿名收集")
+    private String isAnonyCollec;
+
+    /**
+     * 是否多次提交
+     */
+    @ExcelProperty(value = "是否多次提交")
+    private String isCommit;
+
+    /**
+     * 截止日期
+     */
+    @ExcelProperty(value = "截止日期")
+    private Date deadline;
+
+    /**
+     * 状态(1草稿2已发布3未发布)
+     */
+    @ExcelProperty(value = "状态(1草稿2已发布3未发布)")
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java
index e69de29b..b76bb3ab 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java
@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.Questionnaire;
+import org.dromara.property.domain.vo.QuestionnaireVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 调查问卷Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Mapper
+public interface QuestionnaireMapper extends BaseMapperPlus<Questionnaire, QuestionnaireVo> {
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java
index e69de29b..adf0124d 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java
@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.QuestionnaireQuestionItem;
+import org.dromara.property.domain.vo.QuestionnaireQuestionItemVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 调查问卷问题选项Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Mapper
+public interface QuestionnaireQuestionItemMapper extends BaseMapperPlus<QuestionnaireQuestionItem, QuestionnaireQuestionItemVo> {
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java
index e69de29b..d0def2a1 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java
@@ -0,0 +1,17 @@
+package org.dromara.property.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.QuestionnaireQuestion;
+import org.dromara.property.domain.vo.QuestionnaireQuestionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 调查问卷问题Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Mapper
+public interface QuestionnaireQuestionMapper extends BaseMapperPlus<QuestionnaireQuestion, QuestionnaireQuestionVo> {
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java
index e69de29b..11b6ade4 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java
@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+import org.dromara.property.domain.Questionnaire;
+import org.dromara.property.domain.vo.QuestionnaireVo;
+import org.dromara.property.domain.bo.QuestionnaireBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调查问卷Service接口
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+public interface IQuestionnaireService {
+
+    /**
+     * 查询调查问卷
+     *
+     * @param id 主键
+     * @return 调查问卷
+     */
+    QuestionnaireVo queryById(Long id);
+
+    /**
+     * 分页查询调查问卷列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 调查问卷分页列表
+     */
+    TableDataInfo<QuestionnaireVo> queryPageList(QuestionnaireBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的调查问卷列表
+     *
+     * @param bo 查询条件
+     * @return 调查问卷列表
+     */
+    List<QuestionnaireVo> queryList(QuestionnaireBo bo);
+
+    /**
+     * 新增调查问卷
+     *
+     * @param bo 调查问卷
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(QuestionnaireBo bo);
+
+    /**
+     * 修改调查问卷
+     *
+     * @param bo 调查问卷
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(QuestionnaireBo bo);
+
+    /**
+     * 校验并批量删除调查问卷信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
index e69de29b..01df710b 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
@@ -0,0 +1,212 @@
+package org.dromara.property.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.QuestionnaireQuestion;
+import org.dromara.property.domain.QuestionnaireQuestionItem;
+import org.dromara.property.domain.bo.QuestionnaireQuestionBo;
+import org.dromara.property.domain.bo.QuestionnaireQuestionItemBo;
+import org.dromara.property.mapper.QuestionnaireQuestionItemMapper;
+import org.dromara.property.mapper.QuestionnaireQuestionMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.property.domain.bo.QuestionnaireBo;
+import org.dromara.property.domain.vo.QuestionnaireVo;
+import org.dromara.property.domain.Questionnaire;
+import org.dromara.property.mapper.QuestionnaireMapper;
+import org.dromara.property.service.IQuestionnaireService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 调查问卷Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-08-14
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class QuestionnaireServiceImpl implements IQuestionnaireService {
+
+    private final QuestionnaireMapper baseMapper;
+    private final QuestionnaireQuestionMapper questionnaireQuestionMapper;
+    private final QuestionnaireQuestionItemMapper questionnaireQuestionItemMapper;
+
+    /**
+     * 查询调查问卷
+     *
+     * @param id 主键
+     * @return 调查问卷
+     */
+    @Override
+    public QuestionnaireVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询调查问卷列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 调查问卷分页列表
+     */
+    @Override
+    public TableDataInfo<QuestionnaireVo> queryPageList(QuestionnaireBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<Questionnaire> lqw = buildQueryWrapper(bo);
+        Page<QuestionnaireVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的调查问卷列表
+     *
+     * @param bo 查询条件
+     * @return 调查问卷列表
+     */
+    @Override
+    public List<QuestionnaireVo> queryList(QuestionnaireBo bo) {
+        LambdaQueryWrapper<Questionnaire> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<Questionnaire> buildQueryWrapper(QuestionnaireBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<Questionnaire> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(Questionnaire::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getHead()), Questionnaire::getHead, bo.getHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Questionnaire::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增调查问卷
+     *
+     * @param bo 调查问卷
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(QuestionnaireBo bo) {
+        Questionnaire add = MapstructUtils.convert(bo, Questionnaire.class);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            validEntityBeforeAdd(bo);
+        }
+        return flag;
+    }
+
+    /**
+     * 修改调查问卷
+     *
+     * @param bo 调查问卷
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(QuestionnaireBo bo) {
+        Questionnaire update = MapstructUtils.convert(bo, Questionnaire.class);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            validEntityBeforeUpdate(bo);
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeAdd(QuestionnaireBo bo) {
+        //TODO 做一些数据校验,如唯一约束
+        List<QuestionnaireQuestionBo> questionnaireQuestions = bo.getQuestionnaireQuestions();
+        if (CollUtil.isNotEmpty(questionnaireQuestions)) {
+            questionnaireQuestions.stream().forEach(questionnaireQuestionBo -> {
+                //新增问题
+                questionnaireQuestionBo.setQuestionnaireId(bo.getId());
+                QuestionnaireQuestion questionnaireQuestion = BeanUtil.copyProperties(questionnaireQuestionBo, QuestionnaireQuestion.class);
+                questionnaireQuestionMapper.insert(questionnaireQuestion);
+                List<QuestionnaireQuestionItemBo> questionnaireQuestionItems = questionnaireQuestionBo.getQuestionnaireQuestionItems();
+                if (CollUtil.isNotEmpty(questionnaireQuestionItems)) {
+                    questionnaireQuestionItems.stream().forEach(questionnaireQuestionItemBo -> {
+                        //新增问题项
+                        questionnaireQuestionItemBo.setQuestionId(questionnaireQuestion.getId());
+                        QuestionnaireQuestionItem questionnaireQuestionItem = BeanUtil.copyProperties(questionnaireQuestionItemBo, QuestionnaireQuestionItem.class);
+                        questionnaireQuestionItemMapper.insert(questionnaireQuestionItem);
+                    });
+                }
+            });
+
+        }
+    }
+
+    /**
+     * 更新前的数据校验
+     */
+    private void validEntityBeforeUpdate(QuestionnaireBo bo) {
+        List<QuestionnaireQuestionBo> questionnaireQuestions = bo.getQuestionnaireQuestions();
+        if (CollUtil.isNotEmpty(questionnaireQuestions)) {
+            //删除问题
+            questionnaireQuestionMapper.delete(new LambdaUpdateWrapper<QuestionnaireQuestion>().eq(QuestionnaireQuestion::getQuestionnaireId, bo.getId()));
+            questionnaireQuestions.stream().forEach(questionnaireQuestionBo -> {
+                //新增问题
+                questionnaireQuestionBo.setQuestionnaireId(bo.getId());
+                QuestionnaireQuestion questionnaireQuestion = BeanUtil.copyProperties(questionnaireQuestionBo, QuestionnaireQuestion.class);
+                questionnaireQuestionMapper.insert(questionnaireQuestion);
+                List<QuestionnaireQuestionItemBo> questionnaireQuestionItems = questionnaireQuestionBo.getQuestionnaireQuestionItems();
+                if (CollUtil.isNotEmpty(questionnaireQuestionItems)) {
+                    //删除问题项
+                    questionnaireQuestionItemMapper.delete(new LambdaUpdateWrapper<QuestionnaireQuestionItem>().eq(QuestionnaireQuestionItem::getQuestionId, questionnaireQuestion.getId()));
+                    questionnaireQuestionItems.stream().forEach(questionnaireQuestionItemBo -> {
+                        //新增问题项
+                        questionnaireQuestionItemBo.setQuestionId(questionnaireQuestion.getId());
+                        QuestionnaireQuestionItem questionnaireQuestionItem = BeanUtil.copyProperties(questionnaireQuestionItemBo, QuestionnaireQuestionItem.class);
+                        questionnaireQuestionItemMapper.insert(questionnaireQuestionItem);
+                    });
+                }
+            });
+
+        }
+    }
+
+    /**
+     * 校验并批量删除调查问卷信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        boolean flag = baseMapper.deleteByIds(ids) > 0;
+        if(flag){
+            ids.stream().forEach(id -> {
+                //查询问题
+                List<QuestionnaireQuestion> questionnaireQuestionList = questionnaireQuestionMapper.selectList(new LambdaUpdateWrapper<QuestionnaireQuestion>().eq(QuestionnaireQuestion::getQuestionnaireId, id));
+                //查询问题项
+                if (CollUtil.isNotEmpty(questionnaireQuestionList)) {
+                    questionnaireQuestionList.stream().forEach(questionnaireQuestion -> {
+                        boolean falg = questionnaireQuestionItemMapper.exists(new LambdaUpdateWrapper<QuestionnaireQuestionItem>().eq(QuestionnaireQuestionItem::getQuestionId, questionnaireQuestion.getId()));
+                        if (falg) {
+                            questionnaireQuestionItemMapper.delete(new LambdaUpdateWrapper<QuestionnaireQuestionItem>().eq(QuestionnaireQuestionItem::getQuestionId, questionnaireQuestion.getId()));
+                        }
+                    });
+                }
+            });
+        }
+
+        return flag;
+    }
+}
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml
index e69de29b..310420a7 100644
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.property.mapper.QuestionnaireMapper">
+
+</mapper>
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml
index e69de29b..3f550081 100644
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.property.mapper.QuestionnaireQuestionItemMapper">
+
+</mapper>
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml
index e69de29b..296bf895 100644
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.property.mapper.QuestionnaireQuestionMapper">
+
+</mapper>