From 6b9359089a59a70f39b2929b13b93071fdc2e74f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 四月 2025 19:09:35 +0800
Subject: [PATCH] 取样操作管理
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java | 13 +
ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml | 28 ++++
ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java | 22 +++
ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java | 16 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 206 +++++++++++++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchCollectSamplesDTO.java | 19 ++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java | 14 ++
ruoyi-system/src/main/java/com/ruoyi/system/dto/TSamplingRecordDTO.java | 18 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java | 26 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/TSamplingRecordService.java | 9 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java | 18 ++
11 files changed, 386 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index 9818bd8..bb9ed44 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -1,9 +1,30 @@
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.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.*;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TSamplingRecordQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TSamplingRecordVO;
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.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -18,5 +39,186 @@
@RequestMapping("/t-sampling-record")
public class TSamplingRecordController {
+ private final TSamplingRecordService samplingRecordService;
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final TSamplingRecordOperationService samplingRecordOperationService;
+ @Autowired
+ public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService) {
+ this.samplingRecordService = samplingRecordService;
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ this.samplingRecordOperationService = samplingRecordOperationService;
+ }
+
+ /**
+ * 获取取样记录管理列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:list')")
+ @ApiOperation(value = "获取取样记录分页列表")
+ @PostMapping(value = "/api/t-sampling-record/pageList")
+ public R<PageInfo<TSamplingRecordVO>> pageList(@RequestBody String param) {
+ TSamplingRecordQuery query = JSON.parseObject(param, TSamplingRecordQuery.class);
+ return R.ok(samplingRecordService.pageList(query));
+ }
+
+ /**
+ * 添加取样记录管理
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:add')")
+ @Log(title = "取样记录信息-新增取样记录", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加取样记录",response = TSamplingRecordDTO.class)
+ @PostMapping(value = "/api/t-sampling-record/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TSamplingRecordDTO dto = JSON.parseObject(param,TSamplingRecordDTO.class);
+ // TODO 生成取样单编号
+ samplingRecordService.save(dto);
+ List<TSamplingRecordOperation> samplingRecordOperations = dto.getSamplingRecordOperations();
+ samplingRecordOperations.forEach(samplingRecordOperation -> {
+ samplingRecordOperation.setSamplingId(dto.getId());
+ });
+ samplingRecordOperationService.saveBatch(samplingRecordOperations);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:edit')")
+ @Log(title = "取样记录信息-修改取样记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改取样记录")
+ @PostMapping(value = "/api/t-sampling-record/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TSamplingRecordDTO dto = JSON.parseObject(param,TSamplingRecordDTO.class);
+ samplingRecordService.updateById(dto);
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId,dto.getId()));
+ List<TSamplingRecordOperation> samplingRecordOperations = dto.getSamplingRecordOperations();
+ samplingRecordOperations.forEach(samplingRecordOperation -> {
+ samplingRecordOperation.setSamplingId(dto.getId());
+ });
+ samplingRecordOperationService.saveBatch(samplingRecordOperations);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样操作记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ @Log(title = "取样记录信息-修改取样操作记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改取样操作记录")
+ @PostMapping(value = "/api/t-sampling-record/updateRecordOperation")
+ public R<Boolean> updateRecordOperation(@RequestBody String param) {
+ TSamplingRecordOperation operation = JSON.parseObject(param,TSamplingRecordOperation.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ operation.setHandlePersonId(userId);
+ samplingRecordOperationService.updateById(operation);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样操作记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ @Log(title = "取样记录信息-实验员提交取样记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "实验员提交取样记录")
+ @PostMapping(value = "/api/t-sampling-record/commitRecord")
+ public R<Boolean> commitRecord(@RequestBody String param) {
+ TSamplingRecord samplingRecord = JSON.parseObject(param,TSamplingRecord.class);
+ if(StringUtils.isBlank(samplingRecord.getCommitSign())){
+ return R.fail("请提交实验员签字");
+ }
+ Long userId = tokenService.getLoginUser().getUserId();
+ samplingRecord.setCommitPersonId(userId);
+ samplingRecord.setStatus(2);
+ samplingRecord.setCommitTime(LocalDateTime.now());
+ samplingRecordService.updateById(samplingRecord);
+ return R.ok();
+ }
+
+ /**
+ * 查看取样记录详情
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
+ @ApiOperation(value = "查看取样记录详情")
+ @GetMapping(value = "/open/t-sampling-record/getDetailById")
+ public R<TSamplingRecordVO> getDetailById(@RequestParam String id) {
+ TSamplingRecord samplingRecord = samplingRecordService.getById(id);
+ TSamplingRecordVO samplingRecordVO = new TSamplingRecordVO();
+ BeanUtils.copyProperties(samplingRecord, samplingRecordVO);
+
+ // 查询取样操作记录
+ samplingRecordVO.setSamplingRecordOperations(samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id)));
+
+ return R.ok(samplingRecordVO);
+ }
+
+ /**
+ * 删除取样记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ @Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除取样记录")
+ @DeleteMapping(value = "/open/t-sampling-record/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ // 删除取样操作记录
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
+ return R.ok(samplingRecordService.removeById(id));
+ }
+
+ /**
+ * 批量删除取样记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ @Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除取样记录")
+ @DeleteMapping(value = "/open/t-sampling-record/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ // 删除取样操作记录
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).in(TSamplingRecordOperation::getSamplingId, ids));
+ return R.ok(samplingRecordService.removeByIds(ids));
+ }
+
+ /**
+ * 批量送样
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:sendSamples')")
+ @Log(title = "取样记录信息-批量送样", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "批量送样")
+ @PostMapping(value = "/open/t-sampling-record/batchSendSamples")
+ public R<Boolean> batchSendSamples(@RequestBody String param) {
+ BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ // 批量送样
+ samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class)
+ .eq(TSamplingRecordOperation::getId, batchSendSamplesDTO.getRecordOperationId())
+ .set(TSamplingRecordOperation::getStatus, 2)
+ .set(TSamplingRecordOperation::getSendSign, batchSendSamplesDTO.getSendSign())
+ .set(TSamplingRecordOperation::getSendTime, LocalDateTime.now())
+ .set(TSamplingRecordOperation::getSendPersonId, userId));
+ return R.ok();
+ }
+
+ /**
+ * 批量删除取样记录
+ */
+ @PreAuthorize("@ss.hasPermi('system:samplingRecord:collectSamples')")
+ @Log(title = "取样记录信息-批量收样", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "批量收样")
+ @PostMapping(value = "/open/t-sampling-record/batchCollectSamples")
+ public R<Boolean> batchCollectSamples(@RequestBody String param) {
+ BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ // 批量送样
+ samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class)
+ .eq(TSamplingRecordOperation::getId, batchCollectSamplesDTO.getRecordOperationId())
+ .set(TSamplingRecordOperation::getStatus, 3)
+ .set(TSamplingRecordOperation::getReceiptsSign, batchCollectSamplesDTO.getReceiptsSign())
+ .set(TSamplingRecordOperation::getReceiptsTime, LocalDateTime.now())
+ .set(TSamplingRecordOperation::getReceiptsPersonId, userId));
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchCollectSamplesDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchCollectSamplesDTO.java
new file mode 100644
index 0000000..5db7dff
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchCollectSamplesDTO.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "批量收样DTO")
+public class BatchCollectSamplesDTO implements Serializable {
+
+ @ApiModelProperty(value = "取样操作记录id")
+ private String recordOperationId;
+
+ @ApiModelProperty(value = "收样签字")
+ private String receiptsSign;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java
new file mode 100644
index 0000000..9834132
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(value = "批量送样DTO")
+public class BatchSendSamplesDTO implements Serializable {
+
+ @ApiModelProperty(value = "取样操作记录id")
+ private String recordOperationId;
+
+ @ApiModelProperty(value = "送样签字")
+ private String sendSign;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TSamplingRecordDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TSamplingRecordDTO.java
new file mode 100644
index 0000000..f7084c1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TSamplingRecordDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TSamplingRecord;
+import com.ruoyi.system.model.TSamplingRecordOperation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "取样记录新增编辑DTO")
+public class TSamplingRecordDTO extends TSamplingRecord {
+
+ @ApiModelProperty(value = "取样操作记录集合")
+ private List<TSamplingRecordOperation> samplingRecordOperations;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java
index 0070cd0..0fc9160 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSamplingRecordMapper.java
@@ -1,7 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TSamplingRecord;
+import com.ruoyi.system.query.TSamplingRecordQuery;
+import com.ruoyi.system.vo.TSamplingRecordVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +19,12 @@
*/
public interface TSamplingRecordMapper extends BaseMapper<TSamplingRecord> {
+ /**
+ * 分页查询取样记录
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TSamplingRecordVO> pageList(@Param("query") TSamplingRecordQuery query, @Param("pageInfo")PageInfo<TSamplingRecordVO> pageInfo);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java
index 131ced6..030c4ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -41,8 +42,21 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送 2=已封存")
+ @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "提交人")
+ @TableField("commit_person_id")
+ private Long commitPersonId;
+
+ @ApiModelProperty(value = "提交人签字")
+ @TableField("commit_sign")
+ private String commitSign;
+
+ @ApiModelProperty(value = "提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("commit_time")
+ private LocalDateTime commitTime;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java
new file mode 100644
index 0000000..5200d82
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.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 TSamplingRecordQuery extends TimeRangeQueryBody {
+
+ @ApiModelProperty(value = "项目课题方案名称")
+ private String projectName;
+
+ @ApiModelProperty(value = "实验名称")
+ private String experimentName;
+
+ @ApiModelProperty(value = "实验编号")
+ private String experimentCode;
+
+ @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存")
+ @TableField("status")
+ private Integer status;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSamplingRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSamplingRecordService.java
index 0e624a4..0764732 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSamplingRecordService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSamplingRecordService.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TSamplingRecord;
+import com.ruoyi.system.query.TSamplingRecordQuery;
+import com.ruoyi.system.vo.TSamplingRecordVO;
/**
* <p>
@@ -13,4 +16,10 @@
*/
public interface TSamplingRecordService extends IService<TSamplingRecord> {
+ /**
+ * 获取取样记录分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TSamplingRecordVO> pageList(TSamplingRecordQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
index 557b0b0..64e4527 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
@@ -1,10 +1,16 @@
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.TSamplingRecordMapper;
import com.ruoyi.system.model.TSamplingRecord;
+import com.ruoyi.system.query.TSamplingRecordQuery;
import com.ruoyi.system.service.TSamplingRecordService;
+import com.ruoyi.system.vo.SysOperLogVO;
+import com.ruoyi.system.vo.TSamplingRecordVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +23,11 @@
@Service
public class TSamplingRecordServiceImpl extends ServiceImpl<TSamplingRecordMapper, TSamplingRecord> implements TSamplingRecordService {
+ @Override
+ public PageInfo<TSamplingRecordVO> pageList(TSamplingRecordQuery query) {
+ PageInfo<TSamplingRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TSamplingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java
new file mode 100644
index 0000000..1ccdfe2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TSamplingRecord;
+import com.ruoyi.system.model.TSamplingRecordOperation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "取样记录VO")
+public class TSamplingRecordVO extends TSamplingRecord {
+
+ @ApiModelProperty(value = "取样操作记录集合")
+ private List<TSamplingRecordOperation> samplingRecordOperations;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
index 8469c99..2df1b87 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
@@ -20,5 +20,33 @@
<sql id="Base_Column_List">
id, dispatch_id, sampling_code, remark, status, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TSamplingRecordVO">
+ select
+ tsr.id, tsr.dispatch_id, tsr.sampling_code, tsr.remark, tsr.status, tsr.create_time, tsr.update_time,
+ tsr.create_by, tsr.update_by, tsr.disabled, ted.experiment_code AS experimentCode,ted.experiment_name AS experimentName,
+ tpp.project_name AS projectName
+ from t_sampling_record tsr
+ left join t_experiment_dispatch ted on ted.id = tsr.dispatch_id
+ left join t_project_proposal tpp on tpp.id = ted.project_id
+ <where>
+ <if test="query.projectName != null and query.projectName != ''">
+ and tpp.project_name like concat('%', #{query.projectName}, '%')
+ </if>
+ <if test="query.experimentName != null and query.experimentName != ''">
+ and ted.experiment_name like concat('%', #{query.experimentName}, '%')
+ </if>
+ <if test="query.experimentCode != null and query.experimentCode !=''">
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND tsr.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ <if test="query.status != null">
+ and tsr.status = #{query.status}
+ </if>
+ AND tsr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tsr.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1