功能调整

李林

2024-03-08 f7a95fddddb0efd60abdab7550ae636c379a2a20

功能调整

 cnas-server/src/main/resources/mapper/DeviceMapper.xml

@@ -60,17 +60,13 @@
    </select>
    <select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
        select id,
               authorized_person,
               status
               authorized_person
        from device
    </select>
    <select id="search" resultType="com.yuanchu.mom.pojo.Device">
        select *
        from device
        <where>
            <if test="status!=null">
                and status = #{status}
            </if>
            <if test="deviceName!=null and deviceName!=''">
                and device_name like concat('%',#{deviceName},'%')
            </if>

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

@@ -5,6 +5,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardMethodListService;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
@@ -23,6 +24,8 @@
    private StandardMethodListService standardMethodListService;

    private StandardProductListService standardProductListService;

    private InsOrderService insOrderService;

    @ApiOperation(value = "获取标准树")
    @GetMapping("/selectStandardTreeList")
@@ -81,4 +84,11 @@
        return Result.success(standardTreeService.delStandardTree(tree));
    }

    @ApiOperation(value = "外部获取检测数据")
    @GetMapping("/getOrderThing")
    @ValueAuth
    public Result getOrderThing(){
        return Result.success(insOrderService.getOrderThing());
    }

}

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

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

import com.yuanchu.mom.pojo.InsProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

@Data
public class OrderThingDto {

    @ApiModelProperty("主键id")
    private Integer id;

    @ApiModelProperty("委托编号")
    private String entrustCode;

    @ApiModelProperty("样品编号")
    private String sampleCode;

    @ApiModelProperty("委托人名称")
    private String custom;

    @ApiModelProperty("委托单位")
    private String company;

    @ApiModelProperty("样品名称")
    private String sample;

    @ApiModelProperty("样品型号")
    private String model;

    @ApiModelProperty("样品数量")
    private Double sampleNum;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("检验单结论")
    private String insResult;

    @ApiModelProperty("下单时间")
    private LocalDateTime createTime;

    @ApiModelProperty("检验项目")
    private List<ProductThingDto> products;

}

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

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

import lombok.Data;

import java.util.List;

@Data
public class ProductThingDto {

    private Integer productId;

    private String inspectionItem;

    private String lastValue;

    private Integer insResult;

    private List<productResultDto> productResults;

}

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

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

import lombok.Data;

@Data
public class productResultDto {

    private Integer id;

    private String insValue;

    private Integer insResult;

    private String remark;

}

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

@@ -1,16 +1,22 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;
import java.util.Map;

/**
* @author gaoaoy
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order(检验下单)】的数据库操作Mapper
* @createDate 2024-03-07 16:07:54
* @createDate 2024-03-08 09:44:13
* @Entity com.yuanchu.mom.pojo.InsOrder
*/
public interface InsOrderMapper extends BaseMapper<InsOrder> {

    List<OrderThingDto> getOrderThing();

}



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

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

import com.yuanchu.mom.pojo.InsOrderUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_user(检验单负责人记录)】的数据库操作Mapper
* @createDate 2024-03-08 09:44:47
* @Entity com.yuanchu.mom.pojo.InsOrderUser
*/
public interface InsOrderUserMapper extends BaseMapper<InsOrderUser> {

}





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

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

import com.yuanchu.mom.pojo.InsProduct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product(检验项目)】的数据库操作Mapper
* @createDate 2024-03-08 09:45:03
* @Entity com.yuanchu.mom.pojo.InsProduct
*/
public interface InsProductMapper extends BaseMapper<InsProduct> {

}





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

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

import com.yuanchu.mom.pojo.InsProductResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result】的数据库操作Mapper
* @createDate 2024-03-08 09:45:20
* @Entity com.yuanchu.mom.pojo.InsProductResult
*/
public interface InsProductResultMapper extends BaseMapper<InsProductResult> {

}





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

