原始检测项管理

xuhy

2025-04-24 1c139903c8da49a46bdde66f3a68064cbf22f111

原始检测项管理

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java

@@ -131,6 +131,7 @@
        List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
                .eq(TExperimentScheme::getDispatchId, experimentResultReport.getDispatchId()));
        experimentResultReportVO.setExperimentSchemes(experimentSchemes);
        // 查询检验报告列表
        List<TInspectionReport> inspectionReports = inspectionReportService.list(Wrappers.lambdaQuery(TInspectionReport.class)
                .eq(TInspectionReport::getDispatchId, experimentResultReport.getDispatchId()));
        experimentResultReportVO.setInspectionReports(inspectionReports);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java

@@ -13,9 +13,11 @@
import com.ruoyi.system.dto.TestMethodConfirmSheetSignDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.TTestMethodConfirmSheet;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
import com.ruoyi.system.query.TTestMethodConfirmSheetQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
import com.ruoyi.system.service.TTestMethodConfirmSheetService;
import com.ruoyi.system.service.TTestMethodConfirmSheetTermService;
import com.ruoyi.system.vo.TTestMethodConfirmSheetVO;
@@ -28,6 +30,7 @@
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@@ -48,13 +51,15 @@
    private final ISysUserService sysUserService;
    private final SysUserMapper sysUserMapper;
    private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;
    private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
    @Autowired
    public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService) {
    public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
        this.testMethodConfirmSheetService = testMethodConfirmSheetService;
        this.tokenService = tokenService;
        this.sysUserService = sysUserService;
        this.sysUserMapper = sysUserMapper;
        this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;
        this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
    }

    /**
@@ -84,6 +89,17 @@
            testMethodConfirmSheetTerm.setStatus(1);
        });
        testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
        List<TTestMethodConfirmSheetOriginal> testMethodConfirmSheetOriginals = new ArrayList<>();
        for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
            // 添加原始记录
            TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
            testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
            // TODO 生成原始记录编号
            testMethodConfirmSheetOriginal.setOriginalCode("");
            testMethodConfirmSheetOriginal.setStatus(1);
            testMethodConfirmSheetOriginals.add(testMethodConfirmSheetOriginal);
        }
        testMethodConfirmSheetOriginalService.saveBatch(testMethodConfirmSheetOriginals);
        return R.ok();
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.web.controller.api;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 原始检测项 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-04-08
 */
@Api(tags = "原始检测项管理")
@RestController
@RequestMapping("/t-test-method-confirm-sheet-term")
public class TTestMethodConfirmSheetOriginalController {



}


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;

/**
 * <p>
 * 原始检测项 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-04-08
 */
public interface TTestMethodConfirmSheetOriginalMapper extends BaseMapper<TTestMethodConfirmSheetOriginal> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginal.java

New file
@@ -0,0 +1,65 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 检验方法确认单检测项
 * </p>
 *
 * @author xiaochen
 * @since 2025-04-08
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_test_method_confirm_sheet_original")
@ApiModel(value="TTestMethodConfirmSheetOriginal对象", description="原始检测项")
public class TTestMethodConfirmSheetOriginal extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "检测项id")
    @TableField("term_id")
    private String termId;

    @ApiModelProperty(value = "原始检测项编号")
    @TableField("original_code")
    private String originalCode;

    @ApiModelProperty(value = "检测标准")
    @TableField("term_standard")
    private String termStandard;

    @ApiModelProperty(value = "检测仪器")
    @TableField("term_instrument")
    private String termInstrument;

    @ApiModelProperty(value = "检测试剂")
    @TableField("term_reagent")
    private String termReagent;

    @ApiModelProperty(value = "检测步骤")
    @TableField("term_step")
    private String termStep;

    @ApiModelProperty(value = "检测结果")
    @TableField("term_result")
    private String termResult;

    @ApiModelProperty(value = "状态 -1=草稿箱 1=未填写 2=已填写")
    @TableField("status")
    private Integer status;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTerm.java

@@ -57,26 +57,6 @@
    @TableField("sample_require")
    private String sampleRequire;

    @ApiModelProperty(value = "检测标准")
    @TableField("term_standard")
    private String termStandard;

    @ApiModelProperty(value = "检测仪器")
    @TableField("term_instrument")
    private String termInstrument;

    @ApiModelProperty(value = "检测试剂")
    @TableField("term_reagent")
    private String termReagent;

    @ApiModelProperty(value = "检测步骤")
    @TableField("term_step")
    private String termStep;

    @ApiModelProperty(value = "检测结果")
    @TableField("term_result")
    private String termResult;

    @ApiModelProperty(value = "状态 -1=草稿箱 1=未填写 2=已填写")
    @TableField("status")
    private Integer status;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTermData.java

@@ -29,9 +29,9 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "检测项id")
    @TableField("term_id")
    private String termId;
    @ApiModelProperty(value = "原始检测项id")
    @TableField("original_id")
    private String originalId;

    @ApiModelProperty(value = "数据编号")
    @TableField("data_code")

 ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;

/**
 * <p>
 * 原始检测项 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-04-08
 */
public interface TTestMethodConfirmSheetOriginalService extends IService<TTestMethodConfirmSheetOriginal> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.service.TTestMethodConfirmSheetOriginalService;
import com.ruoyi.system.service.TTestMethodConfirmSheetTermService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 原始检测项 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-04-08
 */
@Service
public class TTestMethodConfirmSheetOriginalServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalMapper, TTestMethodConfirmSheetOriginal> implements TTestMethodConfirmSheetOriginalService {

}

 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTestMethodConfirmSheetOriginal">
        <id column="id" property="id" />
        <result column="term_id" property="termId" />
        <result column="original_code" property="originalCode" />
        <result column="term_standard" property="termStandard" />
        <result column="term_instrument" property="termInstrument" />
        <result column="term_reagent" property="termReagent" />
        <result column="term_step" property="termStep" />
        <result column="term_result" property="termResult" />
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <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>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetTermDataMapper.xml

@@ -5,7 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTestMethodConfirmSheetTermData">
        <id column="id" property="id" />
        <result column="term_id" property="termId" />
        <result column="original_id" property="originalId" />
        <result column="data_code" property="dataCode" />
        <result column="data_title" property="dataTitle" />
        <result column="data_type" property="dataType" />
@@ -20,7 +20,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, term_id, data_code, data_title, data_type, data_pritures, data_files, create_time, update_time, create_by, update_by, disabled
        id, original_id, data_code, data_title, data_type, data_pritures, data_files, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetTermMapper.xml

@@ -12,11 +12,6 @@
        <result column="term_method_code" property="termMethodCode" />
        <result column="term_method" property="termMethod" />
        <result column="sample_require" property="sampleRequire" />
        <result column="term_standard" property="termStandard" />
        <result column="term_instrument" property="termInstrument" />
        <result column="term_reagent" property="termReagent" />
        <result column="term_step" property="termStep" />
        <result column="term_result" property="termResult" />
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
@@ -27,7 +22,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, test_id, term_code, term_name, term_type, term_method_code,term_method, sample_require, term_standard, term_instrument, term_reagent, term_step, term_result, status, create_time, update_time, create_by, update_by, disabled
        id, test_id, term_code, term_name, term_type, term_method_code,term_method, sample_require, status, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>