From 8ce578f52d2dc071beb043560baded7803787f07 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 06 九月 2023 17:36:22 +0800 Subject: [PATCH] 删除鹓雏管理端的时间限制 --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java index f2ccf94..706aff9 100644 --- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java +++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java @@ -1,17 +1,20 @@ package com.yuanchu.limslaboratory.service.impl; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import cn.hutool.core.date.DateUtil; import com.yuanchu.limslaboratory.mapper.*; -import com.yuanchu.limslaboratory.pojo.*; +import com.yuanchu.limslaboratory.pojo.Inspection; +import com.yuanchu.limslaboratory.pojo.InspectionProduct; +import com.yuanchu.limslaboratory.pojo.NonConformanceReview; +import com.yuanchu.limslaboratory.pojo.Report; import com.yuanchu.limslaboratory.service.PlanService; import com.yuanchu.limslaboratory.utils.MyUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -44,6 +47,15 @@ @Resource InspectionMapper inspectionMapper; + + @Resource + InspectionMaterialMapper inspectionMaterialMapper; + + @Resource + LinkDetectionMapper linkDetectionMapper; + + @Resource + private NonConformanceReviewMapper nonConformanceReviewMapper; //鏌ヨ妫�楠岃鍒� @Override @@ -116,7 +128,13 @@ Inspection inspection = new Inspection(); inspection.setId(id); inspection.setInspectionStatus(0); + //鏇存柊妫�楠屽崟 inspectionMapper.updateById(inspection); + //娣诲姞涓嶅悎鏍间俊鎭埌璇勫 + NonConformanceReview nonConformanceReview = new NonConformanceReview(); + LocalDateTime localDateTime = DateUtil.toLocalDateTime(DateUtil.date()); + nonConformanceReview.setCreatedTime(localDateTime); + nonConformanceReview.setUpdatedTime(localDateTime); } else if (count == results.size()) { Inspection inspection = new Inspection(); inspection.setId(id); @@ -139,6 +157,7 @@ report.setStatus(0); report.setConclusion(conclusion); report.setInspectionId(id); + //鏂板妫�楠屾姤鍛� reportMapper.insert(report); return "涓婃姤鎴愬姛!"; } -- Gitblit v1.9.3