Merge pull request '修改预约模块构建报错' (#29) from sjy-one into master

Reviewed-on: #29

yudao-admin-vue3/src/views/subscribe/organization/OrganizationForm.vue

@@ -0,0 +1,137 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="机构名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入机构名称" />
+      </el-form-item>
+      <el-form-item label="机构电话" prop="phone">
+        <el-input v-model="formData.phone" placeholder="请输入机构电话" />
+      </el-form-item>
+      <el-form-item label="机构邮箱" prop="email">
+        <el-input v-model="formData.email" placeholder="请输入机构邮箱" />
+      </el-form-item>
+      <el-form-item label="机构图片" prop="picture">
+        <UploadImg v-model="formData.picture" />
+      </el-form-item>
+      <el-form-item label="机构地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入机构地址" />
+      </el-form-item>
+	   <el-form-item label="状态" prop="status" >
+        <el-select v-model="formData.status" placeholder="请选择状态" >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ORGANIZATION_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="机构简介" prop="depict">
+        <Editor v-model="formData.depict" height="300px" />
+      </el-form-item>
+     
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
+
+/** 机构 表单 */
+defineOptions({ name: 'OrganizationForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  phone: undefined,
+  email: undefined,
+  picture: undefined,
+  address: undefined,
+  depict: undefined,
+  status: undefined,
+})
+const formRules = reactive({
+	name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+	phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
+	email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
+	picturre: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
+	address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+	depict: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await OrganizationApi.getOrganization(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as OrganizationVO
+    if (formType.value === 'create') {
+      await OrganizationApi.createOrganization(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await OrganizationApi.updateOrganization(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    phone: undefined,
+    email: undefined,
+    picture: undefined,
+    address: undefined,
+    depict: undefined,
+    status: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

yudao-admin-vue3/src/views/subscribe/organization/index.vue

@@ -0,0 +1,264 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="机构名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入机构名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="机构电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入机构电话"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="机构邮箱" prop="email">
+        <el-input
+          v-model="queryParams.email"
+          placeholder="请输入机构邮箱"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="机构地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入机构地址"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ORGANIZATION_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['subscribe:organization:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['subscribe:organization:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="机构名称" align="center" prop="name" />
+      <el-table-column label="机构电话" align="center" prop="phone"/>
+      <el-table-column label="机构邮箱" align="center" prop="email" />
+     <el-table-column label="机构图片" align="center" prop="picture">
+		  <template #default="{ row }">
+		    <div class="flex">
+		      <el-image
+		        fit="cover"
+		        :src="row.picture"
+		        class="flex-none w-50px h-50px"
+		        @click="imagePreview(row.picture)"
+		      />
+		    </div>
+		  </template>
+	  </el-table-column>
+      <el-table-column label="机构地址" align="center" prop="address" />
+      <el-table-column label="机构简介" align="center" prop="depict" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ORGANIZATION_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['subscribe:organization:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['subscribe:organization:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination	
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <OrganizationForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
+import OrganizationForm from './OrganizationForm.vue'
+import {createImageViewer} from "@/components/ImageViewer";
+
+/** 机构 列表 */
+defineOptions({ name: 'Organization' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<OrganizationVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  phone: undefined,
+  email: undefined,
+  picture: undefined,
+  address: undefined,
+  depict: undefined,
+  status: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await OrganizationApi.getOrganizationPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    urlList: [imgUrl]
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await OrganizationApi.deleteOrganization(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OrganizationApi.exportOrganization(queryParams)
+    download.excel(data, '机构.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

yudao-admin-vue3/src/views/subscribe/staff/index.vue

@@ -0,0 +1,376 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >	
+      <el-form-item label="所属机构" prop="organizationId">
+		<el-select
+		  v-model="queryParams.organizationId"
+		  placeholder="请选择机构"
+		  clearable
+		  class="!w-240px"
+		>
+		  <el-option
+		    v-for="organizationNameOptions in option"
+		    :key="organizationNameOptions.id"
+		    :label="organizationNameOptions.name"
+		    :value="organizationNameOptions.id"
+		  />
+		</el-select>
+      </el-form-item>
+      <el-form-item label="编号" prop="serialNumber">
+        <el-input
+          v-model="queryParams.serialNumber"
+          placeholder="请输入编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="请选择性别"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.STALL_SEX)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+     <!-- <el-form-item label="服务时间段" prop="serviceTime">
+        <el-date-picker
+          v-model="queryParams.serviceTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="服务范围" prop="serviceScope">
+        <el-input
+          v-model="queryParams.serviceScope"
+          placeholder="请输入服务范围"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="约满标记" prop="sign">
+        <el-select
+          v-model="queryParams.sign"
+          placeholder="请选择约满标记"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_FULL)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['subscribe:staff:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['subscribe:staff:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  
+
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="所属机构" align="center" prop="organizationName" />
+      <el-table-column label="编号" align="center" prop="serialNumber" />
+      <el-table-column label="类型" align="center" prop="type" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STAFF_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="性别" align="center" prop="sex">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STALL_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="照片" align="center" prop="photo">
+		  <template #default="{ row }">
+		  		    <div class="flex">
+		  		      <el-image
+		  		        fit="cover"
+		  		        :src="row.photo"
+		  		        class="flex-none w-50px h-50px"
+		  		        @click="imagePreview(row.photo)"
+		  		      />
+		  		    </div>
+		  </template>
+	  </el-table-column>
+      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="服务时间段" align="center" prop="serviceTimeArray" width="200" />
+      <el-table-column label="服务范围" align="center" prop="serviceScope" />
+      <el-table-column label="约满标记" align="center" prop="sign" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STAFF_FULL" :value="scope.row.sign" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.STAFF_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="介绍" align="center" prop="content" >
+		  <template #default="scope">
+		          <div v-html="scope.row.content"></div>
+		        </template>
+	  </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" fixed="right" width="110">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['subscribe:staff:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['subscribe:staff:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StaffForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { StaffApi, StaffVO } from '@/api/subscribe/staff'
+import StaffForm from './StaffForm.vue'
+import {createImageViewer} from "@/components/ImageViewer";
+import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
+
+/** 预约人员 列表 */
+defineOptions({ name: 'Staff' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StaffVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const option = ref<OrganizationVO[]>([]);
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  organizationId: undefined,
+  serialNumber: undefined,
+  type: undefined,
+  name: undefined,
+  sex: undefined,
+  photo: undefined,
+  phone: undefined,
+  serviceTime: undefined,
+  serviceScope: undefined,
+  sign: undefined,
+  status: undefined,
+  content: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StaffApi.getStaffPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+//初始化机构名称下拉框
+const getOrganization = async () => {
+  loading.value = true
+  try {
+    option.value = await OrganizationApi.getOrganizations()
+  } finally {
+    loading.value = false
+  }
+}
+
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+const imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    urlList: [imgUrl]
+  })
+}
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StaffApi.deleteStaff(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StaffApi.exportStaff(queryParams)
+    download.excel(data, '预约人员.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+  getOrganization()
+})
+</script>

yudao-admin-vue3/src/views/subscribe/subscribemanage/ManageForm.vue

@@ -0,0 +1,174 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="用户id" prop="userId">
+        <el-input v-model="formData.userId" placeholder="请输入用户id" />
+      </el-form-item>
+      <el-form-item label="预约类型" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择预约类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+	  <el-form-item label="所属机构" prop="organizationId">
+	  	<el-select v-model="formData.organizationId" placeholder="请选择机构" clearable class="!w-240px">
+	  		<el-option v-for="organizationNameOptions in option" :key="organizationNameOptions.id"
+	  			:label="organizationNameOptions.name" :value="organizationNameOptions.id" />
+	  	</el-select>
+	  </el-form-item>
+      <el-form-item label="预约人员id" prop="staffId">
+        <el-input v-model="formData.staffId" placeholder="请输入预约人员id" />
+      </el-form-item>
+      <el-form-item label="预约时间" prop="subscribeTime">
+        <el-date-picker
+          v-model="formData.subscribeTime"
+          type="date"
+          value-format="x"
+          placeholder="选择预约时间"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="预约状态" prop="subscribeStatus">
+        <el-radio-group v-model="formData.subscribeStatus">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item> -->
+	  <el-form-item label="预约状态" prop="subscribeStatus">
+	    <el-select v-model="formData.subscribeStatus" placeholder="请选择预约状态">
+	      <el-option
+	        v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_STATUS)"
+	        :key="dict.value"
+	        :label="dict.label"
+	        :value="dict.value"
+	      />
+	    </el-select>
+	  </el-form-item>
+      <el-form-item label="审核状态" prop="checkStatus">
+        <el-select v-model="formData.checkStatus" placeholder="请选择审核状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { ManageApi, ManageVO } from '@/api/subscribe/subscribemanage'
+import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
+
+/** 预约 表单 */
+defineOptions({ name: 'ManageForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const option = ref<OrganizationVO[]>([]);
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  type: undefined,
+  staffId: undefined,
+  subscribeTime: undefined,
+  subscribeStatus: undefined,
+  checkStatus: undefined,
+})
+const formRules = reactive({
+	userId: [{ required: true, message: '用户不能为空', trigger: 'blur' }],
+	type: [{ required: true, message: '预约类型不能为空', trigger: 'blur' }],
+	staffId: [{ required: true, message: '预约人员不能为空', trigger: 'blur' }],
+	subscribeTime: [{ required: true, message: '预约时间不能为空', trigger: 'blur' }],
+	subscribeStatus: [{ required: true, message: '预约状态不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+//初始化机构名称下拉框
+	const getOrganizations = async () => {
+		try {
+			option.value = await OrganizationApi.getOrganizations()
+		} finally {
+
+		}
+	}
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ManageApi.getManage(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ManageVO
+    if (formType.value === 'create') {
+      await ManageApi.createManage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ManageApi.updateManage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 初始化 **/
+	onMounted(() => {
+		getOrganizations()
+	})
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    userId: undefined,
+    type: undefined,
+    staffId: undefined,
+    subscribeTime: undefined,
+    subscribeStatus: undefined,
+    checkStatus: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

yudao-admin-vue3/src/views/subscribe/subscribemanage/index.vue

@@ -0,0 +1,278 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <!-- <el-form-item label="用户" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户"
+          clearable
+          @keyup.enter="handleQuery"	
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="预约类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择预约类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="预约人员" prop="staffName">
+        <el-input
+          v-model="queryParams.staffName"
+          placeholder="请输入预约人员"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="预约时间" prop="subscribeTime">
+        <el-date-picker
+          v-model="queryParams.subscribeTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="预约状态" prop="subscribeStatus">
+        <el-select
+          v-model="queryParams.subscribeStatus"
+          placeholder="请选择预约状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="checkStatus">
+        <el-select
+          v-model="queryParams.checkStatus"
+          placeholder="请选择审核状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_CHECK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['subscribe:manage:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['subscribe:manage:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="用户" align="center" prop="userId" />
+      <el-table-column label="预约类型" align="center" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SUBSCRIBE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="预约人员" align="center" prop="staffId" />
+      <el-table-column
+        label="预约时间"
+        align="center"
+        prop="subscribeTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="预约状态" align="center" prop="subscribeStatus" />
+      <el-table-column label="审核状态" align="center" prop="checkStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SUBSCRIBE_CHECK_STATUS" :value="scope.row.checkStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['subscribe:manage:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['subscribe:manage:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ManageForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ManageApi, ManageVO } from '@/api/subscribe/subscribemanage'
+import ManageForm from './ManageForm.vue'
+
+/** 预约 列表 */
+defineOptions({ name: 'SubscribeManage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ManageVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: undefined,
+  type: undefined,
+  staffId: undefined,
+  staffName: undefined,
+  subscribeTime: [],
+  subscribeStatus: undefined,
+  checkStatus: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ManageApi.getManagePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ManageApi.deleteManage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ManageApi.exportManage(queryParams)
+    download.excel(data, '预约.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

yudao-module-subscribe/yudao-module-subscribe-api/src/main/java/cn/iocoder/yudao/module/subscribe/enums/ErrorCodeConstants.java

@@ -4,6 +4,10 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 
 public interface ErrorCodeConstants {
 
+    ErrorCode MANAGE_NOT_EXISTS = new ErrorCode(11111, "预约不存在");
+    ErrorCode STAFF_NOT_EXISTS = new ErrorCode(22222, "预约人员不存在");
+    ErrorCode ORGANIZATION_NOT_EXISTS = new ErrorCode(33333, "机构不存在");
+
     ErrorCode LITEMALL_TECHNICIAN_NOT_EXISTS = new ErrorCode(111, "人员管理不存在");
 
     ErrorCode LITEMALL_BRAND_NOT_EXISTS = new ErrorCode(222, "门店管理不存在");

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/organization/OrganizationController.java

@@ -1,36 +1,32 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.organization;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationPageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationRespVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationDO;
-import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationOptions;
 import cn.iocoder.yudao.module.srbscribe.service.organization.OrganizationService;
-import org.springframework.web.bind.annotation.*;
-import javax.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 io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
 
 @Tag(name = "管理后台 - 机构")
 @RestController

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/organization/vo/OrganizationPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/organization/vo/OrganizationRespVO.java

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.organization.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 com.alibaba.excel.annotation.*;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 机构 Response VO")
 @Data

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/organization/vo/OrganizationSaveReqVO.java

@@ -1,9 +1,7 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 机构新增/修改 Request VO")
 @Data

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/staff/StaffController.java

@@ -1,34 +1,32 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.staff;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationRespVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffPageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffRespVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffSaveReqVO;
-import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationDO;
-import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationOptions;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff.StaffDO;
 import cn.iocoder.yudao.module.srbscribe.service.organization.OrganizationService;
 import cn.iocoder.yudao.module.srbscribe.service.staff.StaffService;
-import org.springframework.web.bind.annotation.*;
-import javax.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 javax.validation.*;
-import javax.servlet.http.*;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 
 @Tag(name = "管理后台 - 预约人员")

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/staff/vo/ServiceTimeVO.java

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo;
+
+import lombok.Data;
+
+@Data
+public class ServiceTimeVO {
+    private String start;
+    private String end;
+}

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/staff/vo/StaffPageReqVO.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 预约人员分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StaffPageReqVO extends PageParam {
+
+    @Schema(description = "机构id", example = "26075")
+    private Long organizationId;
+
+    @Schema(description = "编号")
+    private String serialNumber;
+
+    @Schema(description = "类型", example = "1")
+    private Integer type;
+
+    @Schema(description = "名称", example = "张三")
+    private String name;
+
+    @Schema(description = "性别")
+    private Integer sex;
+
+    @Schema(description = "照片")
+    private String photo;
+
+    @Schema(description = "手机号")
+    private String phone;
+
+    @Schema(description = "服务时间段")
+    private String serviceTime;
+
+//    @Schema(description = "服务开始时间")
+//    private String serviceStartTime;
+
+
+
+    @Schema(description = "服务范围")
+    private String serviceScope;
+
+    @Schema(description = "约满标记")
+    private Integer sign;
+
+    @Schema(description = "状态", example = "2")
+    private Integer status;
+
+    @Schema(description = "介绍")
+    private String content;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/staff/vo/StaffRespVO.java

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.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 com.alibaba.excel.annotation.*;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 预约人员 Response VO")
 @Data

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/staff/vo/StaffSaveReqVO.java

@@ -1,9 +1,7 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 预约人员新增/修改 Request VO")
 @Data

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/subscribemanage/SubscribeManageController.java

@@ -1,35 +1,32 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManagePageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManageRespVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManageSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.subscribemanage.SubscribeManageDO;
 import cn.iocoder.yudao.module.srbscribe.service.subscribemanage.SubscribeManageService;
-import org.springframework.web.bind.annotation.*;
-import javax.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 io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
 
 @Tag(name = "管理后台 - 预约")
 @RestController

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/subscribemanage/vo/SubscribeManagePageReqVO.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 预约分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class SubscribeManagePageReqVO extends PageParam {
+
+    @Schema(description = "用户id", example = "20637")
+    private Long userId;
+
+    @Schema(description = "预约类型", example = "2")
+    private Integer type;
+
+    @Schema(description = "预约人员id", example = "23520")
+    private Long staffId;
+
+    @Schema(description = "预约时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] subscribeTime;
+
+    @Schema(description = "预约状态", example = "1")
+    private String subscribeStatus;
+
+    @Schema(description = "审核状态", example = "1")
+    private Integer checkStatus;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    private String staffName;
+
+}

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/subscribemanage/vo/SubscribeManageRespVO.java

@@ -1,14 +1,13 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 预约 Response VO")
 @Data

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/subscribemanage/vo/SubscribeManageSaveReqVO.java

@@ -1,10 +1,8 @@
 package cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 预约新增/修改 Request VO")

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/dal/dataobject/organization/OrganizationDO.java

@@ -1,11 +1,10 @@
 package cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 机构 DO

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/dal/dataobject/staff/StaffDO.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 预约人员 DO
+ *
+ * @author 管理员
+ */
+@TableName("subscribe_staff")
+@KeySequence("subscribe_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaffDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 机构id
+     */
+    private Long organizationId;
+    /**
+     * 编号
+     */
+    private String serialNumber;
+    /**
+     * 类型
+     *
+     * 枚举 {@link TODO staff_type 对应的类}
+     */
+    private Integer type;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO stall_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 照片
+     */
+    private String photo;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 服务时间段
+     */
+    private String serviceTime;
+    /**
+     * 服务范围
+     */
+    private String serviceScope;
+    /**
+     * 约满标记
+     *
+     * 枚举 {@link TODO staff_full 对应的类}
+     */
+    private Integer sign;
+    /**
+     * 状态
+     *
+     * 枚举 {@link TODO staff_status 对应的类}
+     */
+    private Integer status;
+    /**
+     * 介绍
+     */
+    private String content;
+
+    //机构名称
+    @TableField(exist = false)
+    private String organizationName;
+
+    @TableField(exist = false)
+    private String serviceTimeArray ;
+
+}

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/dal/dataobject/subscribemanage/SubscribeManageDO.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.module.srbscribe.dal.dataobject.subscribemanage;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
 
 /**
  * 预约 DO

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/dal/mysql/organization/OrganizationMapper.java

@@ -1,7 +1,5 @@
 package cn.iocoder.yudao.module.srbscribe.dal.mysql.organization;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/organization/OrganizationService.java

@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.Organi
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationDO;
 
-import javax.validation.*;
+import javax.validation.Valid;
 import java.util.List;
 
 /**

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/organization/OrganizationServiceImpl.java

@@ -1,17 +1,16 @@
 package cn.iocoder.yudao.module.srbscribe.service.organization;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationPageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.organization.vo.OrganizationSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationDO;
 import cn.iocoder.yudao.module.srbscribe.dal.mysql.organization.OrganizationMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
+import javax.annotation.Resource;
 import java.util.List;
-
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.subscribe.enums.ErrorCodeConstants.*;
 

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/staff/StaffService.java

@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffPageReqV
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff.StaffDO;
 
-import javax.validation.*;
+import javax.validation.Valid;
 
 /**
  * 预约人员 Service 接口

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/staff/StaffServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.srbscribe.service.staff;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.ServiceTimeVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffPageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffSaveReqVO;
@@ -9,15 +10,12 @@ import cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff.StaffDO;
 import cn.iocoder.yudao.module.srbscribe.dal.mysql.organization.OrganizationMapper;
 import cn.iocoder.yudao.module.srbscribe.dal.mysql.staff.StaffMapper;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
+import javax.annotation.Resource;
 import java.util.List;
-
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.subscribe.enums.ErrorCodeConstants.*;
 

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/subscribemanage/SubscribeManageService.java

@@ -5,8 +5,7 @@ import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.Sub
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManageSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.subscribemanage.SubscribeManageDO;
 
-import java.util.*;
-import javax.validation.*;
+import javax.validation.Valid;
 
 
 /**

yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/subscribemanage/SubscribeManageServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.srbscribe.service.subscribemanage;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManagePageReqVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo.SubscribeManageSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff.StaffDO;
@@ -8,9 +9,9 @@ import cn.iocoder.yudao.module.srbscribe.dal.dataobject.subscribemanage.Subscrib
 import cn.iocoder.yudao.module.srbscribe.dal.mysql.staff.StaffMapper;
 import cn.iocoder.yudao.module.srbscribe.dal.mysql.subscribemanage.SubscribeManageMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import javax.annotation.Resource;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.subscribe.enums.ErrorCodeConstants.*;