@@ -1,13 +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 lombok.Data;
import com.baomidou.mybatisplus.annotation.*;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æ£€éªŒä¸‹å•
@@ -35,17 +36,17 @@
    /**
     * ä¸‹å•å®¢æˆ·
     */
    private String orderingCustomers;
    private String custom;

    /**
     * ä¸‹å•å•ä½
     */
    private String orderingUnit;
    private String company;

    /**
     * ç´§æ€¥ç¨‹åº¦
     */
    private String urgency;
    private Integer type;

    /**
     * çº¦å®šæ—¶é—´
@@ -55,12 +56,12 @@
    /**
     * å®žéªŒå®¤åç§°
     */
    private String laboratoryName;
    private String laboratory;

    /**
     * æ ·å“åˆ†ç±»
     * æ ·å“ç±»åž‹
     */
    private String sampleClassification;
    private String smapleType;

    /**
     * è§„格型号
@@ -75,77 +76,58 @@
    /**
     * æ ·å“æ•°é‡
     */
    private Integer numberSamples;
    private Double sampleNum;

    /**
     * æ˜¯å¦ç•™æ ·
     */
    private String leaveSample;
    private Integer isLeave;

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

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

    /**
     * å§”托公司
     */
    private String entrustCompany;

    /**
     * å§”托人
     */
    private String entrustName;

    /**
     * åˆ¶å•æ—¶é—´

     */
    private Date documentTime;

    /**
     * å§”托时间

     */
    private Date entrustmentTime;
    private Integer leaveNum;

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

     */
    private String inspectionProgress;
    private String insProgress;

    /**
     * æ£€æµ‹ç»“æžœ

     */
    private String inspectionResult;
    private String insResult;

    /**
     * 
     * 1：检验处理 0：待审核 2：退回 3：撤销
     */
    private Integer state;

    private String remark;

    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    /**
     * 
     *
     */
    private Date createTime;

    @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;

    /**
     * 
     *
     */
    private Date updateTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}

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

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

import com.baomidou.mybatisplus.annotation.*;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æ£€éªŒå•è´Ÿè´£äººè®°å½•
 * @TableName ins_order_user
 */
@TableName(value ="ins_order_user")
@Data
public class InsOrderUser implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * å¤–键：检验单id
     */
    private Integer insOrderId;

    /**
     * å¤–键：用户id è´Ÿè´£äºº
     */
    private Integer userId;

    /**
     * 1：确认 0：未确认
     */
    private Integer state;

    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    /**
     *
     */
    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
}

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

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

import com.baomidou.mybatisplus.annotation.*;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æ£€éªŒé¡¹ç›®
 * @TableName ins_product
 */
@TableName(value ="ins_product")
@Data
public class InsProduct implements Serializable {
    /**
     * ä¸»é”®id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * æ£€éªŒé¡¹
     */
    private String inspectionItem;

    /**
     * æ£€éªŒé¡¹åˆ†ç±»
     */
    private String inspectionItemClassify;

    /**
     * æ£€éªŒé¡¹å°ç±»
     */
    private String inspectionItemSubclass;

    /**
     * å·¥åŽ‚
     */
    private String factory;

    /**
     * å®žéªŒå®¤
     */
    private String laboratory;

    /**
     * æ ·å“åˆ†ç±»
     */
    private String sampleType;

    /**
     * æ ·å“
     */
    private String sample;

    /**
     * åž‹å·
     */
    private String model;

    /**
     * è®¡é‡å•ä½
     */
    private String unit;

    /**
     * å•ä»·(元)
     */
    private BigDecimal price;

    /**
     * å·¥æ—¶(H)
     */
    private Integer manHour;

    /**
     * å·¥æ—¶åˆ†ç»„
     */
    private String manHourGroup;

    /**
     * æ£€éªŒé¡¹ç±»åž‹
     */
    private String inspectionItemType;

    /**
     * æ£€éªŒå€¼ç±»åž‹
     */
    private String inspectionValueType;

    /**
     * è®¾å¤‡ç»„
     */
    private String deviceGroup;

    /**
     * æ£€éªŒæ¬¡æ•°
     */
    private Integer checkoutNumber;

    /**
     * åŒºé—´
     */
    private String section;

    /**
     * å–值类型
     */
    private String valueType;

    /**
     * æ–¹æ³•
     */
    private String method;

    /**
     * é¢„计时间(天)
     */
    private Integer manDay;

    /**
     * ç‰¹æ®Šæ ‡è¯†
     */
    private String bsm;

    /**
     * è¦æ±‚值
     */
    private String ask;

    /**
     * 1：有效 0：无效
     */
    private Integer state;

    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    /**
     *
     */
    @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;
    /**
     *
     */
    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}

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

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

import com.baomidou.mybatisplus.annotation.*;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 
 * @TableName ins_product_result
 */
@TableName(value ="ins_product_result")
@Data
public class InsProductResult implements Serializable {
    /**
     * 
     */
    @TableId
    private Integer id;

    /**
     * å¤–键：检验项目id
     */
    private Integer insProductId;

    /**
     * æ£€éªŒå€¼
     */
    private String insValue;

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

    /**
     * æœ€ç»ˆå€¼
     */
    private String lastValue;

    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    /**
     *
     */
    @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;
    /**
     *
     */
    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}

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

@@ -1,13 +1,19 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
* @author gaoaoy
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order(检验下单)】的数据库操作Service
* @createDate 2024-03-07 16:07:54
* @createDate 2024-03-08 09:44:13
*/
public interface InsOrderService extends IService<InsOrder> {

