检验下单 功能调整

gaoaoy

2024-03-15 a5e88bf7cfb029f597a70b00bca50264125b2503

检验下单 功能调整

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -1,8 +1,11 @@
package com.yuanchu.mom.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +23,8 @@
public class InsOrderController {

    private InsOrderService insOrderService;

    private InsSampleService insSampleService;

    //获取检验下单数据
    @ApiOperation(value = "查询检验下单数据")
@@ -47,4 +52,21 @@
    public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) {
        return Result.success(insOrderService.upInsOrderParameter(itemParameter));
    }

    @ApiOperation(value = "修改检验下发数据")
    @PostMapping("/updateInsOrder")
    public Result updateInsOrder(@RequestBody InsOderDto insOderDto) {
        InsSample insSample = new InsSample();
        insSample.setId(insOderDto.getId());
        insSample.setCreateTime(insOderDto.getDate());
        insSample.setCreateUser(insOderDto.getOrderName());
        return Result.success(insSampleService.updateById(insSample));
    }

    @ApiOperation(value = "新增检验下发数据")
    @PostMapping("/addInsOrder")
    public Result addInsOrder(@RequestBody InsSample insSample) {
        return Result.success(insSampleService.save(insSample));
    }

}

 inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java

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

import com.yuanchu.mom.service.SampleOrderService;
import com.yuanchu.mom.vo.Result;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 19:10
 **/
@RestController
@AllArgsConstructor
@RequestMapping("/sampleOrder")
public class SampleOrderController {

    private SampleOrderService sampleOrderService;

    @GetMapping("/list")
    public Result list() {
        return Result.success(sampleOrderService.selectSampleOrderList());
    }
}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.time.LocalDateTime;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 16:44
 **/
@Data
public class InsOderDto {

    private Integer id;
    private Integer orderName;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime date;
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yuanchu.mom.pojo.InsOrder;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 18:46
 **/
@Data
public class SampleOrder {
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * 1：合格 0：不合格
     */
    private Integer insResult;

    /**
     * å¤–键：ins_order表id
     */
    private Integer insOrderId;

    /**
     * é…å¥—样品型号
     */
    private String joinModel;

    /**
     * é…å¥—样品名称
     */
    private String joinName;

    /**
     * æ ·å“ç¼–码
     */
    private String sampleCode;

    /**
     * æ£€éªŒå·¥åŽ‚
     */
    private String factory;

    /**
     * å®žéªŒå®¤åç§°
     */
    private String laboratory;

    /**
     * æ ·å“ç±»åž‹
     */
    private String sampleType;

    /**
     * æ ·å“åç§°
     */
    private String sample;

    /**
     * è§„格型号
     */
    private String model;

    /**
     * æ˜¯å¦ç•™æ · 1：留样 0：不留样
     */
    private Integer isLeave;

    /**
     * ç•™æ ·æ•°é‡
     */
    private Integer leaveNum;

    /**
     * æ£€æµ‹è¿›åº¦

     */
    private String insProgress;

    /**
     * æ£€éªŒçŠ¶æ€(0：待检验1:检验中 2:已检验3：待复核4：复核未通过5：复核通过)
     */
    private Integer insState;

    /**
     * ä¸‹å‘时间
     */
    private Date sendTime;

    /**
     * é…å¥—样品数量
     */
    private Integer joinNum;

    /**
     * å¤‡æ³¨
     */
    private String remark;

    /**
     * çº¦å®šæ—¶é—´
     */
    private Date appointed;

    /**
     *
     */
    private Integer createUser;

    /**
     *
     */
    private Integer updateUser;

    /**
     *
     */
    private Date createTime;

    /**
     *
     */
    private Date updateTime;

    private List<InsOrder> insOrderList;
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;

@@ -21,14 +22,11 @@
    //获取检验下单数据
    IPage<InsOrder> selectInsOrderParameter(IPage<InsOrder> page, QueryWrapper<InsOrder> ew);

    //添加检验下单数据
    int addInsOrderParameter(InsOrder itemParameter);

    //删除检验下单数据
    int delInsOrderParameter(Integer id);

    //修改检验下单数据
    int upInsOrderParameter(InsOrder itemParameter);

   //添加检验下单数据
    int addInsOrder(InsOderDto insOderDto);
}



 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -1,11 +1,10 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.pojo.InsSample;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.ibatis.annotations.Param;


 inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.dto.SampleOrder;

import java.util.List;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 18:54
 **/
public interface SampleOrderMapper extends BaseMapper<SampleOrder> {
    List<SampleOrder> selectSampleOrderList();
}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java

@@ -1,180 +1,136 @@
package com.yuanchu.mom.pojo;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import javax.validation.constraints.NotNull;

import java.io.Serializable;

import java.time.LocalDateTime;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Size;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;

/**
* æ£€éªŒä¸‹å•
* @TableName ins_order
*/
@Data
public class InsOrder implements Serializable {
public class InsOrder extends OrderBy implements Serializable {

