From 66ec0428ca4f69dec6f698a3fd201944da8e2683 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/estate_expert
---
admin-server/src/main/java/com/estate/expert/admin/service/impl/OnDutyServiceImpl.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/OnDutyServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/OnDutyServiceImpl.java
index 7c4e588..35b588a 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/OnDutyServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/OnDutyServiceImpl.java
@@ -65,15 +65,6 @@
@Override
@Transactional
public OnDuty add(User creator, AddOnDutyRequest request) {
- // 1. 查询项目信息，获取 clientId
- Project project = projectRepository.findById(request.getProjectId())
- .orElseThrow(() -> new RuntimeException("项目不存在"));
-
- if (project.getClient() == null) {
- throw new RuntimeException("项目未关联委托方");
- }
- Integer clientId = project.getClient().getId();
-
// 2. 查询岗位信息，获取 positionName（MyBatis Plus 方式）
Position position = positionService.getById(request.getPositionId());
if (position == null) {
@@ -89,9 +80,7 @@
// 4. 构建 OnDuty 实体
OnDuty onDuty = new OnDuty();
- onDuty.setPlanId(request.getPlanId());
- onDuty.setProjectId(request.getProjectId());
- onDuty.setClientId(clientId);
+ onDuty.setCheckTaskIdId(request.getCheckTaskIdId());
onDuty.setContent("人员在岗"); // 固定值
onDuty.setPositionId(request.getPositionId());
onDuty.setPositionName(positionName);
@@ -122,8 +111,8 @@
* 用于新的列表查询接口，支持"全部/我创建的"筛选
*/
@Override
- public PageRespMp<OnDuty> listOnDutyRecords(Integer planId, Integer creatorId, PageReq pageReq) {
- Page<OnDuty> page = lambdaQuery().eq(OnDuty::getPlanId, planId).eq(Objects.nonNull(creatorId), OnDuty::getCreatorId, creatorId)
+ public PageRespMp<OnDuty> listOnDutyRecords(Integer checkTaskId, Integer creatorId, PageReq pageReq) {
+ Page<OnDuty> page = lambdaQuery().eq(OnDuty::getCheckTaskIdId, checkTaskId).eq(Objects.nonNull(creatorId), OnDuty::getCreatorId, creatorId)
.page(new Page<>(pageReq.getPage(), pageReq.getSize()));
//转换为 PageRespMp
return PageRespMp.of(page);
--
Gitblit v1.7.1