value
2023-08-30 cdb1c35699da755588ab70ec8e122ae256570305
修改bug
已修改3个文件
15 ■■■■■ 文件已修改
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
@@ -65,6 +65,10 @@
    @ApiModelProperty(value = "委托备注", example = "委托备注YPBH123456789YPBH123456789YPBH123456789")
    private String entrustRemarks;
    @ApiModelProperty(value = "检验时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date insTime;
    @TableLogic(value = "1", delval = "0")
    @ApiModelProperty(value = "逻辑删除 正常>=1,删除<=0", hidden = true)
    private Integer state;
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
@@ -29,6 +29,7 @@
        for (LinkDetection linkDetection:linkDetectionList){
            linkDetection.setInspectionStatus(1);
            linkDetection.setLinkBasicId(id);
            linkDetection.setState(1);
        }
        linkDetectionMapper.insertBatchSomeColumn(linkDetectionList);
    }
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -9,7 +9,8 @@
        d.`specifications_models`,
        DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
        completionDeadline, l.`contacts`,
        DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`
        DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`,
        DATE_FORMAT(l.`ins_time`,'%Y-%m-%d') insTime
        FROM link_basic_information l, link_detection d
        WHERE l.`id` = d.`link_basic_id`
        AND d.`state` = 1
@@ -57,6 +58,8 @@
               lb.sample_delivery_phone sampleDeliveryPhone,
               lb.report_number         reportNumber,
               lb.entrust_remarks       entrustRemarks,
               lb.sample_sender         sampleSender,
               lb.entrusted             entrusted,
               lb.uid                   uid,
               ld.id                    id,
               ld.sample_number         sampleNumber,
@@ -82,9 +85,14 @@
        <result property="inspectionTime" column="inspectionTime"/>
        <result property="sampleDeliveryMode" column="sampleDeliveryMode"/>
        <result property="sampleDeliveryPhone" column="sampleDeliveryPhone"/>
        <result property="sampleSender" column="sampleSender"/>
        <result property="entrustRemarks" column="entrustRemarks"/>
        <result property="reportNumber" column="reportNumber"/>
        <result property="entrusted" column="entrusted"/>
        <collection property="linkDetectionList" ofType="LinkDetection">
            <result property="id" column="id"/>
            <result property="sampleNumber" column="sampleNumber"/>
            <result property="sampleName" column="sampleName"/>
            <result property="specificationsModels" column="specificationsModels"/>
            <result property="unit" column="unit"/>
            <result property="samplesNumber" column="samplesNumber"/>