嘉禾二期

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<MaintainTaskProject> taskProjectList;
+
     @TableField(exist = false)
     private List<MaintainProject> projectList;
 }

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;
+
+
+
 }

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);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java

@@ -162,11 +162,14 @@ public class MaintainTaskServiceImpl extends BaseServiceImpl<MaintainTaskMapper,
         LambdaQueryWrapper<MaintainTaskProject> taskProjectWrapper = new LambdaQueryWrapper<>();
         taskProjectWrapper.eq(MaintainTaskProject::getTaskId, id);
         List<MaintainTaskProject> taskProjectList = maintainTaskProjectService.list(taskProjectWrapper);
-        if (CollectionUtils.isNotEmpty(taskProjectList)) {
-            List<String> projectIds = taskProjectList.stream().map(MaintainTaskProject::getProjectId).collect(Collectors.toList());
-            List<MaintainProject> 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;
     }