From d2da906b80b60297d9171093e259f7e95379afa9 Mon Sep 17 00:00:00 2001 From: ls Date: Tue, 17 Jun 2025 00:27:07 +0800 Subject: [PATCH] review --- .../ExperimentReviewController.java | 64 ++++++++++--------- .../database/dto/ExperimentReviewDTO.java | 12 ++++ .../modules/database/entity/Experiment.java | 6 ++ .../service/IExperimentReviewService.java | 11 +++- .../impl/ExperimentReviewServiceImpl.java | 36 ++++++++++- 5 files changed, 95 insertions(+), 34 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentReviewDTO.java diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java index d81e0ac..41e5a45 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java @@ -1,28 +1,28 @@ package org.jeecg.modules.database.controller; -import java.util.Arrays; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.database.constant.ExperimentReviewProcessType; -import org.jeecg.modules.database.entity.*; -import org.jeecg.modules.database.service.*; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; - +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.database.constant.ExperimentReviewProcessType; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; +import org.jeecg.modules.database.entity.*; +import org.jeecg.modules.database.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; + +import java.util.Arrays; +import java.util.List; /** * @Description: 试验评定结果 @@ -36,14 +36,14 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; @Slf4j public class ExperimentReviewController extends JeecgController { @Autowired - private IExperimentReviewService experimentReviewResultService; + private IExperimentReviewService experimentReviewService; @Autowired private IExperimentService experimentService; @Autowired private IExperimentSampleInfoService experimentSampleInfoService; /** - * 分页列表查询 + * 试验评定列表 * * @param experimentReviewResult * @param pageNo @@ -52,15 +52,19 @@ public class ExperimentReviewController extends JeecgController> queryPageList(ExperimentReview experimentReviewResult, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReviewResult, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = experimentReviewResultService.page(page, queryWrapper); + public Result> queryPageList(Experiment experiment, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = experimentService.page(page, queryWrapper); + pageList.getRecords().forEach(ex -> { + List experimentReviewList = experimentReviewService.getByExperimentId(ex.getId()); + ex.setExperimentReviewList(experimentReviewList); + }); return Result.OK(pageList); } @@ -76,7 +80,7 @@ public class ExperimentReviewController extends JeecgController add(@RequestBody ExperimentReview experimentReviewResult) { Experiment experiment = experimentService.getById(experimentReviewResult.getExperimentId()); ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(experimentReviewResult.getSampleId()); - ExperimentReview review = experimentReviewResultService.review(experiment, sampleInfo, ExperimentReviewProcessType.GJB548C); + ExperimentReview review = experimentReviewService.review(experiment, sampleInfo, ExperimentReviewProcessType.GJB548C); return Result.OK(review); } @@ -91,7 +95,7 @@ public class ExperimentReviewController extends JeecgController edit(@RequestBody ExperimentReview experimentReviewResult) { - experimentReviewResultService.updateById(experimentReviewResult); + experimentReviewService.updateById(experimentReviewResult); return Result.OK("编辑成功!"); } @@ -106,7 +110,7 @@ public class ExperimentReviewController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { - experimentReviewResultService.removeById(id); + experimentReviewService.removeById(id); return Result.OK("删除成功!"); } @@ -121,7 +125,7 @@ public class ExperimentReviewController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.experimentReviewResultService.removeByIds(Arrays.asList(ids.split(","))); + this.experimentReviewService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -135,7 +139,7 @@ public class ExperimentReviewController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { - ExperimentReview experimentReviewResult = experimentReviewResultService.getById(id); + ExperimentReview experimentReviewResult = experimentReviewService.getById(id); if (experimentReviewResult == null) { return Result.error("未找到对应数据"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentReviewDTO.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentReviewDTO.java new file mode 100644 index 0000000..4ba049e --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentReviewDTO.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.database.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ExperimentReviewDTO implements Serializable { + private String sampleName; + private String processType; + private String reviewResult; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index 148151f..b84c485 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -248,4 +249,9 @@ public class Experiment implements Serializable { @TableField(exist = false) private String pageName; + + + @TableField(exist = false) + private List ExperimentReviewList; + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java index f3b9b6e..4ba8ea0 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java @@ -1,15 +1,22 @@ package org.jeecg.modules.database.service; -import org.jeecg.modules.database.entity.*; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; +import org.jeecg.modules.database.entity.*; + +import java.util.List; /** * @Description: 试验评定结果 * @Author: jeecg-boot - * @Date: 2025-06-16 + * @Date: 2025-06-16 * @Version: V1.0 */ public interface IExperimentReviewService extends IService { ExperimentReview review(Experiment experiment, ExperimentSampleInfo sampleInfo, String processType); + + ExperimentReview getBySampleId(String experimentId, String sampleId); + + List getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 07d675b..e26b554 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -2,8 +2,11 @@ package org.jeecg.modules.database.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentReviewResultMapper; import org.jeecg.modules.database.service.*; @@ -11,8 +14,6 @@ import org.jeecg.modules.database.service.executor.ExecutorHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import java.util.*; /** @@ -30,6 +31,10 @@ public class ExperimentReviewServiceImpl extends ServiceImpl().eq(ExperimentReview::getExperimentId, experimentId) + .eq(ExperimentReview::getSampleId, sampleId), false); + } + + @Override + public List getByExperimentId(String experimentId) { + //Experiment experiment = experimentService.getById(experimentId); + List sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); + List result = new ArrayList<>(); + sampleInfoList.forEach(sampleInfo -> { + ExperimentReviewDTO dto = new ExperimentReviewDTO(); + dto.setSampleName(sampleInfo.getSampleName()); + ExperimentReview review = getBySampleId(experimentId, sampleInfo.getId()); + if (Objects.isNull(review)) { + dto.setProcessType(""); + dto.setReviewResult("未评定"); + } else { + dto.setProcessType(review.getProcessType()); + dto.setReviewResult(review.getResult()); + } + result.add(dto); + }); + return result; + } + private String adjustResult(String experimentId, String sampleId) { List detailList = experimentReviewDetailService.getBySample(experimentId, sampleId); ExperimentReviewDetail first = CollUtil.getFirst(detailList);