    /**
    * 
    */
    @NotNull(message="[]不能为空")
    @ApiModelProperty("")
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
    * å§”托编号
    */
    @ValueTableShow(2)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("委托编号")
    @Length(max= 255,message="编码长度不能超过255")
    private String entrustCode;
    /**
    * æ ·å“ç¼–码
    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("样品编码")
    @Length(max= 255,message="编码长度不能超过255")
    private String sampleCode;

    /**
    * ä¸‹å•å®¢æˆ·
    */
    @ValueTableShow(3)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("下单客户")
    @Length(max= 255,message="编码长度不能超过255")
    private String custom;

    /**
    * ä¸‹å•å•ä½
    */
    @ValueTableShow(4)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("下单单位")
    @Length(max= 255,message="编码长度不能超过255")
    private String company;

    /**
    * å·¥åŽ‚域
    */
    @ValueTableShow(5)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("工厂域")
    @Length(max= 255,message="编码长度不能超过255")
    private String code;

    /**
    * ç´§æ€¥ç¨‹åº¦ ï¼ˆ0普通 1优先 2紧急）
    */
    @ApiModelProperty("紧急程度 ï¼ˆ0普通 1优先 2紧急）")
    @ValueTableShow(6)
    @ApiModelProperty("紧急程度")
    private Integer type;

    /**
    * çº¦å®šæ—¶é—´
    */
    @ValueTableShow(7)
    @ApiModelProperty("约定时间")
    private Date appointed;
    /**
    * å®žéªŒå®¤åç§°
    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("实验室名称")
    @Length(max= 255,message="编码长度不能超过255")
    private String laboratory;
    /**
    * æ ·å“ç±»åž‹
    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("样品类型")
    @Length(max= 255,message="编码长度不能超过255")
    private String sampleType;
    /**
    * è§„格型号
    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("规格型号")
    @Length(max= 255,message="编码长度不能超过255")
    private String model;
    /**
    * æ ·å“åç§°
    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("样品名称")
    @Length(max= 255,message="编码长度不能超过255")
    private String sample;
    /**
    * æ ·å“æ•°é‡
    */
    @ApiModelProperty("样品数量")
    private Double sampleNum;
    /**
    * æ˜¯å¦ç•™æ ·
    */
    @ApiModelProperty("是否留样")
    private Integer isLeave;
    /**
    * ç•™æ ·æ•°é‡
    */
    @ApiModelProperty("留样数量")
    private Integer leaveNum;
    /**
    * æ£€æµ‹è¿›åº¦
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate appointed;

    */
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("检测进度")
    @Length(max= 255,message="编码长度不能超过255")
    private String insProgress;
    /**
    * 1：检验处理 0：待审核 2：退回 3：撤销
    */
    @ApiModelProperty("1：检验处理 0：待审核 2：退回 3：撤销")
    @ApiModelProperty("检验处理")
    private Integer state;

    /**
    * å¤‡æ³¨
    */
    @ValueTableShow(9)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("备注")
    @Length(max= 255,message="编码长度不能超过255")
    private String remark;

    /**
    * OTC订单号
    */
    @ValueTableShow(10)
    @Size(max= 255,message="编码长度不能超过255")
    @ApiModelProperty("OTC订单号")
    @Length(max= 255,message="编码长度不能超过255")
    private String otcCode;

    @ValueTableShow(11)
    @ApiModelProperty("下单人")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    /**
     *
     */
    @ValueTableShow(12)
    @ApiModelProperty("下单时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    /**
     *
     */
    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    /**
     *
     */
    @ValueTableShow(13)
    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
    /**
    * å¤–键：下单客户 user表id
    */
    @ApiModelProperty("外键：下单客户 user表id")
    private Integer userId;

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java

@@ -1,12 +1,14 @@
package com.yuanchu.mom.pojo;

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 java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * æ£€éªŒæ ·å“
@@ -125,13 +127,11 @@
    /**
     * 
     */
    private Date createTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    /**
     * 
     */
    private Date updateTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;

@@ -29,4 +30,6 @@
    //修改检验下单数据
    int upInsOrderParameter(InsOrder itemParameter);

    int addInsOrder(InsOderDto insOderDto);

}

 inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.SampleOrder;

import java.util.List;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 19:07
 **/
public interface SampleOrderService extends IService<SampleOrder> {
    List<SampleOrder> selectSampleOrderList();
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.pojo.InsOrder;
@@ -63,6 +64,11 @@
    public int upInsOrderParameter(InsOrder itemParameter) {
        return insOrderMapper.updateById(itemParameter);
    }

    @Override
    public int addInsOrder(InsOderDto insOderDto) {
        return insOrderMapper.addInsOrder(insOderDto);
    }
}



 inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.SampleOrder;
import com.yuanchu.mom.mapper.SampleOrderMapper;
import com.yuanchu.mom.service.SampleOrderService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @author gaoaoy
 * @version 1.0.0
 * @create 2024/3/14 19:07
 **/
@Service
@AllArgsConstructor
public class SampleOrderServiceImpl extends ServiceImpl<SampleOrderMapper,SampleOrder> implements SampleOrderService {


