第二次

zss

2024-11-21 423189d101d532e13e0a0d35a6651107aa1cae34

第二次

 inspect-server/src/main/java/com/yuanchu/mom/dto/ReportDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.mom.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
//检验下单页面展示多条报告信息
public class ReportDto {

    @ApiModelProperty("报告id")
    private String reportId;

    @TableField("`url`")
    private String url;

    private String urlS;

    private String name;
}

 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java

@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author gaoaoy
 * @version 1.0.0
@@ -43,14 +45,6 @@
    @ApiModelProperty("检验进度%")
    private String insProgress;

    @ApiModelProperty("报告id")
    private String reportId;

    @TableField("`url`")
    private String url;

    private String urlS;

    private String name;
   private List<ReportDto> reportDtos;

}

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -60,6 +60,40 @@
        <association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/>
    </resultMap>

    <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.SampleOrderDto">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
        <result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/>
        <result property="custom" column="custom" jdbcType="VARCHAR"/>
        <result property="company" column="company" jdbcType="VARCHAR"/>
        <result property="code" column="code" jdbcType="VARCHAR"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="rule" column="rule" jdbcType="VARCHAR"/>
        <result property="otcCode" column="otc_code" jdbcType="VARCHAR"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="revocationInsProductIds" column="revocation_ins_product_ids"/>
        <result property="assign" column="assign"/>
        <result property="sampleNum" column="sample_num"/>
        <result property="insProgress" column="insProgress"/>
        <result property="sampleCode" column="sample_code"/>
        <result property="motorNumber" column="motor_number"/>
        <result property="sampleName" column="sample_name"/>
        <result property="sampleModel" column="sample_model"/>
        <collection property="reportDtos" ofType="com.yuanchu.mom.dto.ReportDto" resultMap="reportDto"/>
    </resultMap>
    <resultMap id="reportDto" type="com.yuanchu.mom.dto.ReportDto">
        <result property="reportId" column="reportId"/>
        <result property="url" column="url"/>
        <result property="urlS" column="urlS"/>
        <result property="name" column="name"/>
    </resultMap>

    <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
        select *
        from (

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -418,7 +418,7 @@
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
               ins_sample_id,
               ip.ins_sample_id,
               ip.create_user   ip_create_user,
               ip.update_user   ip_update_user,
               ip.create_time   ip_create_time,
@@ -439,7 +439,7 @@
               ipr2.equip_name  equipName2,
               ip.method_s
        from ins_sample isa
                 left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
                 left join ins_order_state ios on isa.id = ios.ins_sample_id
                 left join ins_product ip on isa.id = ip.ins_sample_id
                 left join ins_product_result ipr on ip.id = ipr.ins_product_id
                 left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
@@ -492,7 +492,7 @@
               `last_value`,
               ip.ins_result    ip_ins_result,
               state,
               ins_sample_id,
               ip.ins_sample_id,
               ip.create_user   ip_create_user,
               ip.update_user   ip_update_user,
               ip.create_time   ip_create_time,
@@ -513,7 +513,7 @@
               ipr2.equip_name  equipName2,
               ip.method_s
        from ins_sample isa
                 left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
                 left join ins_order_state ios on isa.id = ios.ins_sample_id
                 left join ins_product ip on isa.id = ip.ins_sample_id
                 left join ins_product_result ipr on ip.id = ipr.ins_product_id
                 left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id