From b2690b02f12d529ec7bb45e059c6d2eef59b7f2c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 四月 2025 16:36:06 +0800
Subject: [PATCH] 原始检测项管理
---
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml | 30 +++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java | 9 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java | 87 ++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalDataService.java | 16 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalDataController.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalDataMapper.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java | 14 ++
ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml | 6
/dev/null | 20 ---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java | 13 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java | 13 +
ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetOriginalQuery.java | 26 ++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetOriginalVO.java | 35 +++++
ruoyi-system/src/main/java/com/ruoyi/system/dto/TTestMethodConfirmSheetOriginalDTO.java | 18 +++
ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginalData.java | 12 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalDataServiceImpl.java | 20 +++
16 files changed, 303 insertions(+), 36 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
index 56bd24e..fdd98ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
@@ -1,9 +1,31 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TTestMethodConfirmSheetOriginalDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
+import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService;
+import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
+import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -15,10 +37,69 @@
*/
@Api(tags = "原始检测项管理")
@RestController
-@RequestMapping("/t-test-method-confirm-sheet-term")
+@RequestMapping("/t-test-method-confirm-sheet-original")
public class TTestMethodConfirmSheetOriginalController {
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
+ private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService;
+ @Autowired
+ public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService) {
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
+ this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService;
+ }
+ /**
+ * 获取检验方法确认单管理列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
+ @ApiOperation(value = "获取检验方法确认单分页列表")
+ @PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
+ public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
+ TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);
+ return R.ok(testMethodConfirmSheetOriginalService.pageList(query));
+ }
+
+ /**
+ * 修改检验方法确认单
+ */
+ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
+ @Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改检验方法确认单")
+ @PostMapping(value = "/api/t-test-method-confirm-sheet-original/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TTestMethodConfirmSheetOriginalDTO dto = JSON.parseObject(param, TTestMethodConfirmSheetOriginalDTO.class);
+ testMethodConfirmSheetOriginalService.updateById(dto);
+ testMethodConfirmSheetOriginalDataService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, dto.getId()));
+ List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = dto.getTestMethodConfirmSheetOriginalDataList();
+ testMethodConfirmSheetOriginalDataList.forEach(testMethodConfirmSheetOriginalData -> {
+ testMethodConfirmSheetOriginalData.setOriginalId(dto.getId());
+ });
+ testMethodConfirmSheetOriginalDataService.saveBatch(testMethodConfirmSheetOriginalDataList);
+ return R.ok();
+ }
+
+ /**
+ * 查看检验方法确认单详情
+ */
+ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')")
+ @ApiOperation(value = "查看检验方法确认单详情")
+ @GetMapping(value = "/open/t-test-method-confirm-sheet-original/getDetailById")
+ public R<TTestMethodConfirmSheetOriginalVO> getDetailById(@RequestParam String id) {
+ TTestMethodConfirmSheetOriginal testMethodConfirmSheet = testMethodConfirmSheetOriginalService.getById(id);
+ TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetVO = new TTestMethodConfirmSheetOriginalVO();
+ BeanUtils.copyProperties(testMethodConfirmSheet, testMethodConfirmSheetVO);
+
+ // 查询检测数据
+ List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = testMethodConfirmSheetOriginalDataService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id));
+ testMethodConfirmSheetVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);
+ return R.ok(testMethodConfirmSheetVO);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetTermDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalDataController.java
similarity index 75%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetTermDataController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalDataController.java
index e0b7a63..a808d46 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetTermDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalDataController.java
@@ -15,8 +15,8 @@
*/
@Api(tags = "检验记录检测数据管理")
@RestController
-@RequestMapping("/t-test-method-confirm-sheet-term-data")
-public class TTestMethodConfirmSheetTermDataController {
+@RequestMapping("/t-test-method-confirm-sheet-original-data")
+public class TTestMethodConfirmSheetOriginalDataController {
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTestMethodConfirmSheetOriginalDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTestMethodConfirmSheetOriginalDTO.java
new file mode 100644
index 0000000..5001b76
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTestMethodConfirmSheetOriginalDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "原始检验记录编辑DTO")
+public class TTestMethodConfirmSheetOriginalDTO extends TTestMethodConfirmSheetOriginal {
+
+ @ApiModelProperty(value = "检测数据及图照集合")
+ private List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalDataMapper.java
new file mode 100644
index 0000000..04ca6f6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalDataMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+
+/**
+ * <p>
+ * 检验记录检测数据 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-04-08
+ */
+public interface TTestMethodConfirmSheetOriginalDataMapper extends BaseMapper<TTestMethodConfirmSheetOriginalData> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java
index 1f9fa5e..8b10e05 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java
@@ -1,8 +1,14 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
+import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
+import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -14,4 +20,12 @@
*/
public interface TTestMethodConfirmSheetOriginalMapper extends BaseMapper<TTestMethodConfirmSheetOriginal> {
+ /**
+ * 分页查询原始检测项
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TTestMethodConfirmSheetOriginalVO> pageList(@Param("query") TTestMethodConfirmSheetOriginalQuery query, @Param("pageInfo")PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetTermDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetTermDataMapper.java
deleted file mode 100644
index d354e6d..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetTermDataMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.model.TTestMethodConfirmSheetTermData;
-
-/**
- * <p>
- * 检验记录检测数据 Mapper 接口
- * </p>
- *
- * @author xiaochen
- * @since 2025-04-08
- */
-public interface TTestMethodConfirmSheetTermDataMapper extends BaseMapper<TTestMethodConfirmSheetTermData> {
-
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
index 18bde3f..5536c9b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
@@ -13,7 +13,7 @@
/**
* <p>
- * 实验员工作评定
+ * 实验结果评定
* </p>
*
* @author xiaochen
@@ -22,7 +22,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_result_work_evaluate")
-@ApiModel(value="TResultWorkEvaluate对象", description="实验员工作评定")
+@ApiModel(value="TResultWorkEvaluate对象", description="实验结果评定")
public class TResultWorkEvaluate extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -34,13 +34,17 @@
@TableField("dispatch_id")
private String dispatchId;
- @ApiModelProperty(value = "实验员id")
+ @ApiModelProperty(value = "用户id")
@TableField("user_id")
private Integer userId;
@ApiModelProperty(value = "实验结果id")
@TableField("result_report_id")
private String resultReportId;
+
+ @ApiModelProperty(value = "评定类型 1=工艺工程师 2=化验师 3=实验员")
+ @TableField("evaluate_type")
+ private Integer evaluateType;
@ApiModelProperty(value = "1=良好 2=正确 3=失误")
@TableField("evaluate_one")
@@ -79,6 +83,9 @@
@TableField("evaluate_time")
private LocalDateTime evaluateTime;
+ @ApiModelProperty(value = "评定分数 json")
+ @TableField("result_evaluate_json")
+ private String resultEvaluateJson;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTermData.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginalData.java
similarity index 77%
rename from ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTermData.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginalData.java
index 904d18a..edd8cbf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTermData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginalData.java
@@ -12,7 +12,7 @@
/**
* <p>
- * 检验记录检测数据
+ * 原始检验记录检测数据
* </p>
*
* @author xiaochen
@@ -20,9 +20,9 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("t_test_method_confirm_sheet_term_data")
-@ApiModel(value="TTestMethodConfirmSheetTermData对象", description="检验记录检测数据")
-public class TTestMethodConfirmSheetTermData extends BaseModel {
+@TableName("t_test_method_confirm_sheet_original_data")
+@ApiModel(value="TTestMethodConfirmSheetOriginalData对象", description="原始检验记录检测数据")
+public class TTestMethodConfirmSheetOriginalData extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -46,8 +46,8 @@
private String dataType;
@ApiModelProperty(value = "图片")
- @TableField("data_pritures")
- private String dataPritures;
+ @TableField("data_pictures")
+ private String dataPictures;
@ApiModelProperty(value = "文件json")
@TableField("data_files")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetOriginalQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetOriginalQuery.java
new file mode 100644
index 0000000..f1d8530
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetOriginalQuery.java
@@ -0,0 +1,26 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.model.TimeRangeQueryBody;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "原始检测项查询对象query")
+public class TTestMethodConfirmSheetOriginalQuery extends TimeRangeQueryBody {
+
+ @ApiModelProperty(value = "项目课题方案")
+ private String projectName;
+
+ @ApiModelProperty(value = "实验编号")
+ private String experimentCode;
+
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ @ApiModelProperty(value = "状态 -1=草稿箱 1=未填写 2=已填写")
+ @TableField("status")
+ private Integer status;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalDataService.java
new file mode 100644
index 0000000..841a55c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalDataService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+
+/**
+ * <p>
+ * 检验记录检测数据 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-04-08
+ */
+public interface TTestMethodConfirmSheetOriginalDataService extends IService<TTestMethodConfirmSheetOriginalData> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java
index d40b3f4..60f6978 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java
@@ -1,8 +1,11 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
+import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
+import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
/**
* <p>
@@ -14,4 +17,10 @@
*/
public interface TTestMethodConfirmSheetOriginalService extends IService<TTestMethodConfirmSheetOriginal> {
+ /**
+ * 获取检验方法确认单分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetTermDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetTermDataService.java
deleted file mode 100644
index 3737285..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetTermDataService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.model.TTestMethodConfirmSheetTermData;
-
-/**
- * <p>
- * 检验记录检测数据 服务类
- * </p>
- *
- * @author xiaochen
- * @since 2025-04-08
- */
-public interface TTestMethodConfirmSheetTermDataService extends IService<TTestMethodConfirmSheetTermData> {
-
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalDataServiceImpl.java
new file mode 100644
index 0000000..3e8fedc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalDataServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalDataMapper;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检验记录检测数据 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-04-08
+ */
+@Service
+public class TTestMethodConfirmSheetOriginalDataServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalDataMapper, TTestMethodConfirmSheetOriginalData> implements TTestMethodConfirmSheetOriginalDataService {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
index dd057a0..6c58ce5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
@@ -1,13 +1,19 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalMapper;
import com.ruoyi.system.mapper.TTestMethodConfirmSheetTermMapper;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
+import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
import com.ruoyi.system.service.TTestMethodConfirmSheetTermService;
+import com.ruoyi.system.vo.TExperimentResultReportVO;
+import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -20,4 +26,11 @@
@Service
public class TTestMethodConfirmSheetOriginalServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalMapper, TTestMethodConfirmSheetOriginal> implements TTestMethodConfirmSheetOriginalService {
+ @Override
+ public PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query) {
+ PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TTestMethodConfirmSheetOriginalVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetTermDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetTermDataServiceImpl.java
deleted file mode 100644
index 9f264e0..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetTermDataServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.mapper.TTestMethodConfirmSheetTermDataMapper;
-import com.ruoyi.system.model.TTestMethodConfirmSheetTermData;
-import com.ruoyi.system.service.TTestMethodConfirmSheetTermDataService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 检验记录检测数据 服务实现类
- * </p>
- *
- * @author xiaochen
- * @since 2025-04-08
- */
-@Service
-public class TTestMethodConfirmSheetTermDataServiceImpl extends ServiceImpl<TTestMethodConfirmSheetTermDataMapper, TTestMethodConfirmSheetTermData> implements TTestMethodConfirmSheetTermDataService {
-
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetOriginalVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetOriginalVO.java
new file mode 100644
index 0000000..9d99041
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetOriginalVO.java
@@ -0,0 +1,35 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "原始检验记录返回VO", description = "原始检验记录")
+public class TTestMethodConfirmSheetOriginalVO extends TTestMethodConfirmSheetOriginal {
+
+ @ApiModelProperty(value = "项目课题方案")
+ private String projectName;
+
+ @ApiModelProperty(value = "实验编号")
+ private String experimentCode;
+
+ @ApiModelProperty(value = "实验名称")
+ private String experimentName;
+
+ @ApiModelProperty(value = "检测项编号")
+ private String termCode;
+
+ @ApiModelProperty(value = "检测项名称")
+ private String termName;
+
+ @ApiModelProperty(value = "检测数据")
+ private List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList;
+
+
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index 71c32ed..ed5338c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -3,11 +3,12 @@
<mapper namespace="com.ruoyi.system.mapper.TResultWorkEvaluateMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTesterWorkEvaluate">
+ <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TResultWorkEvaluate">
<id column="id" property="id" />
<result column="dispatch_id" property="dispatchId" />
<result column="user_id" property="userId" />
<result column="result_report_id" property="resultReportId" />
+ <result column="evaluate_type" property="evaluateType" />
<result column="evaluate_one" property="evaluateOne" />
<result column="evaluate_two" property="evaluateTwo" />
<result column="evaluate_three" property="evaluateThree" />
@@ -17,6 +18,7 @@
<result column="status" property="status" />
<result column="evaluate_person_id" property="evaluatePersonId" />
<result column="evaluate_time" property="evaluateTime" />
+ <result column="result_evaluate_json" property="resultEvaluateJson" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="create_by" property="createBy" />
@@ -26,7 +28,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, dispatch_id, user_id, result_report_id, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time, create_time, update_time, create_by, update_by, disabled
+ id, dispatch_id, user_id, result_report_id,evaluate_type, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time,result_evaluate_json, create_time, update_time, create_by, update_by, disabled
</sql>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
index 7f26395..bf1ff11 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
@@ -24,5 +24,35 @@
<sql id="Base_Column_List">
id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step, term_result, status, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO">
+ select ttmcso.id, ttmcso.term_id, ttmcso.original_code, ttmcso.term_standard, ttmcso.term_instrument, ttmcso.term_reagent,
+ ttmcso.term_step, ttmcso.term_result, ttmcso.status, ttmcso.create_time, ttmcso.update_time, ttmcso.create_by,
+ ttmcso.update_by, ttmcso.disabled,tpp.project_name AS projectName,ted.experiment_code AS experimentCode,
+ ted.experiment_name AS experimentName,ttmcst.term_name AS termName,ttmcst.term_code AS termCode
+ from t_test_method_confirm_sheet_original ttmcso
+ left join t_test_method_confirm_sheet_term ttmcst on ttmcso.term_id = ttmcst.id
+ left join t_test_method_confirm_sheet ttmcs on ttmcst.test_id = ttmcs.id
+ left join t_experiment_dispatch ted on ttmcs.dispatch_id = ted.id
+ left join t_project_proposal tpp on ted.project_id = tpp.id
+ <where>
+ <if test="query.projectName != null and query.projectName != ''">
+ and tpp.project_name like concat('%', #{query.projectName}, '%')
+ </if>
+ <if test="query.experimentCode != null and query.experimentCode != ''">
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
+ </if>
+ <if test="query.createBy != null and query.createBy != ''">
+ and ttmcso.create_by like concat('%', #{query.createBy}, '%')
+ </if>
+ <if test="query.status != null">
+ and ttmcso.status = #{query.status}
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND ttmcso.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ AND ttmcso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY ttmcso.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1