Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts

@@ -43,6 +43,7 @@ export interface ArrangementVO {
   userGroupList?: any[];
   attendanceGroup?: any;
   dateType?: number;
+  areaList: any[]; //区域
 }
 
 export interface ArrangementForm extends BaseEntity {

apps/web-antd/src/api/property/customerService/questionnaire/question/model.d.ts

@@ -1,6 +1,6 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type {PageQuery, BaseEntity} from '#/api/common';
 import type {
-  QuestionItemForm
+  QuestionItemForm, QuestionItemVO
 } from "#/api/property/customerService/questionnaire/questionItem/model";
 
 export interface QuestionVO {
@@ -39,6 +39,19 @@ export interface QuestionVO {
    */
   sort: number;
 
+  /**
+   * 问题选项
+   */
+  questionnaireQuestionItemVos: QuestionItemVO[];
+
+  options: string[];
+
+  answer: string;
+
+  rate:number;
+
+  checked:string[];
+
 }
 
 export interface QuestionForm extends BaseEntity {
@@ -80,17 +93,17 @@ export interface QuestionForm extends BaseEntity {
   /**
    * 选项
    */
-  questionnaireQuestionItems:QuestionItemForm[]
+  questionnaireQuestionItems: QuestionItemForm[]
 
   /**
    * 评分预览
    */
-  rate?:number;
+  rate?: number;
 
   /**
    * 时间预览
    */
-  dateTime?:string;
+  dateTime?: string;
 
 }
 
@@ -126,7 +139,7 @@ export interface QuestionQuery extends PageQuery {
   sort?: number;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }

apps/web-antd/src/api/property/customerService/questionnaire/questionnaire/model.d.ts

@@ -1,5 +1,8 @@
 import type { PageQuery, BaseEntity } from '#/api/common';
-import type {QuestionForm} from "#/api/property/customerService/questionnaire/question/model";
+import type {
+  QuestionForm,
+  QuestionVO
+} from "#/api/property/customerService/questionnaire/question/model";
 
 export interface QuestionnaireVO {
   /**
@@ -36,7 +39,10 @@ export interface QuestionnaireVO {
    * 状态(1草稿2已发布3未发布)
    */
   status: string;
-
+  /**
+   * 问题
+   */
+  questionnaireQuestionVos:QuestionVO[];
 }
 
 export interface QuestionnaireForm extends BaseEntity {