    List<OrderThingDto> getOrderThing();

}

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

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

import com.yuanchu.mom.pojo.InsOrderUser;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_user(检验单负责人记录)】的数据库操作Service
* @createDate 2024-03-08 09:44:47
*/
public interface InsOrderUserService extends IService<InsOrderUser> {

}

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

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

import com.yuanchu.mom.pojo.InsProductResult;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result】的数据库操作Service
* @createDate 2024-03-08 09:45:20
*/
public interface InsProductResultService extends IService<InsProductResult> {

}

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

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

import com.yuanchu.mom.pojo.InsProduct;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product(检验项目)】的数据库操作Service
* @createDate 2024-03-08 09:45:03
*/
public interface InsProductService extends IService<InsProduct> {

}

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

@@ -1,20 +1,32 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.mapper.InsOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
* @author gaoaoy
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order(检验下单)】的数据库操作Service实现
* @createDate 2024-03-07 16:07:54
* @createDate 2024-03-08 09:44:13
*/
@Service
@AllArgsConstructor
public class InsOrderServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder>
    implements InsOrderService{

    private InsOrderMapper insOrderMapper;

    @Override
    public List<OrderThingDto> getOrderThing() {
        return insOrderMapper.getOrderThing();
    }
}



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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.service.InsOrderUserService;
import com.yuanchu.mom.mapper.InsOrderUserMapper;
import org.springframework.stereotype.Service;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_user(检验单负责人记录)】的数据库操作Service实现
* @createDate 2024-03-08 09:44:47
*/
@Service
public class InsOrderUserServiceImpl extends ServiceImpl<InsOrderUserMapper, InsOrderUser>
    implements InsOrderUserService{

}





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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.service.InsProductResultService;
import com.yuanchu.mom.mapper.InsProductResultMapper;
import org.springframework.stereotype.Service;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result】的数据库操作Service实现
* @createDate 2024-03-08 09:45:20
*/
@Service
public class InsProductResultServiceImpl extends ServiceImpl<InsProductResultMapper, InsProductResult>
    implements InsProductResultService{

}





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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.mapper.InsProductMapper;
import org.springframework.stereotype.Service;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product(检验项目)】的数据库操作Service实现
* @createDate 2024-03-08 09:45:03
*/
@Service
public class InsProductServiceImpl extends ServiceImpl<InsProductMapper, InsProduct>
    implements InsProductService{

}





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

@@ -8,24 +8,20 @@
            <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="orderingCustomers" column="ordering_customers" jdbcType="VARCHAR"/>
            <result property="orderingUnit" column="ordering_unit" jdbcType="VARCHAR"/>
            <result property="urgency" column="urgency" jdbcType="VARCHAR"/>
            <result property="custom" column="custom" jdbcType="VARCHAR"/>
            <result property="company" column="company" jdbcType="VARCHAR"/>
            <result property="type" column="type" jdbcType="INTEGER"/>
            <result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
            <result property="laboratoryName" column="laboratory_name" jdbcType="VARCHAR"/>
            <result property="sampleClassification" column="sample_classification" jdbcType="VARCHAR"/>
            <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
            <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
            <result property="sample" column="sample" jdbcType="VARCHAR"/>
            <result property="numberSamples" column="number_samples" jdbcType="INTEGER"/>
            <result property="leaveSample" column="leave_sample" jdbcType="VARCHAR"/>
            <result property="retainedSamples" column="retained_samples" jdbcType="INTEGER"/>
            <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
            <result property="entrustCompany" column="entrust_company" jdbcType="VARCHAR"/>
            <result property="entrustName" column="entrust_name" jdbcType="VARCHAR"/>
            <result property="documentTime" column="document_time" jdbcType="TIMESTAMP"/>
            <result property="entrustmentTime" column="entrustment_time" jdbcType="TIMESTAMP"/>
            <result property="inspectionProgress" column="inspection_progress" jdbcType="VARCHAR"/>
            <result property="inspectionResult" column="inspection_result" jdbcType="VARCHAR"/>
            <result property="sampleNum" column="sample_num" jdbcType="INTEGER"/>
            <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="insResult" column="ins_result" jdbcType="VARCHAR"/>
            <result property="state" column="state" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