    private SampleOrderMapper sampleOrderMapper;

    @Override
    public List<SampleOrder> selectSampleOrderList() {
        return sampleOrderMapper.selectSampleOrderList();
    }
}

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

@@ -3,23 +3,14 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
        <result property="sampleCode" column="sample_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="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="sampleNum" column="sample_num" jdbcType="DOUBLE"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
        <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="otcCode" column="otc_code" jdbcType="VARCHAR"/>
@@ -39,6 +30,13 @@
        otc_code,create_user,create_time,
        update_user,update_time
    </sql>

    <select id="addInsOrder">
        insert into ins_order
        (entrust_code,sample_code,custom,company,code,type,laboratory,model,sample,sample_num,is_leave,leave_num,ins_progress,state,remark,otc_code,create_user,create_time,update_user,update_time)
        values
        (#{entrustCode},#{sampleCode},#{custom},#{company},#{code},#{type},#{appointedTime},#{laboratory},#{smapleType},#{model},#{sample},#{sampleNum},#{isLeave},#{leaveNum},#{insProgress},#{state},#{remark},#{otcCode},#{createUser},#{createTime},#{updateUser},#{updateTime})
    </select>

    <resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
        <result property="id" column="id"/>
@@ -82,28 +80,20 @@
        from (
        select
        id,
        entrust_code,
        sample_code,
        custom,
        company,
        code,
        type,
        appointed,
        laboratory,
        sample_type,
        model,
        sample,
        sample_num,
        is_leave,
        leave_num,
        ins_progress,
        state,
        remark,
        otc_code,
        user_id,
        create_user,
        create_time,
        otc_code,
        code,
        custom,
        update_user,
        update_time
        update_time,
        type,
        entrust_code,
        company,
        remark,
        create_time,
        state
        from ins_order
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -114,32 +104,24 @@
    <update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
        UPDATE ins_order
        <set>
            <if test="entrustCode!=null and entrustCode!='' ">entrust_code=#{entrustCode},</if>
            <if test="sample_Code!=null  ">sample_code=#{sampleCode},</if>
            <if test="custom!=null  ">custom=#{custom},</if>
            <if test="company!=null  ">company=#{company}</if>
            <if test="code!=null  ">code=#{code}</if>
            <if test="type!=null  ">type=#{type}</if>
            <if test="appointed!=null  ">appointed=#{appointed}</if>
            <if test="laboratory!=null  ">laboratory=#{laboratory}</if>
            <if test="smapleType!=null  ">smaple_type=#{smapleType}</if>
            <if test="model!=null  ">model=#{model}</if>
            <if test="sample!=null  ">sample=#{sample}</if>
            <if test="sampleNum!=null  ">sample_num=#{sampleNum}</if>
            <if test="isLeave!=null  ">is_leave=#{isLeave}</if>
            <if test="leaveNum!=null  ">leave_num=#{leaveNum}</if>
            <if test="insProgress!=null  ">ins_progress=#{insProgress}</if>
            <if test="state!=null  ">state=#{state}</if>
            <if test="remark!=null  ">remark=#{remark}</if>
            <if test="otcCode!=null  ">otc_code=#{otcCode}</if>
            <if test="appointed!=null and appointed!='' ">appointed=#{appointed},</if>
            <if test="userId!=null  ">user_id=#{userId},</if>
            <if test="createUser!=null  ">create_user=#{createUser}</if>
            <if test="createTime!=null  ">create_time=#{createTime}</if>
            <if test="otcCode!=null  ">otc_code=#{otcCode}</if>
            <if test="code!=null  ">code=#{code}</if>
            <if test="custom!=null  ">custom=#{custom}</if>
            <if test="updateUser!=null  ">update_user=#{updateUser}</if>
            <if test="updateTime!=null  ">update_time=#{updateTime}</if>
            <if test="type!=null  ">type=#{type}</if>
            <if test="entrustCode!=null  ">entrust_code=#{entrustCode}</if>
            <if test="company!=null  ">company=#{company}</if>
            <if test="remark!=null  ">remark=#{remark}</if>
            <if test="createTime!=null  ">create_time=#{createTime}</if>
            <if test="state!=null  ">state=#{state}</if>
        </set>
        <where>
            id=#{id}
        </where>
        </where>-->
    </update>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
<?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.yuanchu.mom.mapper.SampleOrderMapper">
    <resultMap id="map" type="com.yuanchu.mom.dto.SampleOrder">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
        <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
        <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
        <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
        <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
        <result property="insState" column="ins_state" jdbcType="INTEGER"/>
        <result property="sendTime" column="send_time" jdbcType="TIMESTAMP"/>
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <association property="insOrderList" javaType="InsOrder">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="entrustCode" column="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="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"/>
        </association>
    </resultMap>
    <select id="selectSampleOrderList" resultMap="map">
        select * from(
        select s.id,
        s.join_name,
        o.create_user,
        o.create_time,
        o.update_user,
        o.update_time
        from ins_sample s
        left join ins_order o on s.ins_order_id = o.id
        )a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>