feat: 完善数据库表命名规范，新增后勤管理和系统公共模块前缀
📋 主要变更： - ✅ 补充完整的7个业务模块表命名规范 - ✅ 新增后勤管理模块：hq_ 前缀 - ✅ 明确系统公共模块：common_ 前缀 - ✅ 提供完整的命名示例和实体类映射规则 - ✅ 更新变更记录文档 🎯 覆盖模块： - 后勤管理(hq_)、人事管理(rs_)、财务管理(cw_) - 学工管理(xg_)、招生就业(zsjy_)、安全保卫(aqbw_) - 系统公共(common_) 📚 文件变更： - .cursor/cursorrules-backend.md - 数据库表命名规范 - docs/变更管理/code-adjust-record-2025-01-23-wuzilong.md - 变更记录 - 各业务模块工程文件和前端结构文件 Co-authored-by: Cursor AI <cursor@cursor.sh>
This commit is contained in:
zlwuandCursor AI committed
1 parent
00297e714b
commit
90b13a6e0c
193 files changed
+2726
-409
No files matched your search
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqHallInfoVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo;
|
||||
import org.dromara.zhxy.hq.service.IHqHallInfoService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 报告厅信息
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/hallInfo")
|
||||
public class HqHallInfoController extends BaseController {
|
||||
|
||||
private final IHqHallInfoService hqHallInfoService;
|
||||
|
||||
/**
|
||||
* 查询报告厅信息列表
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqHallInfoVo> list(HqHallInfoBo bo, PageQuery pageQuery) {
|
||||
return hqHallInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出报告厅信息列表
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:export")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqHallInfoBo bo, HttpServletResponse response) {
|
||||
List<HqHallInfoVo> list = hqHallInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "报告厅信息", HqHallInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报告厅信息详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqHallInfoService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报告厅信息
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:add")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqHallInfoBo bo) {
|
||||
return toAjax(hqHallInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报告厅信息
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:edit")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqHallInfoBo bo) {
|
||||
return toAjax(hqHallInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报告厅信息
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:hallInfo:remove")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqHallInfoService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-115
@@ -1,115 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqHallReservationVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo;
|
||||
import org.dromara.zhxy.hq.service.IHqHallReservationService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 报告厅预约
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/hallReservation")
|
||||
public class HqHallReservationController extends BaseController {
|
||||
|
||||
private final IHqHallReservationService hqHallReservationService;
|
||||
|
||||
/**
|
||||
* 查询报告厅预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqHallReservationVo> list(HqHallReservationBo bo, PageQuery pageQuery) {
|
||||
return hqHallReservationService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出报告厅预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:export")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqHallReservationBo bo, HttpServletResponse response) {
|
||||
List<HqHallReservationVo> list = hqHallReservationService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "报告厅预约", HqHallReservationVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报告厅预约详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqHallReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqHallReservationService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报告厅预约
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:add")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqHallReservationBo bo) {
|
||||
return toAjax(hqHallReservationService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报告厅预约
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:edit")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqHallReservationBo bo) {
|
||||
return toAjax(hqHallReservationService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报告厅预约
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:remove")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(hqHallReservationService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核报告厅预约（批准/拒绝）
|
||||
*/
|
||||
@SaCheckPermission("hq:hallReservation:audit")
|
||||
@Log(title = "报告厅预约审核", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/audit")
|
||||
public R<Void> audit(@RequestBody HqHallReservationAuditBo auditBo) {
|
||||
return toAjax(hqHallReservationService.auditByIds(auditBo));
|
||||
}
|
||||
}
|
||||
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatCategoryService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 题目分类
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satCategory")
|
||||
public class HqSatCategoryController extends BaseController {
|
||||
|
||||
private final IHqSatCategoryService hqSatCategoryService;
|
||||
|
||||
/**
|
||||
* 查询题目分类列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatCategoryVo> list(HqSatCategoryBo bo, PageQuery pageQuery) {
|
||||
return hqSatCategoryService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出题目分类列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:export")
|
||||
@Log(title = "题目分类", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatCategoryBo bo, HttpServletResponse response) {
|
||||
List<HqSatCategoryVo> list = hqSatCategoryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "题目分类", HqSatCategoryVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取题目分类详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatCategoryVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqSatCategoryService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增题目分类
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:add")
|
||||
@Log(title = "题目分类", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatCategoryBo bo) {
|
||||
return toAjax(hqSatCategoryService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改题目分类
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:edit")
|
||||
@Log(title = "题目分类", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatCategoryBo bo) {
|
||||
return toAjax(hqSatCategoryService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除题目分类
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:remove")
|
||||
@Log(title = "题目分类", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqSatCategoryService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatDetailVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatDetailService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 答题详情
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satDetail")
|
||||
public class HqSatDetailController extends BaseController {
|
||||
|
||||
private final IHqSatDetailService hqSatDetailService;
|
||||
|
||||
/**
|
||||
* 查询答题详情列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatDetailVo> list(HqSatDetailBo bo, PageQuery pageQuery) {
|
||||
return hqSatDetailService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出答题详情列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:export")
|
||||
@Log(title = "答题详情", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatDetailBo bo, HttpServletResponse response) {
|
||||
List<HqSatDetailVo> list = hqSatDetailService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "答题详情", HqSatDetailVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取答题详情详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqSatDetailService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增答题详情
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:add")
|
||||
@Log(title = "答题详情", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatDetailBo bo) {
|
||||
return toAjax(hqSatDetailService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改答题详情
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:edit")
|
||||
@Log(title = "答题详情", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatDetailBo bo) {
|
||||
return toAjax(hqSatDetailService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除答题详情
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:remove")
|
||||
@Log(title = "答题详情", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqSatDetailService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatOptionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatOptionService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 评分选项
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satOption")
|
||||
public class HqSatOptionController extends BaseController {
|
||||
|
||||
private final IHqSatOptionService hqSatOptionService;
|
||||
|
||||
/**
|
||||
* 查询评分选项列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatOptionVo> list(HqSatOptionBo bo, PageQuery pageQuery) {
|
||||
return hqSatOptionService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出评分选项列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:export")
|
||||
@Log(title = "评分选项", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatOptionBo bo, HttpServletResponse response) {
|
||||
List<HqSatOptionVo> list = hqSatOptionService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "评分选项", HqSatOptionVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取评分选项详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatOptionVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqSatOptionService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增评分选项
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:add")
|
||||
@Log(title = "评分选项", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatOptionBo bo) {
|
||||
return toAjax(hqSatOptionService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改评分选项
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:edit")
|
||||
@Log(title = "评分选项", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatOptionBo bo) {
|
||||
return toAjax(hqSatOptionService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除评分选项
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:remove")
|
||||
@Log(title = "评分选项", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqSatOptionService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-123
@@ -1,123 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatQuestionService;
|
||||
import org.dromara.zhxy.hq.service.IHqSatOptionService;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 题库
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satQuestion")
|
||||
public class HqSatQuestionController extends BaseController {
|
||||
|
||||
private final IHqSatQuestionService hqSatQuestionService;
|
||||
private final IHqSatOptionService hqSatOptionService;
|
||||
|
||||
/**
|
||||
* 查询题库列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatQuestionVo> list(HqSatQuestionBo bo, PageQuery pageQuery) {
|
||||
return hqSatQuestionService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出题库列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:export")
|
||||
@Log(title = "题库", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatQuestionBo bo, HttpServletResponse response) {
|
||||
List<HqSatQuestionVo> list = hqSatQuestionService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "题库", HqSatQuestionVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取题库详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatQuestionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqSatQuestionService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增题库
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:add")
|
||||
@Log(title = "题库", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatQuestionBo bo) {
|
||||
return toAjax(hqSatQuestionService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改题库
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:edit")
|
||||
@Log(title = "题库", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatQuestionBo bo) {
|
||||
return toAjax(hqSatQuestionService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除题库
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:remove")
|
||||
@Log(title = "题库", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(hqSatQuestionService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取题目的选项列表
|
||||
* 注：选项针对所有单选题和多选题通用，不区分具体题目
|
||||
*
|
||||
* @param questionId 题目ID（预留参数，当前不使用）
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:query")
|
||||
@GetMapping("/{questionId}/options")
|
||||
public R<List<HqSatOptionVo>> getQuestionOptions(@PathVariable Long questionId) {
|
||||
// 获取所有启用状态的选项
|
||||
HqSatOptionBo bo = new HqSatOptionBo();
|
||||
bo.setStatus("0"); // 启用状态
|
||||
List<HqSatOptionVo> options = hqSatOptionService.queryList(bo);
|
||||
return R.ok(options);
|
||||
}
|
||||
}
|
||||
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatRecordService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 答题记录
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satRecord")
|
||||
public class HqSatRecordController extends BaseController {
|
||||
|
||||
private final IHqSatRecordService hqSatRecordService;
|
||||
|
||||
/**
|
||||
* 查询答题记录列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatRecordVo> list(HqSatRecordBo bo, PageQuery pageQuery) {
|
||||
return hqSatRecordService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出答题记录列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:export")
|
||||
@Log(title = "答题记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatRecordBo bo, HttpServletResponse response) {
|
||||
List<HqSatRecordVo> list = hqSatRecordService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "答题记录", HqSatRecordVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取答题记录详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqSatRecordService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增答题记录
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:add")
|
||||
@Log(title = "答题记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatRecordBo bo) {
|
||||
return toAjax(hqSatRecordService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改答题记录
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:edit")
|
||||
@Log(title = "答题记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatRecordBo bo) {
|
||||
return toAjax(hqSatRecordService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除答题记录
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:remove")
|
||||
@Log(title = "答题记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqSatRecordService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-226
@@ -1,226 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatSurveyVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatSurveyService;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 问卷
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satSurvey")
|
||||
public class HqSatSurveyController extends BaseController {
|
||||
|
||||
private final IHqSatSurveyService hqSatSurveyService;
|
||||
|
||||
/**
|
||||
* 查询问卷列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatSurveyVo> list(HqSatSurveyBo bo, PageQuery pageQuery) {
|
||||
// 从params中获取权限过滤参数
|
||||
if (bo.getParams() != null) {
|
||||
// 处理目标群体IN查询
|
||||
if (bo.getParams().containsKey("targetGroupIn")) {
|
||||
Object targetGroupInObj = bo.getParams().get("targetGroupIn");
|
||||
if (targetGroupInObj instanceof List<?>) {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<String> targetGroups = (List<String>) targetGroupInObj;
|
||||
bo.setTargetGroupIn(targetGroups);
|
||||
}
|
||||
}
|
||||
|
||||
// 处理状态IN查询
|
||||
if (bo.getParams().containsKey("statusIn")) {
|
||||
Object statusInObj = bo.getParams().get("statusIn");
|
||||
if (statusInObj instanceof List<?>) {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<String> statuses = (List<String>) statusInObj;
|
||||
bo.setStatusIn(statuses);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return hqSatSurveyService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出问卷列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:export")
|
||||
@Log(title = "问卷", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatSurveyBo bo, HttpServletResponse response) {
|
||||
List<HqSatSurveyVo> list = hqSatSurveyService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "问卷", HqSatSurveyVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取问卷详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatSurveyVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqSatSurveyService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问卷
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:add")
|
||||
@Log(title = "问卷", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatSurveyBo bo) {
|
||||
return toAjax(hqSatSurveyService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改问卷
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:edit")
|
||||
@Log(title = "问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatSurveyBo bo) {
|
||||
return toAjax(hqSatSurveyService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除问卷
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:remove")
|
||||
@Log(title = "问卷", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(hqSatSurveyService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取问卷关联的题目列表
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
// @SaCheckPermission("hq:satSurvey:question")
|
||||
@GetMapping("/{surveyId}/questions")
|
||||
public R<List<HqSatSurveyQuestionVo>> getSurveyQuestions(
|
||||
@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
|
||||
return R.ok(hqSatSurveyService.getSurveyQuestions(surveyId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量更新问卷题目关联
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @param questions 题目列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:question")
|
||||
@Log(title = "问卷题目管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{surveyId}/questions")
|
||||
public R<Void> updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId,
|
||||
@RequestBody List<Object> questions) {
|
||||
return toAjax(hqSatSurveyService.updateSurveyQuestions(surveyId, questions));
|
||||
}
|
||||
|
||||
/**
|
||||
* 发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:publish")
|
||||
@Log(title = "发布问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{id}/publish")
|
||||
public R<Void> publishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
|
||||
return toAjax(hqSatSurveyService.publishSurvey(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:unpublish")
|
||||
@Log(title = "撤销发布问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{id}/unpublish")
|
||||
public R<Void> unpublishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
|
||||
return toAjax(hqSatSurveyService.unpublishSurvey(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交问卷答案
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
*/
|
||||
@Log(title = "提交问卷答案", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/answer/submit")
|
||||
public R<HqSatRecordVo> submitSurveyAnswer(@Validated @RequestBody HqSatAnswerSubmitBo submitBo) {
|
||||
return R.ok(hqSatSurveyService.submitSurveyAnswer(submitBo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存问卷答案草稿
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
*/
|
||||
@Log(title = "保存问卷答案草稿", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/answer/draft")
|
||||
public R<HqSatRecordVo> saveSurveyDraft(@Validated @RequestBody HqSatAnswerSubmitBo submitBo) {
|
||||
return R.ok(hqSatSurveyService.saveSurveyDraft(submitBo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查用户是否已答过问卷
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@GetMapping("/{surveyId}/answered")
|
||||
public R<Boolean> checkUserAnswered(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
|
||||
return R.ok(hqSatSurveyService.checkUserAnswered(surveyId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户问卷答题记录
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@GetMapping("/{surveyId}/answer")
|
||||
public R<HqSatRecordVo> getUserSurveyAnswer(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
|
||||
return R.ok(hqSatSurveyService.getUserSurveyAnswer(surveyId));
|
||||
}
|
||||
}
|
||||
-105
@@ -1,105 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo;
|
||||
import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 问卷题目关联
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/satSurveyQuestion")
|
||||
public class HqSatSurveyQuestionController extends BaseController {
|
||||
|
||||
private final IHqSatSurveyQuestionService hqSatSurveyQuestionService;
|
||||
|
||||
/**
|
||||
* 查询问卷题目关联列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatSurveyQuestionVo> list(HqSatSurveyQuestionBo bo, PageQuery pageQuery) {
|
||||
return hqSatSurveyQuestionService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出问卷题目关联列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:export")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatSurveyQuestionBo bo, HttpServletResponse response) {
|
||||
List<HqSatSurveyQuestionVo> list = hqSatSurveyQuestionService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "问卷题目关联", HqSatSurveyQuestionVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取问卷题目关联详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatSurveyQuestionVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(hqSatSurveyQuestionService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问卷题目关联
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:add")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody HqSatSurveyQuestionBo bo) {
|
||||
return toAjax(hqSatSurveyQuestionService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改问卷题目关联
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:edit")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HqSatSurveyQuestionBo bo) {
|
||||
return toAjax(hqSatSurveyQuestionService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除问卷题目关联
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:remove")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hqSatSurveyQuestionService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
-186
@@ -1,186 +0,0 @@
|
||||
package org.dromara.zhxy.hq.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
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.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairAttachmentService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报修附件Controller
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
@Slf4j
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/pm/attachment")
|
||||
public class PmRepairAttachmentController extends BaseController {
|
||||
|
||||
private final IPmRepairAttachmentService attachmentService;
|
||||
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<PmRepairAttachmentVo> list(PmRepairAttachmentBo bo, PageQuery pageQuery) {
|
||||
return attachmentService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据工单ID获取附件列表
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:list")
|
||||
@GetMapping("/order/{orderId}")
|
||||
public R<List<PmRepairAttachmentVo>> getByOrderId(@PathVariable("orderId") Long orderId) {
|
||||
List<PmRepairAttachmentVo> list = attachmentService.queryByOrderId(orderId);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报修附件详细信息
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<PmRepairAttachmentVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(attachmentService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报修附件
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:add")
|
||||
@Log(title = "报修附件", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody PmRepairAttachmentBo bo) {
|
||||
return toAjax(attachmentService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报修附件
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:edit")
|
||||
@Log(title = "报修附件", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PmRepairAttachmentBo bo) {
|
||||
return toAjax(attachmentService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报修附件
|
||||
* //
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:remove")
|
||||
@Log(title = "报修附件", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(attachmentService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传单个附件文件
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:upload")
|
||||
@Log(title = "上传报修附件", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/upload")
|
||||
public R<PmRepairAttachmentVo> uploadFile(
|
||||
@RequestParam("orderId") Long orderId,
|
||||
@RequestParam(value = "uploadStage", defaultValue = "1") String uploadStage,
|
||||
@RequestParam("file") MultipartFile file,
|
||||
@RequestParam(value = "description", required = false) String description) {
|
||||
|
||||
if (file.isEmpty()) {
|
||||
return R.fail("请选择要上传的文件");
|
||||
}
|
||||
|
||||
try {
|
||||
PmRepairAttachmentVo result = attachmentService.uploadFile(orderId, uploadStage, file, description);
|
||||
return R.ok(result);
|
||||
} catch (Exception e) {
|
||||
return R.fail("上传失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量上传附件文件
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:upload")
|
||||
@Log(title = "批量上传报修附件", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/upload/batch")
|
||||
public R<List<PmRepairAttachmentVo>> uploadFiles(
|
||||
@RequestParam("orderId") Long orderId,
|
||||
@RequestParam(value = "uploadStage", defaultValue = "1") String uploadStage,
|
||||
@RequestParam("files") MultipartFile[] files,
|
||||
@RequestParam(value = "descriptions", required = false) List<String> descriptions) {
|
||||
|
||||
if (files == null || files.length == 0) {
|
||||
return R.fail("请选择要上传的文件");
|
||||
}
|
||||
|
||||
try {
|
||||
List<PmRepairAttachmentVo> results = attachmentService.uploadFiles(orderId, uploadStage, files,
|
||||
descriptions);
|
||||
return R.ok(results);
|
||||
} catch (Exception e) {
|
||||
return R.fail("批量上传失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除附件文件（包括OSS文件和数据库记录）
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:remove")
|
||||
@Log(title = "删除报修附件文件", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/file/{id}")
|
||||
public R<Void> deleteAttachment(@PathVariable("id") Long id) {
|
||||
return toAjax(attachmentService.deleteAttachment(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下载附件文件
|
||||
*/
|
||||
// @SaCheckPermission("pm:attachment:download")
|
||||
@GetMapping("/download/{id}")
|
||||
public void downloadFile(@PathVariable("id") Long id, HttpServletResponse response) {
|
||||
PmRepairAttachmentVo attachment = attachmentService.queryById(id);
|
||||
if (attachment == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 设置响应头
|
||||
response.setContentType("application/octet-stream");
|
||||
response.setHeader("Content-Disposition", "attachment; filename=\"" + attachment.getFileName() + "\"");
|
||||
|
||||
// 这里需要根据具体的文件存储方式来实现下载逻辑
|
||||
// 如果使用OSS，可以直接重定向到OSS的URL
|
||||
response.sendRedirect(attachment.getFilePath());
|
||||
} catch (Exception e) {
|
||||
log.error("下载文件失败: {}", e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
-139
@@ -1,139 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.PmRepairCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairCategoryService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 维修类型Controller
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/pm/repairCategory")
|
||||
public class PmRepairCategoryController extends BaseController {
|
||||
|
||||
private final IPmRepairCategoryService repairCategoryService;
|
||||
|
||||
/**
|
||||
* 查询维修类型列表
|
||||
*/
|
||||
@SaCheckPermission("pm:category:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<PmRepairCategoryVo> list(PmRepairCategoryBo bo, PageQuery pageQuery) {
|
||||
return repairCategoryService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出维修类型列表
|
||||
*/
|
||||
@SaCheckPermission("pm:category:export")
|
||||
@Log(title = "维修类型", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PmRepairCategoryBo bo, HttpServletResponse response) {
|
||||
List<PmRepairCategoryVo> list = repairCategoryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "维修类型", PmRepairCategoryVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修类型详细信息
|
||||
*/
|
||||
@SaCheckPermission("pm:category:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<PmRepairCategoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(repairCategoryService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:add")
|
||||
@Log(title = "维修类型", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody PmRepairCategoryBo bo) {
|
||||
return toAjax(repairCategoryService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:edit")
|
||||
@Log(title = "维修类型", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PmRepairCategoryBo bo) {
|
||||
return toAjax(repairCategoryService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:remove")
|
||||
@Log(title = "维修类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(repairCategoryService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修类型树形结构
|
||||
*/
|
||||
@SaCheckPermission("pm:category:tree")
|
||||
@GetMapping("/tree")
|
||||
public R<List<PmRepairCategoryVo>> tree() {
|
||||
return R.ok(repairCategoryService.queryTree());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修类型下拉选项
|
||||
*/
|
||||
@SaCheckPermission("pm:category:options")
|
||||
@GetMapping("/options")
|
||||
public R<List<java.util.Map<String, Object>>> options() {
|
||||
List<PmRepairCategoryVo> list = repairCategoryService.queryTree();
|
||||
List<java.util.Map<String, Object>> options = buildCategoryOptions(list);
|
||||
return R.ok(options);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建维修类型下拉选项
|
||||
*/
|
||||
private List<java.util.Map<String, Object>> buildCategoryOptions(List<PmRepairCategoryVo> list) {
|
||||
List<java.util.Map<String, Object>> result = new java.util.ArrayList<>();
|
||||
for (PmRepairCategoryVo item : list) {
|
||||
java.util.Map<String, Object> option = new java.util.HashMap<>();
|
||||
option.put("value", item.getId());
|
||||
option.put("label", item.getCategoryName());
|
||||
result.add(option);
|
||||
|
||||
// 递归处理子分类
|
||||
if (item.getChildren() != null && !item.getChildren().isEmpty()) {
|
||||
result.addAll(buildCategoryOptions(item.getChildren()));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
-332
@@ -1,332 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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.zhxy.hq.domain.vo.PmRepairOrderVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairOrderService;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairAttachmentService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 报修工单Controller
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/hq/pm/repairOrder")
|
||||
public class PmRepairOrderController extends BaseController {
|
||||
|
||||
private final IPmRepairOrderService repairOrderService;
|
||||
private final IPmRepairAttachmentService attachmentService;
|
||||
|
||||
/**
|
||||
* 查询报修工单列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<PmRepairOrderVo> list(PmRepairOrderBo bo, PageQuery pageQuery) {
|
||||
TableDataInfo<PmRepairOrderVo> result = repairOrderService.queryPageList(bo, pageQuery);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出报修工单列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:export")
|
||||
@Log(title = "报修工单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PmRepairOrderBo bo, HttpServletResponse response) {
|
||||
List<PmRepairOrderVo> list = repairOrderService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "报修工单", PmRepairOrderVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报修工单详细信息
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<PmRepairOrderVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(repairOrderService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:add")
|
||||
@Log(title = "报修工单", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody PmRepairOrderBo bo) {
|
||||
boolean success = repairOrderService.insertByBo(bo);
|
||||
if (success) {
|
||||
// 返回创建的工单ID，供前端上传附件使用
|
||||
return R.ok(bo.getId());
|
||||
} else {
|
||||
return R.fail("新增报修工单失败");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:edit")
|
||||
@Log(title = "报修工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PmRepairOrderBo bo) {
|
||||
return toAjax(repairOrderService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:remove")
|
||||
@Log(title = "报修工单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(repairOrderService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 分派工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:assign")
|
||||
@Log(title = "分派工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/assign")
|
||||
public R<Void> assignOrder(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId,
|
||||
@NotNull(message = "维修员ID不能为空") @RequestParam Long assigneeId,
|
||||
@RequestParam(required = false) String assignRemark) {
|
||||
return toAjax(repairOrderService.assignOrder(orderId, assigneeId, assignRemark));
|
||||
}
|
||||
|
||||
/**
|
||||
* 开始维修
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:start")
|
||||
@Log(title = "开始维修", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/start")
|
||||
public R<Void> startRepair(@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
return toAjax(repairOrderService.startRepair(orderId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 完成维修
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:finish")
|
||||
@Log(title = "完成维修", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/finish")
|
||||
public R<Void> finishRepair(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId,
|
||||
@RequestParam(required = false) String repairResult,
|
||||
@RequestParam(required = false) String usedMaterials) {
|
||||
return toAjax(repairOrderService.finishRepair(orderId, repairResult, usedMaterials));
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:cancel")
|
||||
@Log(title = "取消工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/cancel")
|
||||
public R<Void> cancelOrder(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId,
|
||||
@RequestParam(required = false) String cancelReason) {
|
||||
return toAjax(repairOrderService.cancelOrder(orderId, cancelReason));
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成工单编号
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:generateOrderNo")
|
||||
@GetMapping("/generateOrderNo")
|
||||
public R<String> generateOrderNo() {
|
||||
return R.ok(repairOrderService.generateOrderNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报修统计数据
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:statistics")
|
||||
@GetMapping("/statistics")
|
||||
public R<java.util.Map<String, Object>> statistics() {
|
||||
// 模拟统计数据，实际项目中应该从service获取真实统计
|
||||
java.util.Map<String, Object> stats = new java.util.HashMap<>();
|
||||
stats.put("totalOrders", 156);
|
||||
stats.put("pendingAssign", 23);
|
||||
stats.put("inProgress", 45);
|
||||
stats.put("completed", 88);
|
||||
stats.put("cancelled", 0);
|
||||
stats.put("avgProcessTime", 2.5);
|
||||
stats.put("avgEvaluationScore", 4.3);
|
||||
stats.put("monthlyNewOrders", 67);
|
||||
stats.put("monthlyCompletedOrders", 52);
|
||||
|
||||
// 状态分布
|
||||
java.util.List<java.util.Map<String, Object>> statusDistribution = new java.util.ArrayList<>();
|
||||
java.util.Map<String, Object> status1 = new java.util.HashMap<>();
|
||||
status1.put("status", "待分派");
|
||||
status1.put("count", 23);
|
||||
status1.put("percentage", 14.7);
|
||||
statusDistribution.add(status1);
|
||||
|
||||
java.util.Map<String, Object> status2 = new java.util.HashMap<>();
|
||||
status2.put("status", "进行中");
|
||||
status2.put("count", 45);
|
||||
status2.put("percentage", 28.8);
|
||||
statusDistribution.add(status2);
|
||||
|
||||
java.util.Map<String, Object> status3 = new java.util.HashMap<>();
|
||||
status3.put("status", "已完成");
|
||||
status3.put("count", 88);
|
||||
status3.put("percentage", 56.4);
|
||||
statusDistribution.add(status3);
|
||||
|
||||
stats.put("statusDistribution", statusDistribution);
|
||||
|
||||
// 类型分布
|
||||
java.util.List<java.util.Map<String, Object>> categoryDistribution = new java.util.ArrayList<>();
|
||||
java.util.Map<String, Object> cat1 = new java.util.HashMap<>();
|
||||
cat1.put("categoryName", "电路维修");
|
||||
cat1.put("count", 45);
|
||||
cat1.put("percentage", 28.8);
|
||||
categoryDistribution.add(cat1);
|
||||
|
||||
java.util.Map<String, Object> cat2 = new java.util.HashMap<>();
|
||||
cat2.put("categoryName", "水管维修");
|
||||
cat2.put("count", 38);
|
||||
cat2.put("percentage", 24.4);
|
||||
categoryDistribution.add(cat2);
|
||||
|
||||
stats.put("categoryDistribution", categoryDistribution);
|
||||
|
||||
// 紧急程度分布
|
||||
java.util.List<java.util.Map<String, Object>> priorityDistribution = new java.util.ArrayList<>();
|
||||
java.util.Map<String, Object> priority1 = new java.util.HashMap<>();
|
||||
priority1.put("priorityLevel", 1);
|
||||
priority1.put("count", 12);
|
||||
priority1.put("percentage", 7.7);
|
||||
priorityDistribution.add(priority1);
|
||||
|
||||
java.util.Map<String, Object> priority2 = new java.util.HashMap<>();
|
||||
priority2.put("priorityLevel", 2);
|
||||
priority2.put("count", 34);
|
||||
priority2.put("percentage", 21.8);
|
||||
priorityDistribution.add(priority2);
|
||||
|
||||
stats.put("priorityDistribution", priorityDistribution);
|
||||
|
||||
return R.ok(stats);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修人员选项
|
||||
* 返回拥有"维修人员"角色的用户列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:assign")
|
||||
@GetMapping("/maintenance-workers")
|
||||
public R<List<java.util.Map<String, Object>>> getMaintenanceWorkers() {
|
||||
return R.ok(repairOrderService.getMaintenanceWorkers());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工单进度列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:progress")
|
||||
@GetMapping("/{orderId}/progress")
|
||||
public R<List<java.util.Map<String, Object>>> getRepairProgress(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
List<java.util.Map<String, Object>> progressList = repairOrderService.getRepairProgress(orderId);
|
||||
return R.ok(progressList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新维修进度
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:updateProgress")
|
||||
@Log(title = "更新进度", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/progress")
|
||||
public R<Void> updateProgress(@RequestBody java.util.Map<String, Object> progressData) {
|
||||
Long orderId = Long.valueOf(progressData.get("orderId").toString());
|
||||
return toAjax(repairOrderService.updateProgress(orderId, progressData));
|
||||
}
|
||||
|
||||
/**
|
||||
* 完成工单（新的完成接口，支持详细信息）
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:complete")
|
||||
@Log(title = "完成工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/complete")
|
||||
public R<Void> completeOrder(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId,
|
||||
@RequestBody java.util.Map<String, Object> completeData) {
|
||||
String repairResult = (String) completeData.get("repairResult");
|
||||
String usedMaterials = (String) completeData.get("usedMaterials");
|
||||
String followSuggestions = (String) completeData.get("followSuggestions");
|
||||
|
||||
return toAjax(repairOrderService.completeOrder(orderId, repairResult, usedMaterials, followSuggestions));
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建服务评价
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:evaluate")
|
||||
@Log(title = "服务评价", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/evaluation")
|
||||
public R<Void> createEvaluation(@RequestBody java.util.Map<String, Object> evaluationData) {
|
||||
// 调用service方法保存服务评价
|
||||
boolean success = repairOrderService.createServiceEvaluation(evaluationData);
|
||||
return success ? R.ok("服务评价提交成功") : R.fail("服务评价提交失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工单的服务评价
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{orderId}/evaluation")
|
||||
public R<java.util.Map<String, Object>> getServiceEvaluation(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
// 从service获取真实评价数据
|
||||
java.util.Map<String, Object> evaluation = repairOrderService.getServiceEvaluation(orderId);
|
||||
return R.ok(evaluation);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工单附件列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{orderId}/attachments")
|
||||
public R<List<PmRepairAttachmentVo>> getRepairAttachments(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
List<PmRepairAttachmentVo> attachments = attachmentService.queryByOrderId(orderId);
|
||||
return R.ok(attachments);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.dromara.common.translation.annotation.Translation;
|
||||
import org.dromara.common.translation.constant.TransConstant;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 报告厅信息对象 hq_hall_info
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_hall_info")
|
||||
public class HqHallInfo extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 报告厅图片
|
||||
*/
|
||||
private String hallImage;
|
||||
|
||||
/**
|
||||
* 报告厅状态
|
||||
*/
|
||||
private String hallStatus;
|
||||
|
||||
/**
|
||||
* 报告厅描述
|
||||
*/
|
||||
private String hallDescription;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,97 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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;
|
||||
|
||||
/**
|
||||
* 报告厅预约对象 hq_hall_reservation
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_hall_reservation")
|
||||
public class HqHallReservation extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
private Long hallId;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 预约用途
|
||||
*/
|
||||
private String reservationPurpose;
|
||||
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
private Long applicantId;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
private String applicantName;
|
||||
|
||||
/**
|
||||
* 申请人电话
|
||||
*/
|
||||
private String applicantPhone;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 审核人id
|
||||
*/
|
||||
private Long auditBy;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
private String auditName;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
private String auditRemark;
|
||||
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 题目分类对象 hq_sat_category
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_category")
|
||||
public class HqSatCategory extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 分类编码
|
||||
*/
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 分类名称
|
||||
*/
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 分类描述
|
||||
*/
|
||||
private String categoryDesc;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 答题详情对象 hq_sat_detail
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_detail")
|
||||
public class HqSatDetail extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 答题记录ID
|
||||
*/
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 答案分数
|
||||
*/
|
||||
private Long answerScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 评分选项对象 hq_sat_option
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_option")
|
||||
public class HqSatOption extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 选项文本
|
||||
*/
|
||||
private String optionText;
|
||||
|
||||
/**
|
||||
* 选项分值
|
||||
*/
|
||||
private Long optionValue;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 题库对象 hq_sat_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_question")
|
||||
public class HqSatQuestion extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 题目标题
|
||||
*/
|
||||
private String questionTitle;
|
||||
|
||||
/**
|
||||
* 题目内容
|
||||
*/
|
||||
private String questionContent;
|
||||
|
||||
/**
|
||||
* 所属分类ID
|
||||
*/
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 题目类型
|
||||
*/
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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;
|
||||
|
||||
/**
|
||||
* 答题记录对象 hq_sat_record
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_record")
|
||||
public class HqSatRecord extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 答题用户ID
|
||||
*/
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户类型
|
||||
*/
|
||||
private String userType;
|
||||
|
||||
/**
|
||||
* 用户部门
|
||||
*/
|
||||
private String userDept;
|
||||
|
||||
/**
|
||||
* 提交时间
|
||||
*/
|
||||
private Date submitTime;
|
||||
|
||||
/**
|
||||
* 总分
|
||||
*/
|
||||
private Long totalScore;
|
||||
|
||||
/**
|
||||
* 平均分
|
||||
*/
|
||||
private Long avgScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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;
|
||||
|
||||
/**
|
||||
* 问卷对象 hq_sat_survey
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_survey")
|
||||
public class HqSatSurvey extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷编号
|
||||
*/
|
||||
private String surveyCode;
|
||||
|
||||
/**
|
||||
* 问卷标题
|
||||
*/
|
||||
private String surveyTitle;
|
||||
|
||||
/**
|
||||
* 问卷描述
|
||||
*/
|
||||
private String surveyDesc;
|
||||
|
||||
/**
|
||||
* 填写说明
|
||||
*/
|
||||
private String surveyInstruction;
|
||||
|
||||
/**
|
||||
* 目标群体
|
||||
*/
|
||||
private String targetGroup;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 最大提交次数
|
||||
*/
|
||||
private Long maxSubmitTimes;
|
||||
|
||||
/**
|
||||
* 是否匿名
|
||||
*/
|
||||
private Long isAnonymous;
|
||||
|
||||
/**
|
||||
* 是否发布
|
||||
*/
|
||||
private Long isPublished;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 问卷题目关联对象 hq_sat_survey_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("hq_sat_survey_question")
|
||||
public class HqSatSurveyQuestion extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 题目顺序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 题目权重
|
||||
*/
|
||||
private Long weight;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
package org.dromara.zhxy.hq.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;
|
||||
|
||||
/**
|
||||
* 报修附件对象 pm_repair_attachment
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pm_repair_attachment")
|
||||
public class PmRepairAttachment extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报修工单ID，关联pm_repair_order.id
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 文件原始名称
|
||||
*/
|
||||
private String fileName;
|
||||
|
||||
/**
|
||||
* 文件存储路径
|
||||
*/
|
||||
private String filePath;
|
||||
|
||||
/**
|
||||
* 文件大小（字节）
|
||||
*/
|
||||
private Long fileSize;
|
||||
|
||||
/**
|
||||
* 文件类型：image-图片，video-视频
|
||||
*/
|
||||
private String fileType;
|
||||
|
||||
/**
|
||||
* 文件扩展名
|
||||
*/
|
||||
private String fileExtension;
|
||||
|
||||
/**
|
||||
* 文件MIME类型
|
||||
*/
|
||||
private String fileMimeType;
|
||||
|
||||
/**
|
||||
* 上传阶段：1-报修申请，2-维修过程，3-完成确认
|
||||
*/
|
||||
private String uploadStage;
|
||||
|
||||
/**
|
||||
* 上传人ID，关联sys_user.id
|
||||
*/
|
||||
private Long uploaderId;
|
||||
|
||||
/**
|
||||
* 上传人姓名
|
||||
*/
|
||||
private String uploaderName;
|
||||
|
||||
/**
|
||||
* 缩略图路径（图片文件）
|
||||
*/
|
||||
private String thumbnailPath;
|
||||
|
||||
/**
|
||||
* 时长（视频文件，秒）
|
||||
*/
|
||||
private Integer duration;
|
||||
|
||||
/**
|
||||
* 分辨率（如：1920x1080）
|
||||
*/
|
||||
private String resolution;
|
||||
|
||||
/**
|
||||
* 文件描述说明
|
||||
*/
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
private Integer sortOrder;
|
||||
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 维修类型对象 pm_repair_category
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pm_repair_category")
|
||||
public class PmRepairCategory extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 类型名称
|
||||
*/
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 类型描述
|
||||
*/
|
||||
private String categoryDescription;
|
||||
|
||||
/**
|
||||
* 父级ID，顶级为0
|
||||
*/
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 祖级列表（逗号分隔）
|
||||
*/
|
||||
private String ancestorIds;
|
||||
|
||||
/**
|
||||
* 层级深度（1-顶级，2-二级...）
|
||||
*/
|
||||
private Integer levelDepth;
|
||||
|
||||
/**
|
||||
* 子类数量
|
||||
*/
|
||||
private Integer childrenCount;
|
||||
|
||||
/**
|
||||
* 所需专业技能（逗号分隔）
|
||||
*/
|
||||
private String requiredSkills;
|
||||
|
||||
/**
|
||||
* 技能等级要求：1-初级，2-中级，3-高级
|
||||
*/
|
||||
private String skillLevel;
|
||||
|
||||
/**
|
||||
* 预估维修时长（分钟）
|
||||
*/
|
||||
private Integer estimatedDuration;
|
||||
|
||||
/**
|
||||
* 标准成本（元）
|
||||
*/
|
||||
private BigDecimal standardCost;
|
||||
|
||||
/**
|
||||
* 分类图标URL
|
||||
*/
|
||||
private String iconUrl;
|
||||
|
||||
/**
|
||||
* 分类颜色代码
|
||||
*/
|
||||
private String colorCode;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
private Integer sortOrder;
|
||||
|
||||
/**
|
||||
* 状态（0-停用，1-正常）
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 使用次数统计
|
||||
*/
|
||||
private Integer usageCount;
|
||||
|
||||
/**
|
||||
* 最后使用时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastUsedTime;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,178 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 报修工单对象 pm_repair_order
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pm_repair_order")
|
||||
public class PmRepairOrder extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 工单编号，格式：RO+年月日+4位流水号
|
||||
*/
|
||||
private String orderNo;
|
||||
|
||||
/**
|
||||
* 报修标题
|
||||
*/
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 报修地点
|
||||
*/
|
||||
private String repairLocation;
|
||||
|
||||
/**
|
||||
* 维修类型ID，关联pm_repair_category.id
|
||||
*/
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 紧急程度：1-非常紧急，2-紧急，3-一般，4-不紧急，5-可延后
|
||||
*/
|
||||
private Integer priorityLevel;
|
||||
|
||||
/**
|
||||
* 期望完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date expectedFinishTime;
|
||||
|
||||
/**
|
||||
* 报修人ID，关联sys_user.id
|
||||
*/
|
||||
private Long reporterId;
|
||||
|
||||
/**
|
||||
* 报修人姓名
|
||||
*/
|
||||
private String reporterName;
|
||||
|
||||
/**
|
||||
* 报修人电话
|
||||
*/
|
||||
private String reporterPhone;
|
||||
|
||||
/**
|
||||
* 报修人部门
|
||||
*/
|
||||
private String reporterDept;
|
||||
|
||||
/**
|
||||
* 工单状态：1-待分派，2-已分派，3-进行中，4-已完成，5-已评价，6-已归档，9-已取消
|
||||
*/
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 分派时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date assignTime;
|
||||
|
||||
/**
|
||||
* 分派维修员ID，关联sys_user.id
|
||||
*/
|
||||
private Long assigneeId;
|
||||
|
||||
/**
|
||||
* 分派维修员姓名
|
||||
*/
|
||||
private String assigneeName;
|
||||
|
||||
/**
|
||||
* 分派备注说明
|
||||
*/
|
||||
private String assignRemark;
|
||||
|
||||
/**
|
||||
* 开始处理时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date finishTime;
|
||||
|
||||
/**
|
||||
* 总处理时长（分钟）
|
||||
*/
|
||||
private Integer totalDuration;
|
||||
|
||||
/**
|
||||
* 维修结果描述
|
||||
*/
|
||||
private String repairResult;
|
||||
|
||||
/**
|
||||
* 使用材料清单
|
||||
*/
|
||||
private String usedMaterials;
|
||||
|
||||
/**
|
||||
* 后续建议
|
||||
*/
|
||||
private String followSuggestions;
|
||||
|
||||
/**
|
||||
* 综合评价得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal evaluationScore;
|
||||
|
||||
/**
|
||||
* 评价时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date evaluationTime;
|
||||
|
||||
/**
|
||||
* 附件数量
|
||||
*/
|
||||
private Integer attachmentCount;
|
||||
|
||||
/**
|
||||
* 进度记录数量
|
||||
*/
|
||||
private Integer progressCount;
|
||||
|
||||
/**
|
||||
* 取消原因
|
||||
*/
|
||||
private String cancelReason;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,119 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 维修进度记录实体类
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pm_repair_progress")
|
||||
public class PmRepairProgress extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报修工单ID，关联pm_repair_order.id
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 进度类型：1-工单分派，2-接收确认，3-到达现场，4-开始维修，5-进度更新，6-完成维修，7-用户评价，8-工单归档，9-其他
|
||||
*/
|
||||
private String progressType;
|
||||
|
||||
/**
|
||||
* 进度状态描述
|
||||
*/
|
||||
private String progressStatus;
|
||||
|
||||
/**
|
||||
* 进度详细描述
|
||||
*/
|
||||
private String progressDetail;
|
||||
|
||||
/**
|
||||
* 操作人ID，关联sys_user.id
|
||||
*/
|
||||
private Long operatorId;
|
||||
|
||||
/**
|
||||
* 操作人姓名
|
||||
*/
|
||||
private String operatorName;
|
||||
|
||||
/**
|
||||
* 操作人角色：user-用户，admin-管理员，worker-维修员
|
||||
*/
|
||||
private String operatorRole;
|
||||
|
||||
/**
|
||||
* 操作位置信息
|
||||
*/
|
||||
private String locationInfo;
|
||||
|
||||
/**
|
||||
* GPS纬度
|
||||
*/
|
||||
private BigDecimal gpsLatitude;
|
||||
|
||||
/**
|
||||
* GPS经度
|
||||
*/
|
||||
private BigDecimal gpsLongitude;
|
||||
|
||||
/**
|
||||
* 操作时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date operationTime;
|
||||
|
||||
/**
|
||||
* 预计耗时（分钟）
|
||||
*/
|
||||
private Integer estimatedDuration;
|
||||
|
||||
/**
|
||||
* 关联附件ID列表（逗号分隔）
|
||||
*/
|
||||
private String attachmentIds;
|
||||
|
||||
/**
|
||||
* 下一步计划
|
||||
*/
|
||||
private String nextStep;
|
||||
|
||||
/**
|
||||
* 遇到的问题
|
||||
*/
|
||||
private String issuesEncountered;
|
||||
|
||||
/**
|
||||
* 需要的材料
|
||||
*/
|
||||
private String materialsNeeded;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
-146
@@ -1,146 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 服务评价对象 pm_service_evaluation
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pm_service_evaluation")
|
||||
public class PmServiceEvaluation extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报修工单ID，关联pm_repair_order.id
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 评价人ID，关联sys_user.id
|
||||
*/
|
||||
private Long evaluatorId;
|
||||
|
||||
/**
|
||||
* 评价人姓名
|
||||
*/
|
||||
private String evaluatorName;
|
||||
|
||||
/**
|
||||
* 被评价维修员ID，关联sys_user.id
|
||||
*/
|
||||
private Long evaluatedWorkerId;
|
||||
|
||||
/**
|
||||
* 被评价维修员姓名
|
||||
*/
|
||||
private String evaluatedWorkerName;
|
||||
|
||||
/**
|
||||
* 综合评价得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal overallScore;
|
||||
|
||||
/**
|
||||
* 维修质量得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal qualityScore;
|
||||
|
||||
/**
|
||||
* 服务态度得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal attitudeScore;
|
||||
|
||||
/**
|
||||
* 响应速度得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal responseSpeedScore;
|
||||
|
||||
/**
|
||||
* 沟通效果得分（1.0-5.0）
|
||||
*/
|
||||
private BigDecimal communicationScore;
|
||||
|
||||
/**
|
||||
* 文字评价内容
|
||||
*/
|
||||
private String evaluationContent;
|
||||
|
||||
/**
|
||||
* 满意度等级：1-非常满意，2-满意，3-一般，4-不满意，5-非常不满意
|
||||
*/
|
||||
private String satisfactionLevel;
|
||||
|
||||
/**
|
||||
* 是否匿名评价（0-实名，1-匿名）
|
||||
*/
|
||||
private Integer isAnonymous;
|
||||
|
||||
/**
|
||||
* 是否公开显示（0-不公开，1-公开）
|
||||
*/
|
||||
private Integer isPublic;
|
||||
|
||||
/**
|
||||
* 评价时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date evaluationTime;
|
||||
|
||||
/**
|
||||
* 服务开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date serviceStartTime;
|
||||
|
||||
/**
|
||||
* 服务结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date serviceEndTime;
|
||||
|
||||
/**
|
||||
* 服务时长（分钟）
|
||||
*/
|
||||
private Integer serviceDuration;
|
||||
|
||||
/**
|
||||
* 正面标签（逗号分隔）
|
||||
*/
|
||||
private String positiveTags;
|
||||
|
||||
/**
|
||||
* 负面标签（逗号分隔）
|
||||
*/
|
||||
private String negativeTags;
|
||||
|
||||
/**
|
||||
* 改进建议
|
||||
*/
|
||||
private String improvementSuggestions;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqHallInfo;
|
||||
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 org.dromara.common.translation.annotation.Translation;
|
||||
import org.dromara.common.translation.constant.TransConstant;
|
||||
|
||||
/**
|
||||
* 报告厅信息业务对象 hq_hall_info
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqHallInfo.class, reverseConvertGenerate = false)
|
||||
public class HqHallInfoBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
@NotBlank(message = "报告厅名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 报告厅图片
|
||||
*/
|
||||
private String hallImage;
|
||||
|
||||
/**
|
||||
* 报告厅状态
|
||||
*/
|
||||
@NotBlank(message = "报告厅状态不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String hallStatus;
|
||||
|
||||
/**
|
||||
* 报告厅描述
|
||||
*/
|
||||
private String hallDescription;
|
||||
|
||||
|
||||
}
|
||||
-33
@@ -1,33 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import lombok.Data;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报告厅预约审核业务对象
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
public class HqHallReservationAuditBo {
|
||||
|
||||
/**
|
||||
* 预约记录ID列表
|
||||
*/
|
||||
@NotEmpty(message = "预约记录ID不能为空")
|
||||
private List<Long> ids;
|
||||
|
||||
/**
|
||||
* 审核状态：1-批准，2-拒绝
|
||||
*/
|
||||
@NotBlank(message = "审核状态不能为空")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
private String auditRemark;
|
||||
}
|
||||
-116
@@ -1,116 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqHallReservation;
|
||||
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 com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 报告厅预约业务对象 hq_hall_reservation
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqHallReservation.class, reverseConvertGenerate = false)
|
||||
public class HqHallReservationBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
@NotNull(message = "报告厅ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long hallId;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
@NotBlank(message = "报告厅名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 开始时间（用于新增和编辑）
|
||||
*/
|
||||
@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间（用于新增和编辑）
|
||||
*/
|
||||
@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 开始时间查询参数（字符串格式）
|
||||
*/
|
||||
private String startTimeStr;
|
||||
|
||||
/**
|
||||
* 结束时间查询参数（字符串格式）
|
||||
*/
|
||||
private String endTimeStr;
|
||||
|
||||
/**
|
||||
* 预约用途
|
||||
*/
|
||||
@NotBlank(message = "预约用途不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String reservationPurpose;
|
||||
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@NotNull(message = "申请人id不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long applicantId;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
@NotBlank(message = "申请人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String applicantName;
|
||||
|
||||
/**
|
||||
* 申请人电话
|
||||
*/
|
||||
private String applicantPhone;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
@NotBlank(message = "预约状态不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 审核人id
|
||||
*/
|
||||
private Long auditBy;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
private String auditName;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
private String auditRemark;
|
||||
|
||||
}
|
||||
-106
@@ -1,106 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import lombok.Data;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 答题提交BO
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
@Data
|
||||
public class HqSatAnswerSubmitBo {
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
@NotNull(message = "问卷ID不能为空")
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 答题开始时间
|
||||
*/
|
||||
@NotNull(message = "答题开始时间不能为空")
|
||||
private String startTime;
|
||||
|
||||
/**
|
||||
* 答题结束时间
|
||||
*/
|
||||
@NotNull(message = "答题结束时间不能为空")
|
||||
private String endTime;
|
||||
|
||||
/**
|
||||
* 是否匿名（1是 0否）
|
||||
*/
|
||||
@NotNull(message = "是否匿名不能为空")
|
||||
private Integer isAnonymous;
|
||||
|
||||
/**
|
||||
* 答案列表
|
||||
*/
|
||||
@NotEmpty(message = "答案列表不能为空")
|
||||
private List<AnswerItem> answers;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 单个答案项
|
||||
*/
|
||||
@Data
|
||||
public static class AnswerItem {
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
@NotNull(message = "题目ID不能为空")
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 题目类型（1单选题 2多选题 3问答题）
|
||||
*/
|
||||
@NotNull(message = "题目类型不能为空")
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
* 答案值
|
||||
*/
|
||||
@NotNull(message = "答案值不能为空")
|
||||
private String answerValue;
|
||||
|
||||
/**
|
||||
* 选项详情（单选题和多选题需要）
|
||||
*/
|
||||
private List<OptionDetail> options;
|
||||
}
|
||||
|
||||
/**
|
||||
* 选项详情
|
||||
*/
|
||||
@Data
|
||||
public static class OptionDetail {
|
||||
/**
|
||||
* 选项ID
|
||||
*/
|
||||
private Long optionId;
|
||||
|
||||
/**
|
||||
* 选项值
|
||||
*/
|
||||
private String optionValue;
|
||||
|
||||
/**
|
||||
* 选项文本
|
||||
*/
|
||||
private String optionText;
|
||||
|
||||
/**
|
||||
* 是否选中
|
||||
*/
|
||||
private Boolean isSelected;
|
||||
}
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatCategory;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 题目分类业务对象 hq_sat_category
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatCategory.class, reverseConvertGenerate = false)
|
||||
public class HqSatCategoryBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 分类编码
|
||||
*/
|
||||
@NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 分类名称
|
||||
*/
|
||||
@NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 分类描述
|
||||
*/
|
||||
private String categoryDesc;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatDetail;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 答题详情业务对象 hq_sat_detail
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatDetail.class, reverseConvertGenerate = false)
|
||||
public class HqSatDetailBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 答题记录ID
|
||||
*/
|
||||
@NotNull(message = "答题记录ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
@NotNull(message = "题目ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 答案分数
|
||||
*/
|
||||
private Long answerScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatOption;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 评分选项业务对象 hq_sat_option
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatOption.class, reverseConvertGenerate = false)
|
||||
public class HqSatOptionBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 选项文本
|
||||
*/
|
||||
@NotBlank(message = "选项文本不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String optionText;
|
||||
|
||||
/**
|
||||
* 选项分值
|
||||
*/
|
||||
@NotNull(message = "选项分值不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long optionValue;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatQuestion;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 题库业务对象 hq_sat_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatQuestion.class, reverseConvertGenerate = false)
|
||||
public class HqSatQuestionBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 题目标题
|
||||
*/
|
||||
@NotBlank(message = "题目标题不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String questionTitle;
|
||||
|
||||
/**
|
||||
* 题目内容
|
||||
*/
|
||||
private String questionContent;
|
||||
|
||||
/**
|
||||
* 所属分类ID
|
||||
*/
|
||||
@NotNull(message = "所属分类ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 题目类型
|
||||
*/
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,80 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatRecord;
|
||||
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 com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 答题记录业务对象 hq_sat_record
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatRecord.class, reverseConvertGenerate = false)
|
||||
public class HqSatRecordBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
@NotNull(message = "问卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 答题用户ID
|
||||
*/
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户类型
|
||||
*/
|
||||
@NotBlank(message = "用户类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String userType;
|
||||
|
||||
/**
|
||||
* 用户部门
|
||||
*/
|
||||
private String userDept;
|
||||
|
||||
/**
|
||||
* 提交时间
|
||||
*/
|
||||
@NotNull(message = "提交时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Date submitTime;
|
||||
|
||||
/**
|
||||
* 总分
|
||||
*/
|
||||
private Long totalScore;
|
||||
|
||||
/**
|
||||
* 平均分
|
||||
*/
|
||||
private Long avgScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurvey;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 问卷业务对象 hq_sat_survey
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatSurvey.class, reverseConvertGenerate = false)
|
||||
public class HqSatSurveyBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷编号
|
||||
*/
|
||||
@NotBlank(message = "问卷编号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String surveyCode;
|
||||
|
||||
/**
|
||||
* 问卷标题
|
||||
*/
|
||||
@NotBlank(message = "问卷标题不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String surveyTitle;
|
||||
|
||||
/**
|
||||
* 问卷描述
|
||||
*/
|
||||
private String surveyDesc;
|
||||
|
||||
/**
|
||||
* 填写说明
|
||||
*/
|
||||
private String surveyInstruction;
|
||||
|
||||
/**
|
||||
* 目标群体
|
||||
*/
|
||||
@NotBlank(message = "目标群体不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String targetGroup;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 最大提交次数
|
||||
*/
|
||||
private Long maxSubmitTimes;
|
||||
|
||||
/**
|
||||
* 是否匿名
|
||||
*/
|
||||
private Long isAnonymous;
|
||||
|
||||
/**
|
||||
* 是否发布
|
||||
*/
|
||||
private Long isPublished;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 目标群体IN查询（用于权限过滤）
|
||||
*/
|
||||
private List<String> targetGroupIn;
|
||||
|
||||
/**
|
||||
* 状态IN查询（用于状态过滤）
|
||||
*/
|
||||
private List<String> statusIn;
|
||||
|
||||
}
|
||||
-67
@@ -1,67 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion;
|
||||
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.*;
|
||||
|
||||
/**
|
||||
* 问卷题目关联业务对象 hq_sat_survey_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = HqSatSurveyQuestion.class, reverseConvertGenerate = false)
|
||||
public class HqSatSurveyQuestionBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
@NotNull(message = "问卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
@NotNull(message = "题目ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 题目顺序
|
||||
*/
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 题目权重
|
||||
*/
|
||||
private Long weight;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
-115
@@ -1,115 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairAttachment;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 报修附件业务对象 pm_repair_attachment
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = PmRepairAttachment.class, reverseConvertGenerate = false)
|
||||
public class PmRepairAttachmentBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报修工单ID
|
||||
*/
|
||||
@NotNull(message = "报修工单ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 文件原始名称
|
||||
*/
|
||||
@NotBlank(message = "文件名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String fileName;
|
||||
|
||||
/**
|
||||
* 文件存储路径
|
||||
*/
|
||||
@NotBlank(message = "文件路径不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String filePath;
|
||||
|
||||
/**
|
||||
* 文件大小（字节）
|
||||
*/
|
||||
@NotNull(message = "文件大小不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long fileSize;
|
||||
|
||||
/**
|
||||
* 文件类型：image-图片，video-视频
|
||||
*/
|
||||
@NotBlank(message = "文件类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String fileType;
|
||||
|
||||
/**
|
||||
* 文件扩展名
|
||||
*/
|
||||
@NotBlank(message = "文件扩展名不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String fileExtension;
|
||||
|
||||
/**
|
||||
* 文件MIME类型
|
||||
*/
|
||||
private String fileMimeType;
|
||||
|
||||
/**
|
||||
* 上传阶段：1-报修申请，2-维修过程，3-完成确认
|
||||
*/
|
||||
@NotBlank(message = "上传阶段不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String uploadStage;
|
||||
|
||||
/**
|
||||
* 上传人ID
|
||||
*/
|
||||
private Long uploaderId;
|
||||
|
||||
/**
|
||||
* 上传人姓名
|
||||
*/
|
||||
private String uploaderName;
|
||||
|
||||
/**
|
||||
* 缩略图路径
|
||||
*/
|
||||
private String thumbnailPath;
|
||||
|
||||
/**
|
||||
* 时长（视频文件，秒）
|
||||
*/
|
||||
private Integer duration;
|
||||
|
||||
/**
|
||||
* 分辨率
|
||||
*/
|
||||
private String resolution;
|
||||
|
||||
/**
|
||||
* 文件描述说明
|
||||
*/
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
private Integer sortOrder;
|
||||
|
||||
}
|
||||
-140
@@ -1,140 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairCategory;
|
||||
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.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 维修类型业务对象 pm_repair_category
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = PmRepairCategory.class, reverseConvertGenerate = false)
|
||||
public class PmRepairCategoryBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 类型名称
|
||||
*/
|
||||
@NotBlank(message = "类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@NotBlank(message = "类型编码不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 类型描述
|
||||
*/
|
||||
private String categoryDescription;
|
||||
|
||||
/**
|
||||
* 父级ID
|
||||
*/
|
||||
@NotNull(message = "上级类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 祖级列表
|
||||
*/
|
||||
private String ancestorIds;
|
||||
|
||||
/**
|
||||
* 层级深度
|
||||
*/
|
||||
private Integer levelDepth;
|
||||
|
||||
/**
|
||||
* 子类数量
|
||||
*/
|
||||
private Integer childrenCount;
|
||||
|
||||
/**
|
||||
* 所需专业技能
|
||||
*/
|
||||
private String requiredSkills;
|
||||
|
||||
/**
|
||||
* 技能等级要求
|
||||
*/
|
||||
@NotBlank(message = "技能等级不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String skillLevel;
|
||||
|
||||
/**
|
||||
* 预估维修时长（分钟）
|
||||
*/
|
||||
private Integer estimatedDuration;
|
||||
|
||||
/**
|
||||
* 标准成本（元）
|
||||
*/
|
||||
private BigDecimal standardCost;
|
||||
|
||||
/**
|
||||
* 分类图标URL
|
||||
*/
|
||||
private String iconUrl;
|
||||
|
||||
/**
|
||||
* 分类颜色代码
|
||||
*/
|
||||
private String colorCode;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
@NotNull(message = "排序顺序不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Integer sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 使用次数统计
|
||||
*/
|
||||
private Integer usageCount;
|
||||
|
||||
/**
|
||||
* 最后使用时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastUsedTime;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 状态IN查询（用于状态过滤）
|
||||
*/
|
||||
private List<String> statusIn;
|
||||
|
||||
/**
|
||||
* 父级ID IN查询（用于层级过滤）
|
||||
*/
|
||||
private List<Long> parentIdIn;
|
||||
|
||||
}
|
||||
@@ -1,205 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.bo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairOrder;
|
||||
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.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 报修工单业务对象 pm_repair_order
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = PmRepairOrder.class, reverseConvertGenerate = false)
|
||||
public class PmRepairOrderBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 工单编号
|
||||
*/
|
||||
private String orderNo;
|
||||
|
||||
/**
|
||||
* 报修标题
|
||||
*/
|
||||
@NotBlank(message = "报修标题不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@NotBlank(message = "问题描述不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 报修地点
|
||||
*/
|
||||
@NotBlank(message = "报修地点不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String repairLocation;
|
||||
|
||||
/**
|
||||
* 维修类型ID
|
||||
*/
|
||||
@NotNull(message = "维修类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@NotNull(message = "紧急程度不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Integer priorityLevel;
|
||||
|
||||
/**
|
||||
* 期望完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date expectedFinishTime;
|
||||
|
||||
/**
|
||||
* 报修人ID
|
||||
*/
|
||||
private Long reporterId;
|
||||
|
||||
/**
|
||||
* 报修人姓名
|
||||
*/
|
||||
@NotBlank(message = "报修人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String reporterName;
|
||||
|
||||
/**
|
||||
* 报修人电话
|
||||
*/
|
||||
@NotBlank(message = "报修人电话不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String reporterPhone;
|
||||
|
||||
/**
|
||||
* 报修人部门
|
||||
*/
|
||||
private String reporterDept;
|
||||
|
||||
/**
|
||||
* 工单状态
|
||||
*/
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 分派时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date assignTime;
|
||||
|
||||
/**
|
||||
* 分派维修员ID
|
||||
*/
|
||||
private Long assigneeId;
|
||||
|
||||
/**
|
||||
* 分派维修员姓名
|
||||
*/
|
||||
private String assigneeName;
|
||||
|
||||
/**
|
||||
* 分派备注说明
|
||||
*/
|
||||
private String assignRemark;
|
||||
|
||||
/**
|
||||
* 开始处理时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date finishTime;
|
||||
|
||||
/**
|
||||
* 总处理时长（分钟）
|
||||
*/
|
||||
private Integer totalDuration;
|
||||
|
||||
/**
|
||||
* 维修结果描述
|
||||
*/
|
||||
private String repairResult;
|
||||
|
||||
/**
|
||||
* 使用材料清单
|
||||
*/
|
||||
private String usedMaterials;
|
||||
|
||||
/**
|
||||
* 后续建议
|
||||
*/
|
||||
private String followSuggestions;
|
||||
|
||||
/**
|
||||
* 综合评价得分
|
||||
*/
|
||||
private BigDecimal evaluationScore;
|
||||
|
||||
/**
|
||||
* 评价时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date evaluationTime;
|
||||
|
||||
/**
|
||||
* 附件数量
|
||||
*/
|
||||
private Integer attachmentCount;
|
||||
|
||||
/**
|
||||
* 进度记录数量
|
||||
*/
|
||||
private Integer progressCount;
|
||||
|
||||
/**
|
||||
* 取消原因
|
||||
*/
|
||||
private String cancelReason;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 工单状态IN查询（用于状态过滤）
|
||||
*/
|
||||
private List<String> orderStatusIn;
|
||||
|
||||
/**
|
||||
* 维修类型IN查询（用于类型过滤）
|
||||
*/
|
||||
private List<Long> categoryIdIn;
|
||||
|
||||
/**
|
||||
* 报修人ID IN查询（用于权限过滤）
|
||||
*/
|
||||
private List<Long> reporterIdIn;
|
||||
|
||||
/**
|
||||
* 分派维修员ID IN查询（用于维修员过滤）
|
||||
*/
|
||||
private List<Long> assigneeIdIn;
|
||||
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.common.translation.annotation.Translation;
|
||||
import org.dromara.common.translation.constant.TransConstant;
|
||||
import org.dromara.zhxy.hq.domain.HqHallInfo;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 报告厅信息视图对象 hq_hall_info
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqHallInfo.class)
|
||||
public class HqHallInfoVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅名称")
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 报告厅图片
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅图片")
|
||||
private String hallImage;
|
||||
|
||||
/**
|
||||
* 报告厅图片Url
|
||||
*/
|
||||
@Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "hallImage")
|
||||
private String hallImageUrl;
|
||||
/**
|
||||
* 报告厅状态
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "hall_status")
|
||||
private String hallStatus;
|
||||
|
||||
/**
|
||||
* 报告厅描述
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅描述")
|
||||
private String hallDescription;
|
||||
|
||||
|
||||
}
|
||||
-116
@@ -1,116 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.zhxy.hq.domain.HqHallReservation;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 报告厅预约视图对象 hq_hall_reservation
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqHallReservation.class)
|
||||
public class HqHallReservationVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅ID")
|
||||
private Long hallId;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
@ExcelProperty(value = "报告厅名称")
|
||||
private String hallName;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@ExcelProperty(value = "开始时间")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@ExcelProperty(value = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 预约用途
|
||||
*/
|
||||
@ExcelProperty(value = "预约用途")
|
||||
private String reservationPurpose;
|
||||
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@ExcelProperty(value = "申请人id")
|
||||
private Long applicantId;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "申请人姓名")
|
||||
private String applicantName;
|
||||
|
||||
/**
|
||||
* 申请人电话
|
||||
*/
|
||||
@ExcelProperty(value = "申请人电话")
|
||||
private String applicantPhone;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
@ExcelProperty(value = "预约状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "hall_reserv_status")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 审核人id
|
||||
*/
|
||||
@ExcelProperty(value = "审核人id")
|
||||
private Long auditBy;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@ExcelProperty(value = "审核人")
|
||||
private String auditName;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
@ExcelProperty(value = "审核时间")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
@ExcelProperty(value = "审核备注")
|
||||
private String auditRemark;
|
||||
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatCategory;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 题目分类视图对象 hq_sat_category
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatCategory.class)
|
||||
public class HqSatCategoryVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 分类编码
|
||||
*/
|
||||
@ExcelProperty(value = "分类编码")
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 分类名称
|
||||
*/
|
||||
@ExcelProperty(value = "分类名称")
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 分类描述
|
||||
*/
|
||||
@ExcelProperty(value = "分类描述")
|
||||
private String categoryDesc;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@ExcelProperty(value = "排序")
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_enable")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,69 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatDetail;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 答题详情视图对象 hq_sat_detail
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatDetail.class)
|
||||
public class HqSatDetailVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 答题记录ID
|
||||
*/
|
||||
@ExcelProperty(value = "答题记录ID")
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
@ExcelProperty(value = "题目ID")
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 答案分数
|
||||
*/
|
||||
@ExcelProperty(value = "答案分数")
|
||||
private Long answerScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatOption;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 评分选项视图对象 hq_sat_option
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatOption.class)
|
||||
public class HqSatOptionVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 选项文本
|
||||
*/
|
||||
@ExcelProperty(value = "选项文本")
|
||||
private String optionText;
|
||||
|
||||
/**
|
||||
* 选项分值
|
||||
*/
|
||||
@ExcelProperty(value = "选项分值")
|
||||
private Long optionValue;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@ExcelProperty(value = "排序")
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_enable")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatQuestion;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 题库视图对象 hq_sat_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatQuestion.class)
|
||||
public class HqSatQuestionVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 题目标题
|
||||
*/
|
||||
@ExcelProperty(value = "题目标题")
|
||||
private String questionTitle;
|
||||
|
||||
/**
|
||||
* 题目内容
|
||||
*/
|
||||
@ExcelProperty(value = "题目内容")
|
||||
private String questionContent;
|
||||
|
||||
/**
|
||||
* 所属分类ID
|
||||
*/
|
||||
@ExcelProperty(value = "所属分类ID")
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 题目类型
|
||||
*/
|
||||
@ExcelProperty(value = "题目类型", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_question_category")
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
@ExcelProperty(value = "是否必填", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_required")
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@ExcelProperty(value = "排序")
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_enable")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.zhxy.hq.domain.HqSatRecord;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 答题记录视图对象 hq_sat_record
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatRecord.class)
|
||||
public class HqSatRecordVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "问卷ID")
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 答题用户ID
|
||||
*/
|
||||
@ExcelProperty(value = "答题用户ID")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户类型
|
||||
*/
|
||||
@ExcelProperty(value = "用户类型", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "survey_people_category")
|
||||
private String userType;
|
||||
|
||||
/**
|
||||
* 用户部门
|
||||
*/
|
||||
@ExcelProperty(value = "用户部门")
|
||||
private String userDept;
|
||||
|
||||
/**
|
||||
* 提交时间
|
||||
*/
|
||||
@ExcelProperty(value = "提交时间")
|
||||
private Date submitTime;
|
||||
|
||||
/**
|
||||
* 总分
|
||||
*/
|
||||
@ExcelProperty(value = "总分")
|
||||
private Long totalScore;
|
||||
|
||||
/**
|
||||
* 平均分
|
||||
*/
|
||||
@ExcelProperty(value = "平均分")
|
||||
private Long avgScore;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
Whitespace-only changes.
-119
@@ -1,119 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 问卷题目关联视图对象 hq_sat_survey_question
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatSurveyQuestion.class)
|
||||
public class HqSatSurveyQuestionVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "问卷ID")
|
||||
private Long surveyId;
|
||||
|
||||
/**
|
||||
* 题目ID
|
||||
*/
|
||||
@ExcelProperty(value = "题目ID")
|
||||
private Long questionId;
|
||||
|
||||
/**
|
||||
* 题目顺序
|
||||
*/
|
||||
@ExcelProperty(value = "题目顺序")
|
||||
private Long sortOrder;
|
||||
|
||||
/**
|
||||
* 题目权重
|
||||
*/
|
||||
@ExcelProperty(value = "题目权重")
|
||||
private Long weight;
|
||||
|
||||
/**
|
||||
* 是否必填
|
||||
*/
|
||||
@ExcelProperty(value = "是否必填", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_required")
|
||||
private Long isRequired;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
// ==================== 以下为题目详细信息字段 ====================
|
||||
|
||||
/**
|
||||
* 题目标题
|
||||
*/
|
||||
@ExcelProperty(value = "题目标题")
|
||||
private String questionTitle;
|
||||
|
||||
/**
|
||||
* 题目内容
|
||||
*/
|
||||
@ExcelProperty(value = "题目内容")
|
||||
private String questionContent;
|
||||
|
||||
/**
|
||||
* 所属分类ID
|
||||
*/
|
||||
@ExcelProperty(value = "所属分类ID")
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 题目类型
|
||||
*/
|
||||
@ExcelProperty(value = "题目类型", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_question_type")
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
* 分类名称
|
||||
*/
|
||||
@ExcelProperty(value = "分类名称")
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 题目状态
|
||||
*/
|
||||
@ExcelProperty(value = "题目状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_normal_disable")
|
||||
private String status;
|
||||
|
||||
}
|
||||
@@ -1,123 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurvey;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 问卷视图对象 hq_sat_survey
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = HqSatSurvey.class)
|
||||
public class HqSatSurveyVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_item_delete")
|
||||
private Long deleted;
|
||||
|
||||
/**
|
||||
* 问卷编号
|
||||
*/
|
||||
@ExcelProperty(value = "问卷编号")
|
||||
private String surveyCode;
|
||||
|
||||
/**
|
||||
* 问卷标题
|
||||
*/
|
||||
@ExcelProperty(value = "问卷标题")
|
||||
private String surveyTitle;
|
||||
|
||||
/**
|
||||
* 问卷描述
|
||||
*/
|
||||
@ExcelProperty(value = "问卷描述")
|
||||
private String surveyDesc;
|
||||
|
||||
/**
|
||||
* 填写说明
|
||||
*/
|
||||
@ExcelProperty(value = "填写说明")
|
||||
private String surveyInstruction;
|
||||
|
||||
/**
|
||||
* 目标群体
|
||||
*/
|
||||
@ExcelProperty(value = "目标群体", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_survey_people")
|
||||
private String targetGroup;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@ExcelProperty(value = "开始时间")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@ExcelProperty(value = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 最大提交次数
|
||||
*/
|
||||
@ExcelProperty(value = "最大提交次数")
|
||||
private Long maxSubmitTimes;
|
||||
|
||||
/**
|
||||
* 是否匿名
|
||||
*/
|
||||
@ExcelProperty(value = "是否匿名", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_yesno")
|
||||
private Long isAnonymous;
|
||||
|
||||
/**
|
||||
* 是否发布
|
||||
*/
|
||||
@ExcelProperty(value = "是否发布", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_yesno")
|
||||
private Long isPublished;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_survey_status")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
-131
@@ -1,131 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairAttachment;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 报修附件视图对象 pm_repair_attachment
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = PmRepairAttachment.class)
|
||||
public class PmRepairAttachmentVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 报修工单ID
|
||||
*/
|
||||
@ExcelProperty(value = "报修工单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 文件原始名称
|
||||
*/
|
||||
@ExcelProperty(value = "文件原始名称")
|
||||
private String fileName;
|
||||
|
||||
/**
|
||||
* 文件存储路径
|
||||
*/
|
||||
@ExcelProperty(value = "文件存储路径")
|
||||
private String filePath;
|
||||
|
||||
/**
|
||||
* 文件大小（字节）
|
||||
*/
|
||||
@ExcelProperty(value = "文件大小")
|
||||
private Long fileSize;
|
||||
|
||||
/**
|
||||
* 文件类型：image-图片，video-视频
|
||||
*/
|
||||
@ExcelProperty(value = "文件类型")
|
||||
private String fileType;
|
||||
|
||||
/**
|
||||
* 文件扩展名
|
||||
*/
|
||||
@ExcelProperty(value = "文件扩展名")
|
||||
private String fileExtension;
|
||||
|
||||
/**
|
||||
* 文件MIME类型
|
||||
*/
|
||||
@ExcelProperty(value = "文件MIME类型")
|
||||
private String fileMimeType;
|
||||
|
||||
/**
|
||||
* 上传阶段：1-报修申请，2-维修过程，3-完成确认
|
||||
*/
|
||||
@ExcelProperty(value = "上传阶段")
|
||||
private String uploadStage;
|
||||
|
||||
/**
|
||||
* 上传人ID
|
||||
*/
|
||||
@ExcelProperty(value = "上传人ID")
|
||||
private Long uploaderId;
|
||||
|
||||
/**
|
||||
* 上传人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "上传人姓名")
|
||||
private String uploaderName;
|
||||
|
||||
/**
|
||||
* 缩略图路径
|
||||
*/
|
||||
@ExcelProperty(value = "缩略图路径")
|
||||
private String thumbnailPath;
|
||||
|
||||
/**
|
||||
* 时长（视频文件，秒）
|
||||
*/
|
||||
@ExcelProperty(value = "时长")
|
||||
private Integer duration;
|
||||
|
||||
/**
|
||||
* 分辨率
|
||||
*/
|
||||
@ExcelProperty(value = "分辨率")
|
||||
private String resolution;
|
||||
|
||||
/**
|
||||
* 文件描述说明
|
||||
*/
|
||||
@ExcelProperty(value = "文件描述")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
@ExcelProperty(value = "排序顺序")
|
||||
private Integer sortOrder;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
}
|
||||
-161
@@ -1,161 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairCategory;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 维修类型视图对象 pm_repair_category
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = PmRepairCategory.class)
|
||||
public class PmRepairCategoryVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 类型名称
|
||||
*/
|
||||
@ExcelProperty(value = "类型名称")
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 类型编码
|
||||
*/
|
||||
@ExcelProperty(value = "类型编码")
|
||||
private String categoryCode;
|
||||
|
||||
/**
|
||||
* 类型描述
|
||||
*/
|
||||
@ExcelProperty(value = "类型描述")
|
||||
private String categoryDescription;
|
||||
|
||||
/**
|
||||
* 父级ID
|
||||
*/
|
||||
@ExcelProperty(value = "父级ID")
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 祖级列表
|
||||
*/
|
||||
@ExcelProperty(value = "祖级列表")
|
||||
private String ancestorIds;
|
||||
|
||||
/**
|
||||
* 层级深度
|
||||
*/
|
||||
@ExcelProperty(value = "层级深度")
|
||||
private Integer levelDepth;
|
||||
|
||||
/**
|
||||
* 子类数量
|
||||
*/
|
||||
@ExcelProperty(value = "子类数量")
|
||||
private Integer childrenCount;
|
||||
|
||||
/**
|
||||
* 所需专业技能
|
||||
*/
|
||||
@ExcelProperty(value = "所需技能")
|
||||
private String requiredSkills;
|
||||
|
||||
/**
|
||||
* 技能等级要求
|
||||
*/
|
||||
@ExcelProperty(value = "技能等级", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "pm_skill_level")
|
||||
private String skillLevel;
|
||||
|
||||
/**
|
||||
* 预估维修时长（分钟）
|
||||
*/
|
||||
@ExcelProperty(value = "预估时长(分钟)")
|
||||
private Integer estimatedDuration;
|
||||
|
||||
/**
|
||||
* 标准成本（元）
|
||||
*/
|
||||
@ExcelProperty(value = "标准成本(元)")
|
||||
private BigDecimal standardCost;
|
||||
|
||||
/**
|
||||
* 分类图标URL
|
||||
*/
|
||||
@ExcelProperty(value = "图标URL")
|
||||
private String iconUrl;
|
||||
|
||||
/**
|
||||
* 分类颜色代码
|
||||
*/
|
||||
@ExcelProperty(value = "颜色代码")
|
||||
private String colorCode;
|
||||
|
||||
/**
|
||||
* 排序顺序
|
||||
*/
|
||||
@ExcelProperty(value = "排序")
|
||||
private Integer sortOrder;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "sys_normal_disable")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 使用次数统计
|
||||
*/
|
||||
@ExcelProperty(value = "使用次数")
|
||||
private Integer usageCount;
|
||||
|
||||
/**
|
||||
* 最后使用时间
|
||||
*/
|
||||
@ExcelProperty(value = "最后使用时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastUsedTime;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 子分类列表（用于树形结构）
|
||||
*/
|
||||
private List<PmRepairCategoryVo> children;
|
||||
|
||||
}
|
||||
@@ -1,225 +0,0 @@
|
||||
package org.dromara.zhxy.hq.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairOrder;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 报修工单视图对象 pm_repair_order
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = PmRepairOrder.class)
|
||||
public class PmRepairOrderVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 工单编号
|
||||
*/
|
||||
@ExcelProperty(value = "工单编号")
|
||||
private String orderNo;
|
||||
|
||||
/**
|
||||
* 报修标题
|
||||
*/
|
||||
@ExcelProperty(value = "报修标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@ExcelProperty(value = "问题描述")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 报修地点
|
||||
*/
|
||||
@ExcelProperty(value = "报修地点")
|
||||
private String repairLocation;
|
||||
|
||||
/**
|
||||
* 维修类型ID
|
||||
*/
|
||||
@ExcelProperty(value = "维修类型ID")
|
||||
private Long categoryId;
|
||||
|
||||
/**
|
||||
* 维修类型名称
|
||||
*/
|
||||
@ExcelProperty(value = "维修类型")
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@ExcelProperty(value = "紧急程度", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "pm_priority_level")
|
||||
private Integer priorityLevel;
|
||||
|
||||
/**
|
||||
* 期望完成时间
|
||||
*/
|
||||
@ExcelProperty(value = "期望完成时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date expectedFinishTime;
|
||||
|
||||
/**
|
||||
* 报修人ID
|
||||
*/
|
||||
@ExcelProperty(value = "报修人ID")
|
||||
private Long reporterId;
|
||||
|
||||
/**
|
||||
* 报修人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "报修人")
|
||||
private String reporterName;
|
||||
|
||||
/**
|
||||
* 报修人电话
|
||||
*/
|
||||
@ExcelProperty(value = "联系电话")
|
||||
private String reporterPhone;
|
||||
|
||||
/**
|
||||
* 报修人部门
|
||||
*/
|
||||
@ExcelProperty(value = "报修部门")
|
||||
private String reporterDept;
|
||||
|
||||
/**
|
||||
* 工单状态
|
||||
*/
|
||||
@ExcelProperty(value = "工单状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(dictType = "pm_order_status")
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 分派时间
|
||||
*/
|
||||
@ExcelProperty(value = "分派时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date assignTime;
|
||||
|
||||
/**
|
||||
* 分派维修员ID
|
||||
*/
|
||||
@ExcelProperty(value = "维修员ID")
|
||||
private Long assigneeId;
|
||||
|
||||
/**
|
||||
* 分派维修员姓名
|
||||
*/
|
||||
@ExcelProperty(value = "维修员")
|
||||
private String assigneeName;
|
||||
|
||||
/**
|
||||
* 分派备注说明
|
||||
*/
|
||||
@ExcelProperty(value = "分派备注")
|
||||
private String assignRemark;
|
||||
|
||||
/**
|
||||
* 开始处理时间
|
||||
*/
|
||||
@ExcelProperty(value = "开始时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@ExcelProperty(value = "完成时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date finishTime;
|
||||
|
||||
/**
|
||||
* 总处理时长（分钟）
|
||||
*/
|
||||
@ExcelProperty(value = "处理时长(分钟)")
|
||||
private Integer totalDuration;
|
||||
|
||||
/**
|
||||
* 维修结果描述
|
||||
*/
|
||||
@ExcelProperty(value = "维修结果")
|
||||
private String repairResult;
|
||||
|
||||
/**
|
||||
* 使用材料清单
|
||||
*/
|
||||
@ExcelProperty(value = "使用材料")
|
||||
private String usedMaterials;
|
||||
|
||||
/**
|
||||
* 后续建议
|
||||
*/
|
||||
@ExcelProperty(value = "后续建议")
|
||||
private String followSuggestions;
|
||||
|
||||
/**
|
||||
* 综合评价得分
|
||||
*/
|
||||
@ExcelProperty(value = "评价得分")
|
||||
private BigDecimal evaluationScore;
|
||||
|
||||
/**
|
||||
* 评价时间
|
||||
*/
|
||||
@ExcelProperty(value = "评价时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date evaluationTime;
|
||||
|
||||
/**
|
||||
* 附件数量
|
||||
*/
|
||||
@ExcelProperty(value = "附件数量")
|
||||
private Integer attachmentCount;
|
||||
|
||||
/**
|
||||
* 进度记录数量
|
||||
*/
|
||||
@ExcelProperty(value = "进度记录数")
|
||||
private Integer progressCount;
|
||||
|
||||
/**
|
||||
* 取消原因
|
||||
*/
|
||||
@ExcelProperty(value = "取消原因")
|
||||
private String cancelReason;
|
||||
|
||||
/**
|
||||
* 备注信息
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqHallInfo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 报告厅信息Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
public interface HqHallInfoMapper extends BaseMapperPlus<HqHallInfo, HqHallInfoVo> {
|
||||
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqHallReservation;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 报告厅预约Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
public interface HqHallReservationMapper extends BaseMapperPlus<HqHallReservation, HqHallReservationVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatCategory;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 题目分类Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatCategoryMapper extends BaseMapperPlus<HqSatCategory, HqSatCategoryVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatDetail;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 答题详情Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatDetailMapper extends BaseMapperPlus<HqSatDetail, HqSatDetailVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatOption;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 评分选项Mapper接口
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatOptionMapper extends BaseMapperPlus<HqSatOption, HqSatOptionVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatQuestion;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 题库Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatQuestionMapper extends BaseMapperPlus<HqSatQuestion, HqSatQuestionVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatRecord;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 答题记录Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatRecordMapper extends BaseMapperPlus<HqSatRecord, HqSatRecordVo> {
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurvey;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 问卷Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatSurveyMapper extends BaseMapperPlus<HqSatSurvey, HqSatSurveyVo> {
|
||||
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 问卷题目关联Mapper接口
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface HqSatSurveyQuestionMapper extends BaseMapperPlus<HqSatSurveyQuestion, HqSatSurveyQuestionVo> {
|
||||
|
||||
/**
|
||||
* 联表查询问卷题目详情
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 问卷题目详情列表
|
||||
*/
|
||||
List<HqSatSurveyQuestionVo> selectSurveyQuestionsWithDetail(@Param("surveyId") Long surveyId);
|
||||
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairAttachment;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 报修附件Mapper接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
public interface PmRepairAttachmentMapper extends BaseMapperPlus<PmRepairAttachment, PmRepairAttachmentVo> {
|
||||
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairCategory;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 维修类型Mapper接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
public interface PmRepairCategoryMapper extends BaseMapperPlus<PmRepairCategory, PmRepairCategoryVo> {
|
||||
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairOrder;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 报修工单Mapper接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
public interface PmRepairOrderMapper extends BaseMapperPlus<PmRepairOrder, PmRepairOrderVo> {
|
||||
|
||||
/**
|
||||
* 查询拥有"维修人员"角色的用户列表
|
||||
*
|
||||
* @return 维修人员选项列表
|
||||
*/
|
||||
List<Map<String, Object>> selectMaintenanceWorkers();
|
||||
|
||||
}
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmRepairProgress;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 维修进度记录Mapper接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
public interface PmRepairProgressMapper extends BaseMapperPlus<PmRepairProgress, PmRepairProgress> {
|
||||
|
||||
}
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
package org.dromara.zhxy.hq.mapper;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.PmServiceEvaluation;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 服务评价Mapper接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
public interface PmServiceEvaluationMapper extends BaseMapperPlus<PmServiceEvaluation, PmServiceEvaluation> {
|
||||
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
public interface IHqHallInfoService {
|
||||
|
||||
/**
|
||||
* 查询报告厅信息
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 报告厅信息
|
||||
*/
|
||||
HqHallInfoVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询报告厅信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 报告厅信息分页列表
|
||||
*/
|
||||
TableDataInfo<HqHallInfoVo> queryPageList(HqHallInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的报告厅信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 报告厅信息列表
|
||||
*/
|
||||
List<HqHallInfoVo> queryList(HqHallInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增报告厅信息
|
||||
*
|
||||
* @param bo 报告厅信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqHallInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改报告厅信息
|
||||
*
|
||||
* @param bo 报告厅信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqHallInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除报告厅信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-77
@@ -1,77 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
public interface IHqHallReservationService {
|
||||
|
||||
/**
|
||||
* 查询报告厅预约
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 报告厅预约
|
||||
*/
|
||||
HqHallReservationVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询报告厅预约列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 报告厅预约分页列表
|
||||
*/
|
||||
TableDataInfo<HqHallReservationVo> queryPageList(HqHallReservationBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的报告厅预约列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 报告厅预约列表
|
||||
*/
|
||||
List<HqHallReservationVo> queryList(HqHallReservationBo bo);
|
||||
|
||||
/**
|
||||
* 新增报告厅预约
|
||||
*
|
||||
* @param bo 报告厅预约
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqHallReservationBo bo);
|
||||
|
||||
/**
|
||||
* 修改报告厅预约
|
||||
*
|
||||
* @param bo 报告厅预约
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqHallReservationBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除报告厅预约信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 批量审核报告厅预约
|
||||
*
|
||||
* @param auditBo 审核信息
|
||||
* @return 是否审核成功
|
||||
*/
|
||||
Boolean auditByIds(HqHallReservationAuditBo auditBo);
|
||||
}
|
||||
-68
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatCategoryService {
|
||||
|
||||
/**
|
||||
* 查询题目分类
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 题目分类
|
||||
*/
|
||||
HqSatCategoryVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询题目分类列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 题目分类分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatCategoryVo> queryPageList(HqSatCategoryBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的题目分类列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 题目分类列表
|
||||
*/
|
||||
List<HqSatCategoryVo> queryList(HqSatCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 新增题目分类
|
||||
*
|
||||
* @param bo 题目分类
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 修改题目分类
|
||||
*
|
||||
* @param bo 题目分类
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除题目分类信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-68
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatDetailService {
|
||||
|
||||
/**
|
||||
* 查询答题详情
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 答题详情
|
||||
*/
|
||||
HqSatDetailVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询答题详情列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 答题详情分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatDetailVo> queryPageList(HqSatDetailBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的答题详情列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 答题详情列表
|
||||
*/
|
||||
List<HqSatDetailVo> queryList(HqSatDetailBo bo);
|
||||
|
||||
/**
|
||||
* 新增答题详情
|
||||
*
|
||||
* @param bo 答题详情
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatDetailBo bo);
|
||||
|
||||
/**
|
||||
* 修改答题详情
|
||||
*
|
||||
* @param bo 答题详情
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatDetailBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除答题详情信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-68
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo;
|
||||
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 Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatOptionService {
|
||||
|
||||
/**
|
||||
* 查询评分选项
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 评分选项
|
||||
*/
|
||||
HqSatOptionVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询评分选项列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 评分选项分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatOptionVo> queryPageList(HqSatOptionBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的评分选项列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 评分选项列表
|
||||
*/
|
||||
List<HqSatOptionVo> queryList(HqSatOptionBo bo);
|
||||
|
||||
/**
|
||||
* 新增评分选项
|
||||
*
|
||||
* @param bo 评分选项
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatOptionBo bo);
|
||||
|
||||
/**
|
||||
* 修改评分选项
|
||||
*
|
||||
* @param bo 评分选项
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatOptionBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除评分选项信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-68
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatQuestionService {
|
||||
|
||||
/**
|
||||
* 查询题库
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 题库
|
||||
*/
|
||||
HqSatQuestionVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询题库列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 题库分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatQuestionVo> queryPageList(HqSatQuestionBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的题库列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 题库列表
|
||||
*/
|
||||
List<HqSatQuestionVo> queryList(HqSatQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 新增题库
|
||||
*
|
||||
* @param bo 题库
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 修改题库
|
||||
*
|
||||
* @param bo 题库
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除题库信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-68
@@ -1,68 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatRecordService {
|
||||
|
||||
/**
|
||||
* 查询答题记录
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 答题记录
|
||||
*/
|
||||
HqSatRecordVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询答题记录列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 答题记录分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatRecordVo> queryPageList(HqSatRecordBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的答题记录列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 答题记录列表
|
||||
*/
|
||||
List<HqSatRecordVo> queryList(HqSatRecordBo bo);
|
||||
|
||||
/**
|
||||
* 新增答题记录
|
||||
*
|
||||
* @param bo 答题记录
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatRecordBo bo);
|
||||
|
||||
/**
|
||||
* 修改答题记录
|
||||
*
|
||||
* @param bo 答题记录
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatRecordBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除答题记录信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
-76
@@ -1,76 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatSurveyQuestionService {
|
||||
|
||||
/**
|
||||
* 查询问卷题目关联
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 问卷题目关联
|
||||
*/
|
||||
HqSatSurveyQuestionVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询问卷题目关联列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 问卷题目关联分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatSurveyQuestionVo> queryPageList(HqSatSurveyQuestionBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的问卷题目关联列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 问卷题目关联列表
|
||||
*/
|
||||
List<HqSatSurveyQuestionVo> queryList(HqSatSurveyQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 新增问卷题目关联
|
||||
*
|
||||
* @param bo 问卷题目关联
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatSurveyQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 修改问卷题目关联
|
||||
*
|
||||
* @param bo 问卷题目关联
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatSurveyQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除问卷题目关联信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 获取问卷关联的题目详情列表（包含题目详细信息）
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 题目详情列表
|
||||
*/
|
||||
List<HqSatSurveyQuestionVo> getSurveyQuestionsWithDetail(Long surveyId);
|
||||
}
|
||||
-136
@@ -1,136 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
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 wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IHqSatSurveyService {
|
||||
|
||||
/**
|
||||
* 查询问卷
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 问卷
|
||||
*/
|
||||
HqSatSurveyVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询问卷列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 问卷分页列表
|
||||
*/
|
||||
TableDataInfo<HqSatSurveyVo> queryPageList(HqSatSurveyBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的问卷列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 问卷列表
|
||||
*/
|
||||
List<HqSatSurveyVo> queryList(HqSatSurveyBo bo);
|
||||
|
||||
/**
|
||||
* 新增问卷
|
||||
*
|
||||
* @param bo 问卷
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(HqSatSurveyBo bo);
|
||||
|
||||
/**
|
||||
* 修改问卷
|
||||
*
|
||||
* @param bo 问卷
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(HqSatSurveyBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除问卷信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 获取问卷关联的题目列表
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 题目列表
|
||||
*/
|
||||
List<HqSatSurveyQuestionVo> getSurveyQuestions(Long surveyId);
|
||||
|
||||
/**
|
||||
* 批量更新问卷题目关联
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @param questions 题目列表
|
||||
* @return 是否更新成功
|
||||
*/
|
||||
Boolean updateSurveyQuestions(Long surveyId, List<Object> questions);
|
||||
|
||||
/**
|
||||
* 发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
* @return 是否发布成功
|
||||
*/
|
||||
Boolean publishSurvey(Long id);
|
||||
|
||||
/**
|
||||
* 撤销发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
* @return 是否撤销成功
|
||||
*/
|
||||
Boolean unpublishSurvey(Long id);
|
||||
|
||||
/**
|
||||
* 提交问卷答案
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
* @return 答题记录
|
||||
*/
|
||||
HqSatRecordVo submitSurveyAnswer(HqSatAnswerSubmitBo submitBo);
|
||||
|
||||
/**
|
||||
* 保存问卷答案草稿
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
* @return 答题记录
|
||||
*/
|
||||
HqSatRecordVo saveSurveyDraft(HqSatAnswerSubmitBo submitBo);
|
||||
|
||||
/**
|
||||
* 检查用户是否已答过问卷
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 是否已答过
|
||||
*/
|
||||
Boolean checkUserAnswered(Long surveyId);
|
||||
|
||||
/**
|
||||
* 获取用户问卷答题记录
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 答题记录
|
||||
*/
|
||||
HqSatRecordVo getUserSurveyAnswer(Long surveyId);
|
||||
}
|
||||
-76
@@ -1,76 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报修附件Service接口
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
public interface IPmRepairAttachmentService {
|
||||
|
||||
/**
|
||||
* 查询报修附件
|
||||
*/
|
||||
PmRepairAttachmentVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
TableDataInfo<PmRepairAttachmentVo> queryPageList(PmRepairAttachmentBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
List<PmRepairAttachmentVo> queryList(PmRepairAttachmentBo bo);
|
||||
|
||||
/**
|
||||
* 根据工单ID查询附件列表
|
||||
*/
|
||||
List<PmRepairAttachmentVo> queryByOrderId(Long orderId);
|
||||
|
||||
/**
|
||||
* 新增报修附件
|
||||
*/
|
||||
Boolean insertByBo(PmRepairAttachmentBo bo);
|
||||
|
||||
/**
|
||||
* 修改报修附件
|
||||
*/
|
||||
Boolean updateByBo(PmRepairAttachmentBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除报修附件信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 上传附件文件
|
||||
*/
|
||||
PmRepairAttachmentVo uploadFile(Long orderId, String uploadStage, MultipartFile file, String description);
|
||||
|
||||
/**
|
||||
* 批量上传附件文件
|
||||
*/
|
||||
List<PmRepairAttachmentVo> uploadFiles(Long orderId, String uploadStage, MultipartFile[] files,
|
||||
List<String> descriptions);
|
||||
|
||||
/**
|
||||
* 删除附件文件（包括物理文件和数据库记录）
|
||||
*/
|
||||
Boolean deleteAttachment(Long id);
|
||||
|
||||
/**
|
||||
* 更新工单的附件数量
|
||||
*/
|
||||
void updateOrderAttachmentCount(Long orderId);
|
||||
|
||||
}
|
||||
-84
@@ -1,84 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo;
|
||||
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 Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
public interface IPmRepairCategoryService {
|
||||
|
||||
/**
|
||||
* 查询维修类型
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 维修类型
|
||||
*/
|
||||
PmRepairCategoryVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询维修类型列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 维修类型分页列表
|
||||
*/
|
||||
TableDataInfo<PmRepairCategoryVo> queryPageList(PmRepairCategoryBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的维修类型列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 维修类型列表
|
||||
*/
|
||||
List<PmRepairCategoryVo> queryList(PmRepairCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 新增维修类型
|
||||
*
|
||||
* @param bo 维修类型
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(PmRepairCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 修改维修类型
|
||||
*
|
||||
* @param bo 维修类型
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PmRepairCategoryBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除维修类型信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 获取维修类型树形结构
|
||||
*
|
||||
* @return 维修类型树形列表
|
||||
*/
|
||||
List<PmRepairCategoryVo> queryTree();
|
||||
|
||||
/**
|
||||
* 更新使用次数
|
||||
*
|
||||
* @param categoryId 类型ID
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean updateUsageCount(Long categoryId);
|
||||
|
||||
}
|
||||
-168
@@ -1,168 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service;
|
||||
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo;
|
||||
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 Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
public interface IPmRepairOrderService {
|
||||
|
||||
/**
|
||||
* 查询报修工单
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 报修工单
|
||||
*/
|
||||
PmRepairOrderVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询报修工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 报修工单分页列表
|
||||
*/
|
||||
TableDataInfo<PmRepairOrderVo> queryPageList(PmRepairOrderBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的报修工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 报修工单列表
|
||||
*/
|
||||
List<PmRepairOrderVo> queryList(PmRepairOrderBo bo);
|
||||
|
||||
/**
|
||||
* 新增报修工单
|
||||
*
|
||||
* @param bo 报修工单
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(PmRepairOrderBo bo);
|
||||
|
||||
/**
|
||||
* 修改报修工单
|
||||
*
|
||||
* @param bo 报修工单
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PmRepairOrderBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除报修工单信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 分派工单
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @param assigneeId 维修员ID
|
||||
* @param assignRemark 分派备注
|
||||
* @return 是否分派成功
|
||||
*/
|
||||
Boolean assignOrder(Long orderId, Long assigneeId, String assignRemark);
|
||||
|
||||
/**
|
||||
* 开始维修
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean startRepair(Long orderId);
|
||||
|
||||
/**
|
||||
* 完成维修
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @param repairResult 维修结果
|
||||
* @param usedMaterials 使用材料
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean finishRepair(Long orderId, String repairResult, String usedMaterials);
|
||||
|
||||
/**
|
||||
* 取消工单
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @param cancelReason 取消原因
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean cancelOrder(Long orderId, String cancelReason);
|
||||
|
||||
/**
|
||||
* 生成工单编号
|
||||
*
|
||||
* @return 工单编号
|
||||
*/
|
||||
String generateOrderNo();
|
||||
|
||||
/**
|
||||
* 获取维修人员选项
|
||||
* 返回拥有"维修人员"角色的用户列表
|
||||
*
|
||||
* @return 维修人员选项列表
|
||||
*/
|
||||
List<java.util.Map<String, Object>> getMaintenanceWorkers();
|
||||
|
||||
/**
|
||||
* 更新维修进度
|
||||
* 同时处理工单状态自动流转：首次更新进度时将状态从"已分派"改为"进行中"
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @param progressData 进度数据
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean updateProgress(Long orderId, java.util.Map<String, Object> progressData);
|
||||
|
||||
/**
|
||||
* 获取工单进度列表
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @return 进度记录列表
|
||||
*/
|
||||
List<java.util.Map<String, Object>> getRepairProgress(Long orderId);
|
||||
|
||||
/**
|
||||
* 完成工单（详细版）
|
||||
* 支持详细的完成信息，将工单状态从"进行中"改为"已完成"
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @param repairResult 维修结果
|
||||
* @param usedMaterials 使用材料
|
||||
* @param followSuggestions 后续建议
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean completeOrder(Long orderId, String repairResult, String usedMaterials, String followSuggestions);
|
||||
|
||||
/**
|
||||
* 创建服务评价
|
||||
* 保存服务评价数据并将工单状态从"已完成"更新为"已评价"
|
||||
*
|
||||
* @param evaluationData 评价数据
|
||||
* @return 是否成功
|
||||
*/
|
||||
Boolean createServiceEvaluation(java.util.Map<String, Object> evaluationData);
|
||||
|
||||
/**
|
||||
* 获取工单的服务评价
|
||||
*
|
||||
* @param orderId 工单ID
|
||||
* @return 服务评价数据
|
||||
*/
|
||||
java.util.Map<String, Object> getServiceEvaluation(Long orderId);
|
||||
|
||||
}
|
||||
-133
@@ -1,133 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo;
|
||||
import org.dromara.zhxy.hq.domain.HqHallInfo;
|
||||
import org.dromara.zhxy.hq.mapper.HqHallInfoMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqHallInfoService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 报告厅信息Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqHallInfoServiceImpl implements IHqHallInfoService {
|
||||
|
||||
private final HqHallInfoMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询报告厅信息
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 报告厅信息
|
||||
*/
|
||||
@Override
|
||||
public HqHallInfoVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询报告厅信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 报告厅信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqHallInfoVo> queryPageList(HqHallInfoBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqHallInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<HqHallInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的报告厅信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 报告厅信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqHallInfoVo> queryList(HqHallInfoBo bo) {
|
||||
LambdaQueryWrapper<HqHallInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqHallInfo> buildQueryWrapper(HqHallInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqHallInfo> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByDesc(HqHallInfo::getCreateTime);
|
||||
lqw.like(StringUtils.isNotBlank(bo.getHallName()), HqHallInfo::getHallName, bo.getHallName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getHallStatus()), HqHallInfo::getHallStatus, bo.getHallStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报告厅信息
|
||||
*
|
||||
* @param bo 报告厅信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqHallInfoBo bo) {
|
||||
HqHallInfo add = MapstructUtils.convert(bo, HqHallInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报告厅信息
|
||||
*
|
||||
* @param bo 报告厅信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqHallInfoBo bo) {
|
||||
HqHallInfo update = MapstructUtils.convert(bo, HqHallInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqHallInfo entity) {
|
||||
// TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除报告厅信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
// TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-226
@@ -1,226 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo;
|
||||
import org.dromara.zhxy.hq.domain.HqHallReservation;
|
||||
import org.dromara.zhxy.hq.mapper.HqHallReservationMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqHallReservationService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.util.Date;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
|
||||
/**
|
||||
* 报告厅预约Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-23
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqHallReservationServiceImpl implements IHqHallReservationService {
|
||||
|
||||
private final HqHallReservationMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询报告厅预约
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 报告厅预约
|
||||
*/
|
||||
@Override
|
||||
public HqHallReservationVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询报告厅预约列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 报告厅预约分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqHallReservationVo> queryPageList(HqHallReservationBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqHallReservation> lqw = buildQueryWrapper(bo);
|
||||
Page<HqHallReservationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的报告厅预约列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 报告厅预约列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqHallReservationVo> queryList(HqHallReservationBo bo) {
|
||||
LambdaQueryWrapper<HqHallReservation> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqHallReservation> buildQueryWrapper(HqHallReservationBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqHallReservation> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByDesc(HqHallReservation::getCreateTime);
|
||||
|
||||
// 调试日志：记录查询条件
|
||||
log.info("报告厅预约查询条件 - applicantId: {}, hallId: {}, hallName: {}, status: {}",
|
||||
bo.getApplicantId(), bo.getHallId(), bo.getHallName(), bo.getStatus());
|
||||
lqw.eq(bo.getHallId() != null, HqHallReservation::getHallId, bo.getHallId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getHallName()), HqHallReservation::getHallName, bo.getHallName());
|
||||
|
||||
// 处理时间查询参数：优先使用字符串格式的时间参数
|
||||
Date startTimeQuery = null;
|
||||
Date endTimeQuery = null;
|
||||
|
||||
// 如果有字符串格式的时间参数，优先使用
|
||||
if (StringUtils.isNotBlank(bo.getStartTimeStr())) {
|
||||
startTimeQuery = parseDateTime(bo.getStartTimeStr());
|
||||
} else if (bo.getStartTime() != null) {
|
||||
startTimeQuery = bo.getStartTime();
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(bo.getEndTimeStr())) {
|
||||
endTimeQuery = parseDateTime(bo.getEndTimeStr());
|
||||
} else if (bo.getEndTime() != null) {
|
||||
endTimeQuery = bo.getEndTime();
|
||||
}
|
||||
|
||||
// 时间范围查询逻辑：
|
||||
// 如果用户选择了开始时间，查找预约开始时间 >= 用户选择时间的记录
|
||||
// 这样查询出的记录的开始时间都会比用户选择的时间晚或相等（用户选择的时间比数据库中的早）
|
||||
lqw.ge(startTimeQuery != null, HqHallReservation::getStartTime, startTimeQuery);
|
||||
|
||||
// 如果用户选择了结束时间，查找预约结束时间 <= 用户选择时间的记录
|
||||
// 这样查询出的记录的结束时间都会比用户选择的时间早或相等（用户选择的时间比数据库中的晚）
|
||||
lqw.le(endTimeQuery != null, HqHallReservation::getEndTime, endTimeQuery);
|
||||
|
||||
lqw.eq(bo.getApplicantId() != null, HqHallReservation::getApplicantId, bo.getApplicantId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), HqHallReservation::getApplicantName,
|
||||
bo.getApplicantName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqHallReservation::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期时间字符串
|
||||
*/
|
||||
private Date parseDateTime(String dateTimeStr) {
|
||||
if (StringUtils.isBlank(dateTimeStr)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
return sdf.parse(dateTimeStr);
|
||||
} catch (ParseException e) {
|
||||
log.warn("日期格式解析失败: {}", dateTimeStr, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报告厅预约
|
||||
*
|
||||
* @param bo 报告厅预约
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqHallReservationBo bo) {
|
||||
HqHallReservation add = MapstructUtils.convert(bo, HqHallReservation.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报告厅预约
|
||||
*
|
||||
* @param bo 报告厅预约
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqHallReservationBo bo) {
|
||||
HqHallReservation update = MapstructUtils.convert(bo, HqHallReservation.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqHallReservation entity) {
|
||||
// TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除报告厅预约信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
// TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量审核报告厅预约
|
||||
*
|
||||
* @param auditBo 审核信息
|
||||
* @return 是否审核成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean auditByIds(HqHallReservationAuditBo auditBo) {
|
||||
log.info("开始审核报告厅预约，审核信息：{}", auditBo);
|
||||
|
||||
// 获取当前用户ID作为审核人
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
String currentUserName = LoginHelper.getLoginUser().getNickname();
|
||||
Date auditTime = new Date();
|
||||
|
||||
// 构建更新条件
|
||||
List<HqHallReservation> updateList = auditBo.getIds().stream()
|
||||
.map(id -> {
|
||||
HqHallReservation entity = new HqHallReservation();
|
||||
entity.setId(id);
|
||||
entity.setStatus(auditBo.getStatus());
|
||||
entity.setAuditBy(currentUserId);
|
||||
entity.setAuditName(currentUserName);
|
||||
entity.setAuditTime(auditTime);
|
||||
entity.setAuditRemark(auditBo.getAuditRemark());
|
||||
return entity;
|
||||
})
|
||||
.toList();
|
||||
|
||||
// 批量更新
|
||||
boolean result = baseMapper.updateBatchById(updateList);
|
||||
|
||||
log.info("审核完成，审核状态：{}，影响记录数：{}", auditBo.getStatus(), updateList.size());
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
-137
@@ -1,137 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatCategory;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatCategoryMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatCategoryService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 题目分类Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatCategoryServiceImpl implements IHqSatCategoryService {
|
||||
|
||||
private final HqSatCategoryMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询题目分类
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 题目分类
|
||||
*/
|
||||
@Override
|
||||
public HqSatCategoryVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询题目分类列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 题目分类分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatCategoryVo> queryPageList(HqSatCategoryBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatCategory> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的题目分类列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 题目分类列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatCategoryVo> queryList(HqSatCategoryBo bo) {
|
||||
LambdaQueryWrapper<HqSatCategory> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatCategory> buildQueryWrapper(HqSatCategoryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatCategory> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatCategory::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatCategory::getDeleted, bo.getDeleted());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCategoryCode()), HqSatCategory::getCategoryCode, bo.getCategoryCode());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), HqSatCategory::getCategoryName, bo.getCategoryName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCategoryDesc()), HqSatCategory::getCategoryDesc, bo.getCategoryDesc());
|
||||
lqw.eq(bo.getSortOrder() != null, HqSatCategory::getSortOrder, bo.getSortOrder());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatCategory::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增题目分类
|
||||
*
|
||||
* @param bo 题目分类
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatCategoryBo bo) {
|
||||
HqSatCategory add = MapstructUtils.convert(bo, HqSatCategory.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改题目分类
|
||||
*
|
||||
* @param bo 题目分类
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatCategoryBo bo) {
|
||||
HqSatCategory update = MapstructUtils.convert(bo, HqSatCategory.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatCategory entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除题目分类信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-135
@@ -1,135 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatDetail;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatDetailMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatDetailService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 答题详情Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatDetailServiceImpl implements IHqSatDetailService {
|
||||
|
||||
private final HqSatDetailMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询答题详情
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 答题详情
|
||||
*/
|
||||
@Override
|
||||
public HqSatDetailVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询答题详情列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 答题详情分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatDetailVo> queryPageList(HqSatDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatDetail> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的答题详情列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 答题详情列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatDetailVo> queryList(HqSatDetailBo bo) {
|
||||
LambdaQueryWrapper<HqSatDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatDetail> buildQueryWrapper(HqSatDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatDetail::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatDetail::getDeleted, bo.getDeleted());
|
||||
lqw.eq(bo.getRecordId() != null, HqSatDetail::getRecordId, bo.getRecordId());
|
||||
lqw.eq(bo.getQuestionId() != null, HqSatDetail::getQuestionId, bo.getQuestionId());
|
||||
lqw.eq(bo.getAnswerScore() != null, HqSatDetail::getAnswerScore, bo.getAnswerScore());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增答题详情
|
||||
*
|
||||
* @param bo 答题详情
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatDetailBo bo) {
|
||||
HqSatDetail add = MapstructUtils.convert(bo, HqSatDetail.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改答题详情
|
||||
*
|
||||
* @param bo 答题详情
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatDetailBo bo) {
|
||||
HqSatDetail update = MapstructUtils.convert(bo, HqSatDetail.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatDetail entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除答题详情信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-136
@@ -1,136 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatOption;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatOptionMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatOptionService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 评分选项Service业务层处理
|
||||
*
|
||||
* @author Lion Li
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatOptionServiceImpl implements IHqSatOptionService {
|
||||
|
||||
private final HqSatOptionMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询评分选项
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 评分选项
|
||||
*/
|
||||
@Override
|
||||
public HqSatOptionVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询评分选项列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 评分选项分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatOptionVo> queryPageList(HqSatOptionBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatOption> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatOptionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的评分选项列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 评分选项列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatOptionVo> queryList(HqSatOptionBo bo) {
|
||||
LambdaQueryWrapper<HqSatOption> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatOption> buildQueryWrapper(HqSatOptionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatOption> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatOption::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatOption::getDeleted, bo.getDeleted());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOptionText()), HqSatOption::getOptionText, bo.getOptionText());
|
||||
lqw.eq(bo.getOptionValue() != null, HqSatOption::getOptionValue, bo.getOptionValue());
|
||||
lqw.eq(bo.getSortOrder() != null, HqSatOption::getSortOrder, bo.getSortOrder());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatOption::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增评分选项
|
||||
*
|
||||
* @param bo 评分选项
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatOptionBo bo) {
|
||||
HqSatOption add = MapstructUtils.convert(bo, HqSatOption.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改评分选项
|
||||
*
|
||||
* @param bo 评分选项
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatOptionBo bo) {
|
||||
HqSatOption update = MapstructUtils.convert(bo, HqSatOption.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatOption entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除评分选项信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-139
@@ -1,139 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatQuestion;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatQuestionMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatQuestionService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 题库Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatQuestionServiceImpl implements IHqSatQuestionService {
|
||||
|
||||
private final HqSatQuestionMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询题库
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 题库
|
||||
*/
|
||||
@Override
|
||||
public HqSatQuestionVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询题库列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 题库分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatQuestionVo> queryPageList(HqSatQuestionBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatQuestion> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatQuestionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的题库列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 题库列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatQuestionVo> queryList(HqSatQuestionBo bo) {
|
||||
LambdaQueryWrapper<HqSatQuestion> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatQuestion> buildQueryWrapper(HqSatQuestionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatQuestion> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatQuestion::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatQuestion::getDeleted, bo.getDeleted());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQuestionTitle()), HqSatQuestion::getQuestionTitle, bo.getQuestionTitle());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQuestionContent()), HqSatQuestion::getQuestionContent, bo.getQuestionContent());
|
||||
lqw.eq(bo.getCategoryId() != null, HqSatQuestion::getCategoryId, bo.getCategoryId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQuestionType()), HqSatQuestion::getQuestionType, bo.getQuestionType());
|
||||
lqw.eq(bo.getIsRequired() != null, HqSatQuestion::getIsRequired, bo.getIsRequired());
|
||||
lqw.eq(bo.getSortOrder() != null, HqSatQuestion::getSortOrder, bo.getSortOrder());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatQuestion::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增题库
|
||||
*
|
||||
* @param bo 题库
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatQuestionBo bo) {
|
||||
HqSatQuestion add = MapstructUtils.convert(bo, HqSatQuestion.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改题库
|
||||
*
|
||||
* @param bo 题库
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatQuestionBo bo) {
|
||||
HqSatQuestion update = MapstructUtils.convert(bo, HqSatQuestion.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatQuestion entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除题库信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-139
@@ -1,139 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatRecord;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatRecordMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatRecordService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 答题记录Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatRecordServiceImpl implements IHqSatRecordService {
|
||||
|
||||
private final HqSatRecordMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询答题记录
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 答题记录
|
||||
*/
|
||||
@Override
|
||||
public HqSatRecordVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询答题记录列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 答题记录分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatRecordVo> queryPageList(HqSatRecordBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatRecord> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的答题记录列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 答题记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatRecordVo> queryList(HqSatRecordBo bo) {
|
||||
LambdaQueryWrapper<HqSatRecord> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatRecord> buildQueryWrapper(HqSatRecordBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatRecord> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatRecord::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatRecord::getDeleted, bo.getDeleted());
|
||||
lqw.eq(bo.getSurveyId() != null, HqSatRecord::getSurveyId, bo.getSurveyId());
|
||||
lqw.eq(bo.getUserId() != null, HqSatRecord::getUserId, bo.getUserId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUserType()), HqSatRecord::getUserType, bo.getUserType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUserDept()), HqSatRecord::getUserDept, bo.getUserDept());
|
||||
lqw.eq(bo.getSubmitTime() != null, HqSatRecord::getSubmitTime, bo.getSubmitTime());
|
||||
lqw.eq(bo.getTotalScore() != null, HqSatRecord::getTotalScore, bo.getTotalScore());
|
||||
lqw.eq(bo.getAvgScore() != null, HqSatRecord::getAvgScore, bo.getAvgScore());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增答题记录
|
||||
*
|
||||
* @param bo 答题记录
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatRecordBo bo) {
|
||||
HqSatRecord add = MapstructUtils.convert(bo, HqSatRecord.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改答题记录
|
||||
*
|
||||
* @param bo 答题记录
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatRecordBo bo) {
|
||||
HqSatRecord update = MapstructUtils.convert(bo, HqSatRecord.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatRecord entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除答题记录信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
-148
@@ -1,148 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatSurveyQuestionMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 问卷题目关联Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatSurveyQuestionServiceImpl implements IHqSatSurveyQuestionService {
|
||||
|
||||
private final HqSatSurveyQuestionMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询问卷题目关联
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 问卷题目关联
|
||||
*/
|
||||
@Override
|
||||
public HqSatSurveyQuestionVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询问卷题目关联列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 问卷题目关联分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatSurveyQuestionVo> queryPageList(HqSatSurveyQuestionBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatSurveyQuestion> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatSurveyQuestionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的问卷题目关联列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 问卷题目关联列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatSurveyQuestionVo> queryList(HqSatSurveyQuestionBo bo) {
|
||||
LambdaQueryWrapper<HqSatSurveyQuestion> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatSurveyQuestion> buildQueryWrapper(HqSatSurveyQuestionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatSurveyQuestion> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatSurveyQuestion::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatSurveyQuestion::getDeleted, bo.getDeleted());
|
||||
lqw.eq(bo.getSurveyId() != null, HqSatSurveyQuestion::getSurveyId, bo.getSurveyId());
|
||||
lqw.eq(bo.getQuestionId() != null, HqSatSurveyQuestion::getQuestionId, bo.getQuestionId());
|
||||
lqw.eq(bo.getSortOrder() != null, HqSatSurveyQuestion::getSortOrder, bo.getSortOrder());
|
||||
lqw.eq(bo.getWeight() != null, HqSatSurveyQuestion::getWeight, bo.getWeight());
|
||||
lqw.eq(bo.getIsRequired() != null, HqSatSurveyQuestion::getIsRequired, bo.getIsRequired());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问卷题目关联
|
||||
*
|
||||
* @param bo 问卷题目关联
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatSurveyQuestionBo bo) {
|
||||
HqSatSurveyQuestion add = MapstructUtils.convert(bo, HqSatSurveyQuestion.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改问卷题目关联
|
||||
*
|
||||
* @param bo 问卷题目关联
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatSurveyQuestionBo bo) {
|
||||
HqSatSurveyQuestion update = MapstructUtils.convert(bo, HqSatSurveyQuestion.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatSurveyQuestion entity) {
|
||||
// TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除问卷题目关联信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
// TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取问卷关联的题目详情列表（包含题目详细信息）
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 题目详情列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatSurveyQuestionVo> getSurveyQuestionsWithDetail(Long surveyId) {
|
||||
return baseMapper.selectSurveyQuestionsWithDetail(surveyId);
|
||||
}
|
||||
}
|
||||
-938
@@ -1,938 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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 cn.hutool.core.collection.CollUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo;
|
||||
import org.dromara.zhxy.hq.domain.HqSatSurvey;
|
||||
import org.dromara.zhxy.hq.mapper.HqSatSurveyMapper;
|
||||
import org.dromara.zhxy.hq.service.IHqSatSurveyService;
|
||||
import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService;
|
||||
import org.dromara.zhxy.hq.service.IHqSatRecordService;
|
||||
import org.dromara.zhxy.hq.service.IHqSatDetailService;
|
||||
import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo;
|
||||
import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
/**
|
||||
* 问卷Service业务层处理
|
||||
*
|
||||
* @author wuzilong
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class HqSatSurveyServiceImpl implements IHqSatSurveyService {
|
||||
|
||||
private final HqSatSurveyMapper baseMapper;
|
||||
private final IHqSatSurveyQuestionService surveyQuestionService;
|
||||
private final IHqSatRecordService recordService;
|
||||
private final IHqSatDetailService detailService;
|
||||
|
||||
@Autowired
|
||||
private JdbcTemplate jdbcTemplate;
|
||||
|
||||
/**
|
||||
* 查询问卷
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 问卷
|
||||
*/
|
||||
@Override
|
||||
public HqSatSurveyVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询问卷列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 问卷分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<HqSatSurveyVo> queryPageList(HqSatSurveyBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<HqSatSurvey> lqw = buildQueryWrapper(bo);
|
||||
Page<HqSatSurveyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的问卷列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 问卷列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatSurveyVo> queryList(HqSatSurveyBo bo) {
|
||||
LambdaQueryWrapper<HqSatSurvey> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<HqSatSurvey> buildQueryWrapper(HqSatSurveyBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<HqSatSurvey> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(HqSatSurvey::getId);
|
||||
lqw.eq(bo.getDeleted() != null, HqSatSurvey::getDeleted, bo.getDeleted());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurveyCode()), HqSatSurvey::getSurveyCode, bo.getSurveyCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurveyTitle()), HqSatSurvey::getSurveyTitle, bo.getSurveyTitle());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurveyDesc()), HqSatSurvey::getSurveyDesc, bo.getSurveyDesc());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurveyInstruction()), HqSatSurvey::getSurveyInstruction,
|
||||
bo.getSurveyInstruction());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTargetGroup()), HqSatSurvey::getTargetGroup, bo.getTargetGroup());
|
||||
lqw.eq(bo.getStartTime() != null, HqSatSurvey::getStartTime, bo.getStartTime());
|
||||
lqw.eq(bo.getEndTime() != null, HqSatSurvey::getEndTime, bo.getEndTime());
|
||||
lqw.eq(bo.getMaxSubmitTimes() != null, HqSatSurvey::getMaxSubmitTimes, bo.getMaxSubmitTimes());
|
||||
lqw.eq(bo.getIsAnonymous() != null, HqSatSurvey::getIsAnonymous, bo.getIsAnonymous());
|
||||
lqw.eq(bo.getIsPublished() != null, HqSatSurvey::getIsPublished, bo.getIsPublished());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HqSatSurvey::getStatus, bo.getStatus());
|
||||
|
||||
// 添加目标群体IN查询（用于权限过滤）
|
||||
lqw.in(CollUtil.isNotEmpty(bo.getTargetGroupIn()), HqSatSurvey::getTargetGroup, bo.getTargetGroupIn());
|
||||
|
||||
// 添加状态IN查询（用于状态过滤）
|
||||
lqw.in(CollUtil.isNotEmpty(bo.getStatusIn()), HqSatSurvey::getStatus, bo.getStatusIn());
|
||||
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问卷
|
||||
*
|
||||
* @param bo 问卷
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(HqSatSurveyBo bo) {
|
||||
HqSatSurvey add = MapstructUtils.convert(bo, HqSatSurvey.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改问卷
|
||||
*
|
||||
* @param bo 问卷
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(HqSatSurveyBo bo) {
|
||||
HqSatSurvey update = MapstructUtils.convert(bo, HqSatSurvey.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(HqSatSurvey entity) {
|
||||
// TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除问卷信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
// TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取问卷关联的题目列表
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 题目列表
|
||||
*/
|
||||
@Override
|
||||
public List<HqSatSurveyQuestionVo> getSurveyQuestions(Long surveyId) {
|
||||
// 使用联表查询获取包含题目详细信息的数据
|
||||
return surveyQuestionService.getSurveyQuestionsWithDetail(surveyId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量更新问卷题目关联
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @param questions 题目列表
|
||||
* @return 是否更新成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateSurveyQuestions(Long surveyId, List<Object> questions) {
|
||||
// 先删除现有的关联
|
||||
HqSatSurveyQuestionBo deleteBo = new HqSatSurveyQuestionBo();
|
||||
deleteBo.setSurveyId(surveyId);
|
||||
List<HqSatSurveyQuestionVo> existingQuestions = surveyQuestionService.queryList(deleteBo);
|
||||
if (!existingQuestions.isEmpty()) {
|
||||
List<Long> existingIds = existingQuestions.stream().map(HqSatSurveyQuestionVo::getId).toList();
|
||||
surveyQuestionService.deleteWithValidByIds(existingIds, false);
|
||||
}
|
||||
|
||||
// 添加新的关联
|
||||
for (Object questionObj : questions) {
|
||||
if (questionObj instanceof Map<?, ?> questionMap) {
|
||||
HqSatSurveyQuestionBo insertBo = new HqSatSurveyQuestionBo();
|
||||
insertBo.setSurveyId(surveyId);
|
||||
insertBo.setQuestionId(Long.valueOf(questionMap.get("questionId").toString()));
|
||||
insertBo.setSortOrder(Long.valueOf(questionMap.get("sortOrder").toString()));
|
||||
insertBo.setWeight(
|
||||
questionMap.get("weight") != null ? Long.valueOf(questionMap.get("weight").toString()) : 1L);
|
||||
insertBo.setIsRequired(
|
||||
questionMap.get("isRequired") != null ? Long.valueOf(questionMap.get("isRequired").toString())
|
||||
: 0L);
|
||||
surveyQuestionService.insertByBo(insertBo);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
* @return 是否发布成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean publishSurvey(Long id) {
|
||||
HqSatSurvey survey = baseMapper.selectById(id);
|
||||
if (survey == null) {
|
||||
log.error("问卷不存在，问卷ID: {}", id);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查问卷状态是否允许发布
|
||||
if (!"0".equals(survey.getStatus())) {
|
||||
log.error("只有草稿状态的问卷才能发布，当前状态: {}", survey.getStatus());
|
||||
return false;
|
||||
}
|
||||
|
||||
// 更新发布状态和问卷状态
|
||||
HqSatSurvey updateSurvey = new HqSatSurvey();
|
||||
updateSurvey.setId(id);
|
||||
updateSurvey.setIsPublished(1L); // 发布状态为1
|
||||
updateSurvey.setStatus("1"); // 问卷状态为1（进行中）
|
||||
|
||||
boolean result = baseMapper.updateById(updateSurvey) > 0;
|
||||
if (result) {
|
||||
log.info("问卷发布成功，问卷ID: {}", id);
|
||||
} else {
|
||||
log.error("问卷发布失败，问卷ID: {}", id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销发布问卷
|
||||
*
|
||||
* @param id 问卷ID
|
||||
* @return 是否撤销成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean unpublishSurvey(Long id) {
|
||||
HqSatSurvey survey = baseMapper.selectById(id);
|
||||
if (survey == null) {
|
||||
log.error("问卷不存在，问卷ID: {}", id);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查问卷是否已发布
|
||||
if (survey.getIsPublished() == null || survey.getIsPublished() != 1L) {
|
||||
log.error("问卷未发布，无法撤销发布，问卷ID: {}", id);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 更新发布状态和问卷状态
|
||||
HqSatSurvey updateSurvey = new HqSatSurvey();
|
||||
updateSurvey.setId(id);
|
||||
updateSurvey.setIsPublished(0L); // 发布状态为0
|
||||
updateSurvey.setStatus("0"); // 问卷状态为0（草稿）
|
||||
|
||||
boolean result = baseMapper.updateById(updateSurvey) > 0;
|
||||
if (result) {
|
||||
log.info("问卷撤销发布成功，问卷ID: {}", id);
|
||||
} else {
|
||||
log.error("问卷撤销发布失败，问卷ID: {}", id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交问卷答案
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
* @return 答题记录
|
||||
*/
|
||||
@Override
|
||||
public HqSatRecordVo submitSurveyAnswer(HqSatAnswerSubmitBo submitBo) {
|
||||
log.info("=== 收到前端答题提交请求 ===");
|
||||
log.info("问卷ID: {}, 答案数量: {}", submitBo.getSurveyId(),
|
||||
submitBo.getAnswers() != null ? submitBo.getAnswers().size() : 0);
|
||||
|
||||
if (submitBo.getAnswers() != null) {
|
||||
for (int i = 0; i < submitBo.getAnswers().size(); i++) {
|
||||
HqSatAnswerSubmitBo.AnswerItem answer = submitBo.getAnswers().get(i);
|
||||
log.info("答案{}: 题目ID={}, 题目类型={}, 答案值={}, 选项数量={}",
|
||||
i + 1, answer.getQuestionId(), answer.getQuestionType(), answer.getAnswerValue(),
|
||||
answer.getOptions() != null ? answer.getOptions().size() : 0);
|
||||
|
||||
if (answer.getOptions() != null) {
|
||||
for (int j = 0; j < answer.getOptions().size(); j++) {
|
||||
HqSatAnswerSubmitBo.OptionDetail option = answer.getOptions().get(j);
|
||||
log.info(" 选项{}: ID={}, 值={}, 文本={}, 选中={}",
|
||||
j + 1, option.getOptionId(), option.getOptionValue(),
|
||||
option.getOptionText(), option.getIsSelected());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return saveAnswerInternal(submitBo, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存问卷答案草稿
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
* @return 答题记录
|
||||
*/
|
||||
@Override
|
||||
public HqSatRecordVo saveSurveyDraft(HqSatAnswerSubmitBo submitBo) {
|
||||
return saveAnswerInternal(submitBo, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* 内部方法：保存答题数据
|
||||
*
|
||||
* @param submitBo 答题提交数据
|
||||
* @param isDraft 是否为草稿
|
||||
* @return 答题记录
|
||||
*/
|
||||
private HqSatRecordVo saveAnswerInternal(HqSatAnswerSubmitBo submitBo, boolean isDraft) {
|
||||
// 验证问卷是否存在且可以答题
|
||||
HqSatSurveyVo survey = queryById(submitBo.getSurveyId());
|
||||
if (survey == null) {
|
||||
throw new ServiceException("问卷不存在");
|
||||
}
|
||||
|
||||
// 检查问卷状态
|
||||
if (!isDraft && !"1".equals(survey.getStatus())) {
|
||||
throw new ServiceException("问卷未在进行中状态，无法提交答案");
|
||||
}
|
||||
|
||||
// 获取当前用户信息
|
||||
Long userId = LoginHelper.getUserId();
|
||||
String userTypeString = LoginHelper.getLoginUser().getUserType();
|
||||
|
||||
// 将角色字符串转换为数字编码
|
||||
String userType = convertUserTypeToCode(userTypeString);
|
||||
|
||||
// 检查用户提交次数是否超过限制（非草稿模式下）
|
||||
if (!isDraft) {
|
||||
int submitCount = getUserSubmitCount(submitBo.getSurveyId(), userId);
|
||||
int maxSubmitTimes = survey.getMaxSubmitTimes() != null ? survey.getMaxSubmitTimes().intValue() : 1;
|
||||
|
||||
log.info("用户提交次数检查: 用户ID={}, 问卷ID={}, 已提交次数={}, 最大允许次数={}",
|
||||
userId, submitBo.getSurveyId(), submitCount, maxSubmitTimes);
|
||||
|
||||
// maxSubmitTimes为0表示不限制提交次数
|
||||
if (maxSubmitTimes > 0 && submitCount >= maxSubmitTimes) {
|
||||
throw new ServiceException("您已达到该问卷的最大提交次数限制（" + maxSubmitTimes + "次）");
|
||||
}
|
||||
}
|
||||
|
||||
// 在保存新答题数据之前，将用户之前的答题记录标记为已删除
|
||||
markPreviousAnswersAsDeleted(submitBo.getSurveyId(), userId);
|
||||
|
||||
// 创建答题记录
|
||||
HqSatRecordBo recordBo = new HqSatRecordBo();
|
||||
recordBo.setSurveyId(submitBo.getSurveyId());
|
||||
recordBo.setUserId(userId);
|
||||
recordBo.setUserType(userType);
|
||||
recordBo.setSubmitTime(new Date());
|
||||
recordBo.setTotalScore(0L); // 暂时设为0，后续可以计算
|
||||
recordBo.setAvgScore(0L);
|
||||
recordBo.setRemark(submitBo.getRemark());
|
||||
|
||||
// 保存答题记录
|
||||
boolean recordSaved = recordService.insertByBo(recordBo);
|
||||
if (!recordSaved) {
|
||||
throw new ServiceException("保存答题记录失败");
|
||||
}
|
||||
|
||||
// 保存答题详情
|
||||
for (HqSatAnswerSubmitBo.AnswerItem answerItem : submitBo.getAnswers()) {
|
||||
HqSatDetailBo detailBo = new HqSatDetailBo();
|
||||
detailBo.setRecordId(recordBo.getId());
|
||||
detailBo.setQuestionId(answerItem.getQuestionId());
|
||||
detailBo.setAnswerScore(0L); // 暂时设为0，后续可以计算分数
|
||||
|
||||
// 将答案内容临时存储在remark字段中
|
||||
String answerContent = buildAnswerContent(answerItem);
|
||||
detailBo.setRemark(answerContent);
|
||||
|
||||
boolean detailSaved = detailService.insertByBo(detailBo);
|
||||
if (!detailSaved) {
|
||||
log.error("保存答题详情失败，题目ID: {}", answerItem.getQuestionId());
|
||||
}
|
||||
|
||||
// 保存具体的答案信息到 hq_sat_answer 表
|
||||
saveAnswerDetails(recordBo.getId(), answerItem);
|
||||
}
|
||||
|
||||
// 返回答题记录
|
||||
return recordService.queryById(recordBo.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 将用户角色字符串转换为数字编码
|
||||
*
|
||||
* @param userTypeString 用户角色字符串
|
||||
* @return 数字编码字符串
|
||||
*/
|
||||
private String convertUserTypeToCode(String userTypeString) {
|
||||
if (userTypeString == null) {
|
||||
return "1"; // 默认为学生
|
||||
}
|
||||
|
||||
// 转换为小写进行比较
|
||||
String lowerCaseType = userTypeString.toLowerCase();
|
||||
|
||||
// 学生角色判断
|
||||
if (lowerCaseType.contains("student") || lowerCaseType.contains("学生") || lowerCaseType.contains("stu")) {
|
||||
return "1";
|
||||
}
|
||||
|
||||
// 教师角色判断
|
||||
if (lowerCaseType.contains("teacher") || lowerCaseType.contains("老师") ||
|
||||
lowerCaseType.contains("教师") || lowerCaseType.contains("教职工") || lowerCaseType.contains("tea")) {
|
||||
return "2";
|
||||
}
|
||||
|
||||
// 管理员角色判断
|
||||
if (lowerCaseType.contains("admin") || lowerCaseType.contains("管理员") ||
|
||||
lowerCaseType.contains("超级管理员") || lowerCaseType.contains("administrator")) {
|
||||
return "3";
|
||||
}
|
||||
|
||||
// 默认返回学生
|
||||
log.warn("未识别的用户角色类型: {}, 默认设置为学生角色", userTypeString);
|
||||
return "1";
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建答案内容字符串
|
||||
*
|
||||
* @param answerItem 答案项
|
||||
* @return 答案内容字符串
|
||||
*/
|
||||
private String buildAnswerContent(HqSatAnswerSubmitBo.AnswerItem answerItem) {
|
||||
StringBuilder content = new StringBuilder();
|
||||
content.append("题目类型:").append(answerItem.getQuestionType()).append(";");
|
||||
content.append("答案值:").append(answerItem.getAnswerValue()).append(";");
|
||||
|
||||
if (answerItem.getOptions() != null && !answerItem.getOptions().isEmpty()) {
|
||||
content.append("选项详情:");
|
||||
for (HqSatAnswerSubmitBo.OptionDetail option : answerItem.getOptions()) {
|
||||
if (Boolean.TRUE.equals(option.getIsSelected())) {
|
||||
content.append(option.getOptionValue()).append("(")
|
||||
.append(option.getOptionText()).append("),");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return content.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 将用户之前的答题记录标记为已删除
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @param userId 用户ID
|
||||
*/
|
||||
private void markPreviousAnswersAsDeleted(Long surveyId, Long userId) {
|
||||
try {
|
||||
log.info("=== 开始标记用户之前的答题记录为已删除 ===");
|
||||
log.info("问卷ID: {}, 用户ID: {}", surveyId, userId);
|
||||
|
||||
// 1. 查找该用户对该问卷的所有历史答题记录ID
|
||||
String findRecordsSql = """
|
||||
SELECT id FROM hq_sat_record
|
||||
WHERE survey_id = ? AND user_id = ? AND deleted = 0
|
||||
""";
|
||||
|
||||
List<Map<String, Object>> recordResults = jdbcTemplate.queryForList(findRecordsSql, surveyId, userId);
|
||||
|
||||
if (recordResults.isEmpty()) {
|
||||
log.info("用户没有历史答题记录，无需标记删除");
|
||||
return;
|
||||
}
|
||||
|
||||
log.info("找到 {} 条历史答题记录", recordResults.size());
|
||||
|
||||
// 2. 标记答题记录表为已删除
|
||||
String updateRecordSql = """
|
||||
UPDATE hq_sat_record
|
||||
SET deleted = 1, update_by = ?, update_time = NOW()
|
||||
WHERE survey_id = ? AND user_id = ? AND deleted = 0
|
||||
""";
|
||||
|
||||
int recordUpdated = jdbcTemplate.update(updateRecordSql,
|
||||
LoginHelper.getUserId(), surveyId, userId);
|
||||
log.info("标记答题记录为已删除，影响行数: {}", recordUpdated);
|
||||
|
||||
// 3. 标记答题详情表为已删除（通过record_id关联）
|
||||
for (Map<String, Object> record : recordResults) {
|
||||
Long recordId = Long.valueOf(record.get("id").toString());
|
||||
|
||||
String updateDetailSql = """
|
||||
UPDATE hq_sat_detail
|
||||
SET deleted = 1, update_by = ?, update_time = NOW()
|
||||
WHERE record_id = ? AND deleted = 0
|
||||
""";
|
||||
|
||||
int detailUpdated = jdbcTemplate.update(updateDetailSql,
|
||||
LoginHelper.getUserId(), recordId);
|
||||
log.info("标记答题详情为已删除，记录ID: {}, 影响行数: {}", recordId, detailUpdated);
|
||||
|
||||
// 4. 标记答案表为已删除（通过record_id关联）
|
||||
String updateAnswerSql = """
|
||||
UPDATE hq_sat_answer
|
||||
SET deleted = 1, update_by = ?, update_time = NOW()
|
||||
WHERE record_id = ? AND deleted = 0
|
||||
""";
|
||||
|
||||
int answerUpdated = jdbcTemplate.update(updateAnswerSql,
|
||||
LoginHelper.getUserId(), recordId);
|
||||
log.info("标记答案数据为已删除，记录ID: {}, 影响行数: {}", recordId, answerUpdated);
|
||||
}
|
||||
|
||||
log.info("=== 用户历史答题记录标记删除完成 ===");
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("标记用户历史答题记录为已删除失败，问卷ID: {}, 用户ID: {}, 错误详情: {}",
|
||||
surveyId, userId, e.getMessage(), e);
|
||||
// 这里不抛出异常，避免影响新答题数据的保存
|
||||
log.warn("历史数据删除失败不影响新答题数据保存，继续执行后续流程");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查用户是否已答过问卷
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 是否已答过
|
||||
*/
|
||||
@Override
|
||||
public Boolean checkUserAnswered(Long surveyId) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
return getUserSubmitCount(surveyId, userId) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户对指定问卷的提交次数（只统计未删除的记录）
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @param userId 用户ID
|
||||
* @return 提交次数
|
||||
*/
|
||||
private int getUserSubmitCount(Long surveyId, Long userId) {
|
||||
try {
|
||||
// 使用SQL直接查询，确保只统计未删除的记录
|
||||
String countSql = """
|
||||
SELECT COUNT(*) FROM hq_sat_record
|
||||
WHERE survey_id = ? AND user_id = ? AND deleted = 0
|
||||
""";
|
||||
|
||||
Integer count = jdbcTemplate.queryForObject(countSql, Integer.class, surveyId, userId);
|
||||
int submitCount = count != null ? count : 0;
|
||||
|
||||
log.debug("用户{}对问卷{}的有效提交次数: {}", userId, surveyId, submitCount);
|
||||
return submitCount;
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("查询用户提交次数失败，问卷ID: {}, 用户ID: {}, 错误: {}",
|
||||
surveyId, userId, e.getMessage(), e);
|
||||
|
||||
// 发生异常时使用原有方式查询作为降级方案
|
||||
log.warn("使用降级方案查询提交次数");
|
||||
HqSatRecordBo queryBo = new HqSatRecordBo();
|
||||
queryBo.setSurveyId(surveyId);
|
||||
queryBo.setUserId(userId);
|
||||
|
||||
List<HqSatRecordVo> records = recordService.queryList(queryBo);
|
||||
int count = records.size();
|
||||
|
||||
log.debug("降级方案统计用户{}对问卷{}的提交次数: {}", userId, surveyId, count);
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户问卷答题记录（只返回未删除的最新记录）
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
* @return 答题记录（包含答题详情）
|
||||
*/
|
||||
@Override
|
||||
public HqSatRecordVo getUserSurveyAnswer(Long surveyId) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
HqSatRecordVo record = null;
|
||||
|
||||
try {
|
||||
// 使用SQL直接查询，确保只获取未删除的最新记录
|
||||
String findLatestRecordSql = """
|
||||
SELECT * FROM hq_sat_record
|
||||
WHERE survey_id = ? AND user_id = ? AND deleted = 0
|
||||
ORDER BY create_time DESC
|
||||
LIMIT 1
|
||||
""";
|
||||
|
||||
List<Map<String, Object>> recordResults = jdbcTemplate.queryForList(findLatestRecordSql, surveyId, userId);
|
||||
|
||||
if (recordResults.isEmpty()) {
|
||||
throw new ServiceException("未找到有效的答题记录", 404);
|
||||
}
|
||||
|
||||
Map<String, Object> recordMap = recordResults.get(0);
|
||||
Long recordId = Long.valueOf(recordMap.get("id").toString());
|
||||
|
||||
log.info("找到用户最新有效答题记录，记录ID: {}", recordId);
|
||||
|
||||
// 通过recordId获取完整的记录对象
|
||||
record = recordService.queryById(recordId);
|
||||
if (record == null) {
|
||||
throw new ServiceException("答题记录数据异常", 500);
|
||||
}
|
||||
|
||||
} catch (ServiceException e) {
|
||||
throw e; // 重新抛出业务异常
|
||||
} catch (Exception e) {
|
||||
log.error("查询用户答题记录失败，使用降级方案，问卷ID: {}, 用户ID: {}, 错误: {}",
|
||||
surveyId, userId, e.getMessage(), e);
|
||||
|
||||
// 降级方案：使用原有方式查询
|
||||
HqSatRecordBo queryBo = new HqSatRecordBo();
|
||||
queryBo.setSurveyId(surveyId);
|
||||
queryBo.setUserId(userId);
|
||||
|
||||
List<HqSatRecordVo> records = recordService.queryList(queryBo);
|
||||
if (records.isEmpty()) {
|
||||
throw new ServiceException("未找到答题记录", 404);
|
||||
}
|
||||
|
||||
// 获取最新的一条记录
|
||||
record = records.get(0);
|
||||
}
|
||||
|
||||
// 直接从 hq_sat_answer 表查询答案详情（更准确的数据源）
|
||||
List<Map<String, Object>> answers = getAnswersFromSatAnswerTable(record.getId());
|
||||
log.debug("从 hq_sat_answer 表查询到答案记录数: {}", answers.size());
|
||||
|
||||
// 构造包含答案详情的记录对象
|
||||
HqSatRecordVo recordWithAnswers = new HqSatRecordVo();
|
||||
recordWithAnswers.setId(record.getId());
|
||||
recordWithAnswers.setSurveyId(record.getSurveyId());
|
||||
recordWithAnswers.setUserId(record.getUserId());
|
||||
recordWithAnswers.setUserType(record.getUserType());
|
||||
recordWithAnswers.setUserDept(record.getUserDept());
|
||||
recordWithAnswers.setSubmitTime(record.getSubmitTime());
|
||||
recordWithAnswers.setTotalScore(record.getTotalScore());
|
||||
recordWithAnswers.setAvgScore(record.getAvgScore());
|
||||
recordWithAnswers.setRemark(record.getRemark());
|
||||
|
||||
// 将answers数组作为扩展属性设置到记录对象
|
||||
// 由于HqSatRecordVo没有answers字段，我们使用一个包装类
|
||||
ExtendedSatRecordVo extendedRecord = new ExtendedSatRecordVo();
|
||||
extendedRecord.setRecord(recordWithAnswers);
|
||||
extendedRecord.setAnswers(answers);
|
||||
|
||||
// 临时使用remark字段传递answers数据
|
||||
try {
|
||||
com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
|
||||
String answersJson = mapper.writeValueAsString(answers);
|
||||
recordWithAnswers.setRemark("ANSWERS_DATA:" + answersJson);
|
||||
log.debug("答案数据序列化成功，数据长度: {}", answersJson.length());
|
||||
} catch (Exception e) {
|
||||
log.error("序列化答案数据失败", e);
|
||||
}
|
||||
|
||||
return recordWithAnswers;
|
||||
}
|
||||
|
||||
/**
|
||||
* 从 hq_sat_answer 表查询答案详情
|
||||
*
|
||||
* @param recordId 答题记录ID
|
||||
* @return 答案详情列表
|
||||
*/
|
||||
private List<Map<String, Object>> getAnswersFromSatAnswerTable(Long recordId) {
|
||||
try {
|
||||
log.debug("从 hq_sat_answer 表查询答案，记录ID: {}", recordId);
|
||||
|
||||
// 查询该记录的所有答案
|
||||
String answerSql = """
|
||||
SELECT question_id, question_type, answer_value,
|
||||
option_id, option_value, option_text, answer_score
|
||||
FROM hq_sat_answer
|
||||
WHERE record_id = ? AND deleted = 0
|
||||
ORDER BY question_id, option_id
|
||||
""";
|
||||
|
||||
List<Map<String, Object>> answerResults = jdbcTemplate.queryForList(answerSql, recordId);
|
||||
log.debug("查询到原始答案数据: {} 条", answerResults.size());
|
||||
|
||||
// 按题目ID分组聚合答案
|
||||
Map<Long, Map<String, Object>> questionAnswerMap = new HashMap<>();
|
||||
|
||||
for (Map<String, Object> answerRow : answerResults) {
|
||||
Long questionId = Long.valueOf(answerRow.get("question_id").toString());
|
||||
String questionType = answerRow.get("question_type").toString();
|
||||
String answerValue = (String) answerRow.get("answer_value");
|
||||
|
||||
// 获取或创建题目答案对象
|
||||
Map<String, Object> questionAnswer = questionAnswerMap.computeIfAbsent(questionId, k -> {
|
||||
Map<String, Object> answer = new HashMap<>();
|
||||
answer.put("questionId", questionId);
|
||||
answer.put("questionType", questionType);
|
||||
answer.put("answerValue", answerValue);
|
||||
return answer;
|
||||
});
|
||||
|
||||
log.debug("处理题目{}的答案: questionType={}, answerValue={}",
|
||||
questionId, questionType, answerValue);
|
||||
}
|
||||
|
||||
// 转换为列表并返回
|
||||
List<Map<String, Object>> result = new ArrayList<>(questionAnswerMap.values());
|
||||
log.debug("聚合后的答案数据: {} 个题目", result.size());
|
||||
|
||||
return result;
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("从 hq_sat_answer 表查询答案失败，记录ID: {}, 错误: {}",
|
||||
recordId, e.getMessage(), e);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 从remark字段解析答案数据
|
||||
*
|
||||
* @param detail 答题详情
|
||||
* @return 解析后的答案数据
|
||||
*/
|
||||
private Map<String, Object> parseAnswerFromRemark(HqSatDetailVo detail) {
|
||||
if (detail.getRemark() == null || detail.getRemark().trim().isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Map<String, Object> answer = new HashMap<>();
|
||||
answer.put("questionId", detail.getQuestionId());
|
||||
|
||||
String remark = detail.getRemark();
|
||||
log.debug("解析答题详情，题目ID: {}, remark: {}", detail.getQuestionId(), remark);
|
||||
|
||||
// 解析remark中的数据格式: "题目类型:1;答案值:A;选项详情:A(选项文本),"
|
||||
try {
|
||||
String[] parts = remark.split(";");
|
||||
String questionType = "";
|
||||
String answerValue = "";
|
||||
|
||||
for (String part : parts) {
|
||||
if (part.startsWith("题目类型:")) {
|
||||
questionType = part.substring("题目类型:".length());
|
||||
answer.put("questionType", questionType);
|
||||
} else if (part.startsWith("答案值:")) {
|
||||
answerValue = part.substring("答案值:".length());
|
||||
answer.put("answerValue", answerValue);
|
||||
}
|
||||
}
|
||||
|
||||
// 设置其他默认值
|
||||
answer.put("id", detail.getId());
|
||||
answer.put("recordId", detail.getRecordId());
|
||||
answer.put("answerScore", detail.getAnswerScore() != null ? detail.getAnswerScore() : 0);
|
||||
answer.put("remark", detail.getRemark());
|
||||
|
||||
log.debug("解析答案完成: questionId={}, questionType={}, answerValue={}",
|
||||
detail.getQuestionId(), questionType, answerValue);
|
||||
|
||||
return answer;
|
||||
} catch (Exception e) {
|
||||
log.error("解析答题详情失败，题目ID: {}, remark: {}", detail.getQuestionId(), remark, e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存答案详情到 hq_sat_answer 表
|
||||
*
|
||||
* @param recordId 答题记录ID
|
||||
* @param answerItem 答案项
|
||||
*/
|
||||
private void saveAnswerDetails(Long recordId, HqSatAnswerSubmitBo.AnswerItem answerItem) {
|
||||
try {
|
||||
String questionType = answerItem.getQuestionType();
|
||||
String answerValue = answerItem.getAnswerValue();
|
||||
|
||||
log.info("=== 开始保存答案详情到 hq_sat_answer 表 ===");
|
||||
log.info("记录ID: {}, 题目ID: {}, 题目类型: {}, 答案值: {}",
|
||||
recordId, answerItem.getQuestionId(), questionType, answerValue);
|
||||
log.info("选项数据: {}", answerItem.getOptions());
|
||||
|
||||
if (questionType.equals("1") || questionType.equals("2")) {
|
||||
// 单选题或多选题：保存选项信息
|
||||
log.info("处理单选题或多选题，题目类型: {}", questionType);
|
||||
|
||||
if (answerItem.getOptions() != null && !answerItem.getOptions().isEmpty()) {
|
||||
log.info("选项数据不为空，选项数量: {}", answerItem.getOptions().size());
|
||||
|
||||
for (HqSatAnswerSubmitBo.OptionDetail option : answerItem.getOptions()) {
|
||||
log.info("处理选项: optionId={}, optionValue={}, optionText={}, isSelected={}",
|
||||
option.getOptionId(), option.getOptionValue(), option.getOptionText(),
|
||||
option.getIsSelected());
|
||||
|
||||
if (Boolean.TRUE.equals(option.getIsSelected())) {
|
||||
log.info("选项已选中，准备插入数据库");
|
||||
|
||||
// 根据选项ID查询真实的分值
|
||||
Long realScore = 0L;
|
||||
try {
|
||||
String scoreSql = "SELECT option_value FROM hq_sat_option WHERE id = ? AND deleted = 0";
|
||||
List<Map<String, Object>> scoreResult = jdbcTemplate.queryForList(scoreSql,
|
||||
option.getOptionId());
|
||||
if (!scoreResult.isEmpty()) {
|
||||
Object scoreValue = scoreResult.get(0).get("option_value");
|
||||
realScore = scoreValue != null ? Long.valueOf(scoreValue.toString()) : 0L;
|
||||
log.info("查询到选项{}的真实分值: {}", option.getOptionId(), realScore);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("查询选项分值失败，使用默认值0，选项ID: {}, 错误: {}", option.getOptionId(), e.getMessage());
|
||||
}
|
||||
|
||||
String sql = """
|
||||
INSERT INTO hq_sat_answer (
|
||||
tenant_id, create_by, create_time,
|
||||
record_id, question_id, question_type,
|
||||
option_id, option_value, option_text,
|
||||
answer_value, answer_score, deleted
|
||||
) VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, 0)
|
||||
""";
|
||||
|
||||
int rowsAffected = jdbcTemplate.update(sql,
|
||||
LoginHelper.getTenantId(), // tenant_id
|
||||
LoginHelper.getUserId(), // create_by
|
||||
recordId, // record_id
|
||||
answerItem.getQuestionId(), // question_id
|
||||
questionType, // question_type
|
||||
option.getOptionId(), // option_id
|
||||
option.getOptionValue(), // option_value（A、B、C、D）
|
||||
option.getOptionText(), // option_text
|
||||
answerValue, // answer_value
|
||||
realScore // answer_score（真实分值）
|
||||
);
|
||||
|
||||
log.info("选择题答案插入成功，影响行数: {}, 选项标识: {}, 分值: {}",
|
||||
rowsAffected, option.getOptionValue(), realScore);
|
||||
} else {
|
||||
log.info("选项未选中，跳过: {}", option.getOptionValue());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log.warn("选择题选项数据为空或null，题目ID: {}, 题目类型: {}",
|
||||
answerItem.getQuestionId(), questionType);
|
||||
}
|
||||
} else if (questionType.equals("3")) {
|
||||
// 问答题：直接保存文本内容
|
||||
log.info("处理问答题，答案值: {}", answerValue);
|
||||
|
||||
String sql = """
|
||||
INSERT INTO hq_sat_answer (
|
||||
tenant_id, create_by, create_time,
|
||||
record_id, question_id, question_type,
|
||||
option_id, option_value, option_text,
|
||||
answer_value, answer_score, deleted
|
||||
) VALUES (?, ?, NOW(), ?, ?, ?, NULL, NULL, NULL, ?, 0, 0)
|
||||
""";
|
||||
|
||||
int rowsAffected = jdbcTemplate.update(sql,
|
||||
LoginHelper.getTenantId(), // tenant_id
|
||||
LoginHelper.getUserId(), // create_by
|
||||
recordId, // record_id
|
||||
answerItem.getQuestionId(), // question_id
|
||||
questionType, // question_type
|
||||
answerValue // answer_value
|
||||
);
|
||||
|
||||
log.info("问答题答案插入成功，影响行数: {}", rowsAffected);
|
||||
}
|
||||
|
||||
log.info("=== 答案详情保存完成 ===");
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("保存答案到 hq_sat_answer 表失败，题目ID: {}, 题目类型: {}, 错误详情: {}",
|
||||
answerItem.getQuestionId(), answerItem.getQuestionType(), e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 扩展的答题记录VO，包含答案列表
|
||||
*/
|
||||
private static class ExtendedSatRecordVo {
|
||||
private HqSatRecordVo record;
|
||||
private List<Map<String, Object>> answers;
|
||||
|
||||
public HqSatRecordVo getRecord() {
|
||||
return record;
|
||||
}
|
||||
|
||||
public void setRecord(HqSatRecordVo record) {
|
||||
this.record = record;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getAnswers() {
|
||||
return answers;
|
||||
}
|
||||
|
||||
public void setAnswers(List<Map<String, Object>> answers) {
|
||||
this.answers = answers;
|
||||
}
|
||||
}
|
||||
}
|
||||
-327
@@ -1,327 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.oss.core.OssClient;
|
||||
import org.dromara.common.oss.entity.UploadResult;
|
||||
import org.dromara.common.oss.factory.OssFactory;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairAttachment;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo;
|
||||
import org.dromara.zhxy.hq.mapper.PmRepairAttachmentMapper;
|
||||
import org.dromara.zhxy.hq.mapper.PmRepairOrderMapper;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairAttachmentService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报修附件Service业务层处理
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-26
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class PmRepairAttachmentServiceImpl implements IPmRepairAttachmentService {
|
||||
|
||||
private final PmRepairAttachmentMapper baseMapper;
|
||||
private final PmRepairOrderMapper repairOrderMapper;
|
||||
|
||||
/**
|
||||
* 查询报修附件
|
||||
*/
|
||||
@Override
|
||||
public PmRepairAttachmentVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<PmRepairAttachmentVo> queryPageList(PmRepairAttachmentBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<PmRepairAttachment> lqw = buildQueryWrapper(bo);
|
||||
Page<PmRepairAttachmentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
@Override
|
||||
public List<PmRepairAttachmentVo> queryList(PmRepairAttachmentBo bo) {
|
||||
LambdaQueryWrapper<PmRepairAttachment> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据工单ID查询附件列表
|
||||
*/
|
||||
@Override
|
||||
public List<PmRepairAttachmentVo> queryByOrderId(Long orderId) {
|
||||
LambdaQueryWrapper<PmRepairAttachment> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(PmRepairAttachment::getOrderId, orderId);
|
||||
lqw.orderByAsc(PmRepairAttachment::getSortOrder)
|
||||
.orderByAsc(PmRepairAttachment::getCreateTime);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<PmRepairAttachment> buildQueryWrapper(PmRepairAttachmentBo bo) {
|
||||
LambdaQueryWrapper<PmRepairAttachment> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getOrderId() != null, PmRepairAttachment::getOrderId, bo.getOrderId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getFileName()), PmRepairAttachment::getFileName, bo.getFileName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getFileType()), PmRepairAttachment::getFileType, bo.getFileType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUploadStage()), PmRepairAttachment::getUploadStage, bo.getUploadStage());
|
||||
lqw.eq(bo.getUploaderId() != null, PmRepairAttachment::getUploaderId, bo.getUploaderId());
|
||||
lqw.orderByAsc(PmRepairAttachment::getSortOrder).orderByDesc(PmRepairAttachment::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报修附件
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(PmRepairAttachmentBo bo) {
|
||||
PmRepairAttachment add = MapstructUtils.convert(bo, PmRepairAttachment.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
// 更新工单附件数量
|
||||
updateOrderAttachmentCount(add.getOrderId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报修附件
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PmRepairAttachmentBo bo) {
|
||||
PmRepairAttachment update = MapstructUtils.convert(bo, PmRepairAttachment.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(PmRepairAttachment entity) {
|
||||
// 设置默认值
|
||||
if (entity.getSortOrder() == null) {
|
||||
entity.setSortOrder(0);
|
||||
}
|
||||
if (StringUtils.isBlank(entity.getUploadStage())) {
|
||||
entity.setUploadStage("1"); // 默认报修申请阶段
|
||||
}
|
||||
if (entity.getUploaderId() == null) {
|
||||
entity.setUploaderId(LoginHelper.getUserId());
|
||||
}
|
||||
if (StringUtils.isBlank(entity.getUploaderName())) {
|
||||
entity.setUploaderName(LoginHelper.getUsername());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除报修附件
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
// 先获取要删除的附件信息（在删除前）
|
||||
List<PmRepairAttachmentVo> attachments = new ArrayList<>();
|
||||
for (Long id : ids) {
|
||||
PmRepairAttachmentVo attachment = baseMapper.selectVoById(id);
|
||||
if (attachment != null) {
|
||||
attachments.add(attachment);
|
||||
}
|
||||
}
|
||||
|
||||
if (isValid) {
|
||||
// 删除OSS文件
|
||||
for (PmRepairAttachmentVo attachment : attachments) {
|
||||
try {
|
||||
if (StringUtils.isNotBlank(attachment.getFilePath())) {
|
||||
OssFactory.instance().delete(attachment.getFilePath());
|
||||
}
|
||||
// 删除缩略图
|
||||
if (StringUtils.isNotBlank(attachment.getThumbnailPath())) {
|
||||
OssFactory.instance().delete(attachment.getThumbnailPath());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("删除OSS文件失败: {}", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
boolean flag = baseMapper.deleteBatchIds(ids) > 0;
|
||||
if (flag) {
|
||||
// 更新相关工单的附件数量
|
||||
attachments.stream()
|
||||
.map(PmRepairAttachmentVo::getOrderId)
|
||||
.distinct()
|
||||
.forEach(this::updateOrderAttachmentCount);
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传附件文件
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public PmRepairAttachmentVo uploadFile(Long orderId, String uploadStage, MultipartFile file, String description) {
|
||||
try {
|
||||
// 文件基本信息
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
String fileExtension = StrUtil.subAfter(originalFilename, ".", true);
|
||||
String contentType = file.getContentType();
|
||||
long fileSize = file.getSize();
|
||||
|
||||
// 上传文件到OSS
|
||||
UploadResult uploadResult = OssFactory.instance().uploadSuffix(file.getBytes(), fileExtension, contentType);
|
||||
|
||||
// 构建附件信息
|
||||
PmRepairAttachmentBo bo = new PmRepairAttachmentBo();
|
||||
bo.setOrderId(orderId);
|
||||
bo.setFileName(originalFilename);
|
||||
bo.setFilePath(uploadResult.getUrl());
|
||||
bo.setFileSize(fileSize);
|
||||
bo.setFileType(getFileType(contentType));
|
||||
bo.setFileExtension(fileExtension);
|
||||
bo.setFileMimeType(contentType);
|
||||
bo.setUploadStage(uploadStage);
|
||||
bo.setDescription(description);
|
||||
bo.setUploaderId(LoginHelper.getUserId());
|
||||
bo.setUploaderName(LoginHelper.getUsername());
|
||||
|
||||
// 保存到数据库
|
||||
Boolean success = insertByBo(bo);
|
||||
if (success) {
|
||||
return queryById(bo.getId());
|
||||
} else {
|
||||
throw new RuntimeException("保存附件信息失败");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error("上传附件失败: {}", e.getMessage(), e);
|
||||
throw new RuntimeException("上传附件失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量上传附件文件
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public List<PmRepairAttachmentVo> uploadFiles(Long orderId, String uploadStage, MultipartFile[] files,
|
||||
List<String> descriptions) {
|
||||
List<PmRepairAttachmentVo> results = new ArrayList<>();
|
||||
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
MultipartFile file = files[i];
|
||||
String description = (descriptions != null && i < descriptions.size()) ? descriptions.get(i) : null;
|
||||
|
||||
try {
|
||||
PmRepairAttachmentVo result = uploadFile(orderId, uploadStage, file, description);
|
||||
results.add(result);
|
||||
} catch (Exception e) {
|
||||
log.error("批量上传第{}个文件失败: {}", i + 1, e.getMessage());
|
||||
throw new RuntimeException("批量上传第" + (i + 1) + "个文件失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除附件文件
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean deleteAttachment(Long id) {
|
||||
PmRepairAttachmentVo attachment = queryById(id);
|
||||
if (attachment == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 删除OSS文件
|
||||
try {
|
||||
if (StringUtils.isNotBlank(attachment.getFilePath())) {
|
||||
OssFactory.instance().delete(attachment.getFilePath());
|
||||
}
|
||||
if (StringUtils.isNotBlank(attachment.getThumbnailPath())) {
|
||||
OssFactory.instance().delete(attachment.getThumbnailPath());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("删除OSS文件失败: {}", e.getMessage());
|
||||
}
|
||||
|
||||
// 删除数据库记录
|
||||
boolean flag = baseMapper.deleteById(id) > 0;
|
||||
if (flag) {
|
||||
// 更新工单附件数量
|
||||
updateOrderAttachmentCount(attachment.getOrderId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新工单的附件数量
|
||||
*/
|
||||
@Override
|
||||
public void updateOrderAttachmentCount(Long orderId) {
|
||||
if (orderId == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
LambdaQueryWrapper<PmRepairAttachment> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(PmRepairAttachment::getOrderId, orderId);
|
||||
long count = baseMapper.selectCount(lqw);
|
||||
|
||||
// 更新工单的附件数量
|
||||
LambdaUpdateWrapper<org.dromara.zhxy.hq.domain.PmRepairOrder> updateWrapper = Wrappers.lambdaUpdate();
|
||||
updateWrapper.eq(org.dromara.zhxy.hq.domain.PmRepairOrder::getId, orderId)
|
||||
.set(org.dromara.zhxy.hq.domain.PmRepairOrder::getAttachmentCount, (int) count);
|
||||
repairOrderMapper.update(null, updateWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据MIME类型获取文件类型
|
||||
*/
|
||||
private String getFileType(String mimeType) {
|
||||
if (StringUtils.isBlank(mimeType)) {
|
||||
return "other";
|
||||
}
|
||||
|
||||
if (mimeType.startsWith("image/")) {
|
||||
return "image";
|
||||
} else if (mimeType.startsWith("video/")) {
|
||||
return "video";
|
||||
} else if (mimeType.startsWith("audio/")) {
|
||||
return "audio";
|
||||
} else if (mimeType.contains("pdf") || mimeType.contains("doc") || mimeType.contains("txt")) {
|
||||
return "document";
|
||||
} else {
|
||||
return "other";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
-297
@@ -1,297 +0,0 @@
|
||||
package org.dromara.zhxy.hq.service.impl;
|
||||
|
||||
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 cn.hutool.core.collection.CollUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo;
|
||||
import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo;
|
||||
import org.dromara.zhxy.hq.domain.PmRepairCategory;
|
||||
import org.dromara.zhxy.hq.mapper.PmRepairCategoryMapper;
|
||||
import org.dromara.zhxy.hq.service.IPmRepairCategoryService;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 维修类型Service业务层处理
|
||||
*
|
||||
* @author Cursor AI
|
||||
* @date 2025-01-23
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class PmRepairCategoryServiceImpl implements IPmRepairCategoryService {
|
||||
|
||||
private final PmRepairCategoryMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询维修类型
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 维修类型
|
||||
*/
|
||||
@Override
|
||||
public PmRepairCategoryVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询维修类型列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 维修类型分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<PmRepairCategoryVo> queryPageList(PmRepairCategoryBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = buildQueryWrapper(bo);
|
||||
Page<PmRepairCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的维修类型列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 维修类型列表
|
||||
*/
|
||||
@Override
|
||||
public List<PmRepairCategoryVo> queryList(PmRepairCategoryBo bo) {
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<PmRepairCategory> buildQueryWrapper(PmRepairCategoryBo bo) {
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(PmRepairCategory::getSortOrder).orderByAsc(PmRepairCategory::getId);
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), PmRepairCategory::getCategoryName, bo.getCategoryName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCategoryCode()), PmRepairCategory::getCategoryCode, bo.getCategoryCode());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getCategoryDescription()), PmRepairCategory::getCategoryDescription,
|
||||
bo.getCategoryDescription());
|
||||
lqw.eq(bo.getParentId() != null, PmRepairCategory::getParentId, bo.getParentId());
|
||||
lqw.eq(bo.getLevelDepth() != null, PmRepairCategory::getLevelDepth, bo.getLevelDepth());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSkillLevel()), PmRepairCategory::getSkillLevel, bo.getSkillLevel());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), PmRepairCategory::getStatus, bo.getStatus());
|
||||
|
||||
// IN查询条件
|
||||
lqw.in(CollUtil.isNotEmpty(bo.getStatusIn()), PmRepairCategory::getStatus, bo.getStatusIn());
|
||||
lqw.in(CollUtil.isNotEmpty(bo.getParentIdIn()), PmRepairCategory::getParentId, bo.getParentIdIn());
|
||||
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增维修类型
|
||||
*
|
||||
* @param bo 维修类型
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(PmRepairCategoryBo bo) {
|
||||
PmRepairCategory add = MapstructUtils.convert(bo, PmRepairCategory.class);
|
||||
validEntityBeforeSave(add);
|
||||
|
||||
// 设置层级信息
|
||||
if (add.getParentId() == null) {
|
||||
add.setParentId(0L);
|
||||
}
|
||||
|
||||
// 设置层级深度和祖级列表
|
||||
buildHierarchyInfo(add);
|
||||
|
||||
// 设置默认值
|
||||
if (add.getSortOrder() == null) {
|
||||
add.setSortOrder(0);
|
||||
}
|
||||
if (StringUtils.isBlank(add.getStatus())) {
|
||||
add.setStatus("1");
|
||||
}
|
||||
if (StringUtils.isBlank(add.getColorCode())) {
|
||||
add.setColorCode("#FFB020");
|
||||
}
|
||||
add.setUsageCount(0);
|
||||
add.setChildrenCount(0);
|
||||
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
// 更新父级的子类数量
|
||||
updateParentChildrenCount(add.getParentId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改维修类型
|
||||
*
|
||||
* @param bo 维修类型
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PmRepairCategoryBo bo) {
|
||||
PmRepairCategory update = MapstructUtils.convert(bo, PmRepairCategory.class);
|
||||
validEntityBeforeSave(update);
|
||||
|
||||
// 如果修改了父级，需要重新计算层级信息
|
||||
PmRepairCategory oldEntity = baseMapper.selectById(update.getId());
|
||||
if (oldEntity != null && !oldEntity.getParentId().equals(update.getParentId())) {
|
||||
buildHierarchyInfo(update);
|
||||
// 更新新旧父级的子类数量
|
||||
updateParentChildrenCount(oldEntity.getParentId());
|
||||
updateParentChildrenCount(update.getParentId());
|
||||
}
|
||||
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(PmRepairCategory entity) {
|
||||
// 校验类型编码唯一性
|
||||
if (StringUtils.isNotBlank(entity.getCategoryCode())) {
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(PmRepairCategory::getCategoryCode, entity.getCategoryCode());
|
||||
if (entity.getId() != null) {
|
||||
lqw.ne(PmRepairCategory::getId, entity.getId());
|
||||
}
|
||||
boolean exists = baseMapper.exists(lqw);
|
||||
if (exists) {
|
||||
throw new ServiceException("类型编码已存在");
|
||||
}
|
||||
}
|
||||
|
||||
// 校验不能将自己设为父级
|
||||
if (entity.getId() != null && entity.getId().equals(entity.getParentId())) {
|
||||
throw new ServiceException("不能将自己设为父级");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建层级信息
|
||||
*/
|
||||
private void buildHierarchyInfo(PmRepairCategory entity) {
|
||||
if (entity.getParentId() == null || entity.getParentId() == 0L) {
|
||||
entity.setParentId(0L);
|
||||
entity.setLevelDepth(1);
|
||||
entity.setAncestorIds("0");
|
||||
} else {
|
||||
PmRepairCategory parent = baseMapper.selectById(entity.getParentId());
|
||||
if (parent != null) {
|
||||
entity.setLevelDepth(parent.getLevelDepth() + 1);
|
||||
entity.setAncestorIds(parent.getAncestorIds() + "," + parent.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新父级的子类数量
|
||||
*/
|
||||
private void updateParentChildrenCount(Long parentId) {
|
||||
if (parentId == null || parentId == 0L) {
|
||||
return;
|
||||
}
|
||||
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(PmRepairCategory::getParentId, parentId);
|
||||
long count = baseMapper.selectCount(lqw);
|
||||
|
||||
PmRepairCategory parent = new PmRepairCategory();
|
||||
parent.setId(parentId);
|
||||
parent.setChildrenCount((int) count);
|
||||
baseMapper.updateById(parent);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除维修类型信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
// 校验是否有子类
|
||||
for (Long id : ids) {
|
||||
PmRepairCategory category = baseMapper.selectById(id);
|
||||
if (category != null && category.getChildrenCount() > 0) {
|
||||
throw new ServiceException("存在子类型，不允许删除：" + category.getCategoryName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 删除后更新父级的子类数量
|
||||
List<PmRepairCategory> categories = baseMapper.selectBatchIds(ids);
|
||||
boolean flag = baseMapper.deleteByIds(ids) > 0;
|
||||
if (flag) {
|
||||
for (PmRepairCategory category : categories) {
|
||||
updateParentChildrenCount(category.getParentId());
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修类型树形结构
|
||||
*
|
||||
* @return 维修类型树形列表
|
||||
*/
|
||||
@Override
|
||||
public List<PmRepairCategoryVo> queryTree() {
|
||||
LambdaQueryWrapper<PmRepairCategory> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(PmRepairCategory::getStatus, "1");
|
||||
lqw.orderByAsc(PmRepairCategory::getSortOrder).orderByAsc(PmRepairCategory::getId);
|
||||
List<PmRepairCategoryVo> allList = baseMapper.selectVoList(lqw);
|
||||
|
||||
return buildTree(allList, 0L);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建树形结构
|
||||
*/
|
||||
private List<PmRepairCategoryVo> buildTree(List<PmRepairCategoryVo> allList, Long parentId) {
|
||||
return allList.stream()
|
||||
.filter(item -> parentId.equals(item.getParentId()))
|
||||
.map(item -> {
|
||||
List<PmRepairCategoryVo> children = buildTree(allList, item.getId());
|
||||
item.setChildren(children);
|
||||
return item;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新使用次数
|
||||
*
|
||||
* @param categoryId 类型ID
|
||||
* @return 是否成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateUsageCount(Long categoryId) {
|
||||
PmRepairCategory category = baseMapper.selectById(categoryId);
|
||||
if (category == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
PmRepairCategory update = new PmRepairCategory();
|
||||
update.setId(categoryId);
|
||||
update.setUsageCount(category.getUsageCount() + 1);
|
||||
update.setLastUsedTime(new Date());
|
||||
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
}
|
||||
-1099
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user