@@ -34,13 +30,47 @@

    <sql id="Base_Column_List">
        id,entrust_code,sample_code,
        ordering_customers,ordering_unit,urgency,
        appointed_time,laboratory_name,sample_classification,
        model,sample,number_samples,
        leave_sample,retained_samples,smaple_type,
        entrust_company,entrust_name,document_time,
        entrustment_time,inspection_progress,inspection_result,
        create_user,create_time,update_user,
        update_time
        custom,company,type,
        appointed_time,laboratory,smaple_type,
        model,sample,sample_num,
        is_leave,leave_num,ins_progress,
        ins_result,state,create_user,
        create_time,update_user,update_time
    </sql>

    <resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
        <result property="id" column="id"/>
        <result property="company" column="company"/>
        <result property="entrustCode" column="entrust_code"/>
        <result property="sampleCode" column="sample_code"/>
        <result property="custom" column="custom"/>
        <result property="sample" column="sample"/>
        <result property="model" column="model"/>
        <result property="sampleNum" column="sample_num"/>
        <result property="remark" column="remark"/>
        <result property="insResult" column="ins_result"/>
        <result property="createTime" column="create_time"/>
        <collection property="products" resultMap="ProductThingDto"/>
    </resultMap>

    <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.ProductThingDto">
        <result property="productId" column="id"/>
        <result property="inspectionItem" column="inspection_item"/>
        <result property="lastValue" column="last_value"/>
        <result property="insResult" column="ins_result"/>
        <collection property="productResults" resultMap="productResultDto"/>
    </resultMap>

    <resultMap id="productResultDto" type="com.yuanchu.mom.dto.productResultDto">
        <result property="id" column="id"/>
        <result property="insValue" column="ins_value"/>
        <result property="insResult" column="ins_result"/>
        <result property="remark" column="remark"/>
    </resultMap>

    <select id="getOrderThing" resultMap="OrderThingDto">
        select * from ins_order io
        left join ins_product ip on ip.ins_order_id = io.id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?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.InsOrderUserMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderUser">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
            <result property="userId" column="user_id" jdbcType="INTEGER"/>
            <result property="state" column="state" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,ins_order_id,user_id,
        state,create_user,create_time
    </sql>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
<?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.InsProductMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
            <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
            <result property="inspectionItemSubclass" column="inspection_item_subclass" 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="unit" column="unit" jdbcType="VARCHAR"/>
            <result property="price" column="price" jdbcType="DECIMAL"/>
            <result property="manHour" column="man_hour" jdbcType="INTEGER"/>
            <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
            <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
            <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
            <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
            <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
            <result property="section" column="section" jdbcType="VARCHAR"/>
            <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
            <result property="method" column="method" jdbcType="VARCHAR"/>
            <result property="manDay" column="man_day" jdbcType="INTEGER"/>
            <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
            <result property="ask" column="ask" jdbcType="VARCHAR"/>
            <result property="state" column="state" jdbcType="INTEGER"/>
            <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"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,inspection_item,inspection_item_classify,
        inspection_item_subclass,factory,laboratory,
        sample_type,sample,model,
        unit,price,man_hour,
        man_hour_group,inspection_item_type,inspection_value_type,
        device_group,checkout_number,section,
        value_type,method,man_day,
        bsm,ask,state,
        create_user,update_user,create_time,
        update_time
    </sql>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
<?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.InsProductResultMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProductResult">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="insProductId" column="ins_product_id" jdbcType="INTEGER"/>
            <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
            <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
            <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
            <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"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,ins_product_id,ins_value,
        ins_result,last_value,create_user,
        update_user,create_time,update_time
    </sql>
</mapper>

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

@@ -31,7 +31,7 @@
        where id = #{id}
    </select>
    <select id="selectStandardMethodLists" resultType="com.yuanchu.mom.pojo.StandardMethodList">
        select sml.id, code, sml.name,sml.remark, sml.create_time, u.name create_user_name
        select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
        from standard_method_list sml
        left join user u on u.id = sml.create_user
        where factory = #{data1}

 user-server/src/main/java/com/yuanchu/mom/dto/Custom.java

@@ -55,6 +55,10 @@
    @ApiModelProperty(value = "单位地址")
    private String address;

    @ValueTableShow(8)
    @ApiModelProperty(value = "工厂域")
    private String code;

    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
@@ -75,6 +79,7 @@

    @ValueTableShow(10)
    @ApiModelProperty(value = "创建用户")
    @TableField(exist = false)
    private String updateUserName;

    private Integer isCustom;

 user-server/src/main/java/com/yuanchu/mom/pojo/User.java

@@ -93,4 +93,6 @@

    private Integer isCustom;

    private String code;

}

 user-server/src/main/resources/mapper/CustomMapper.xml

@@ -7,7 +7,7 @@
    </update>
    <select id="selectCustomPageList" resultType="com.yuanchu.mom.dto.Custom">
        select * from (
            select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name
            select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name, u1.code
            from user u1
            left join user u2 on u2.id = u1.update_user
            where u1.is_custom = 1