From b93f8e2c4dfb0186978128bf045e66c6b9818e6c Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Fri, 8 Dec 2023 09:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E7=A6=BE=E4=BA=8C=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/lims/entry/MaintainTask.java | 3 +++ .../lims/entry/MaintainTaskProject.java | 27 +++++++++++++++++++ .../MaintainTaskProjectController.java | 19 ++++++++----- .../service/impl/MaintainTaskServiceImpl.java | 13 +++++---- 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTask.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTask.java index f912416..0d8ad89 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTask.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTask.java @@ -187,6 +187,9 @@ public class MaintainTask extends BaseEntity implements Serializable { @TableField(exist = false) private Integer unProjectCount; + @TableField(exist = false) + private List taskProjectList; + @TableField(exist = false) private List projectList; } diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTaskProject.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTaskProject.java index dc527e9..d7f376d 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTaskProject.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/MaintainTaskProject.java @@ -1,5 +1,6 @@ package org.springblade.lims.entry; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -123,4 +124,30 @@ public class MaintainTaskProject extends BaseEntity implements Serializable { */ private String tenantId; + /** + * 项目编号 + */ + @TableField(exist = false) + private String code; + + /** + * 项目名称 + */ + @TableField(exist = false) + private String name; + + /** + * 保养类型 + */ + @TableField(exist = false) + private String maintainType; + + /** + * 项目备注 + */ + @TableField(exist = false) + private String notes; + + + } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskProjectController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskProjectController.java index 43d72e1..0b64608 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskProjectController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskProjectController.java @@ -11,9 +11,7 @@ import org.springblade.lims.entry.MaintainTask; import org.springblade.lims.entry.MaintainTaskProject; import org.springblade.lims.service.IMaintainTaskProjectService; import org.springblade.lims.service.IMaintainTaskService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -31,14 +29,22 @@ public class MaintainTaskProjectController extends BladeController { private final IMaintainTaskProjectService service; private final IMaintainTaskService maintainTaskService; + /** + * 根据id查询信息 + */ + @GetMapping("/getById") + @ApiOperation(value = "根据id查询信息", notes = "根据id查询信息") + public R getById(String id) { + return R.data(service.findById(id)); + } + /** * 更新 */ - @GetMapping("/updateStatus") + @PostMapping("/updateStatus") @ApiOperation(value = "更新", notes = "更新") - public R updateStatus(String id) { - MaintainTaskProject entry = service.getById(id); + public R updateStatus(@RequestBody MaintainTaskProject entry) { //更新保养任务为保养中 MaintainTask task = maintainTaskService.getById(entry.getTaskId()); task.setStatus(1); @@ -46,7 +52,6 @@ public class MaintainTaskProjectController extends BladeController { task.setUpdateUser(AuthUtil.getUserId()); maintainTaskService.updateById(task); //更新保养项目状态 - entry.setStatus(1); entry.setUpdateTime(new Date()); entry.setUpdateUser(AuthUtil.getUserId()); service.updateById(entry); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java index ac5728f..3a016e6 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java @@ -162,11 +162,14 @@ public class MaintainTaskServiceImpl extends BaseServiceImpl taskProjectWrapper = new LambdaQueryWrapper<>(); taskProjectWrapper.eq(MaintainTaskProject::getTaskId, id); List taskProjectList = maintainTaskProjectService.list(taskProjectWrapper); - if (CollectionUtils.isNotEmpty(taskProjectList)) { - List projectIds = taskProjectList.stream().map(MaintainTaskProject::getProjectId).collect(Collectors.toList()); - List projectList = maintainProjectService.listByIds(projectIds); - entry.setProjectList(projectList); - } + taskProjectList.forEach(taskProject ->{ + taskProject.setCode(taskProject.getProjectCode()); + taskProject.setName(taskProject.getProjectName()); + taskProject.setMaintainType(taskProject.getProjectMaintainType()); + taskProject.setNotes(taskProject.getProjectNotes()); + taskProject.setBaseCost(taskProject.getProjectBaseCost()); + }); + entry.setTaskProjectList(taskProjectList); return entry; }