Merge remote-tracking branch 'origin/master'

value

2023-09-01 4800caf0bc511a26624da1b9a9cf34275b6c2c4a

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sys/src/main/resources/application-dev.yml

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java

@@ -143,6 +143,7 @@
        inspectionVo.setExperiment(linkDetection.getExperiment());
        inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
        inspectionVo.setUnit(linkDetection.getUnit());
        inspectionVo.setNotes(linkDetection.getRemarks());
        return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
    }


 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java

@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Inspection;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultType;
import org.apache.ibatis.annotations.Results;

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


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java

@@ -89,5 +89,10 @@
     * 关联 申请单id
     **/
    private Integer inspectionId;

    /**
     * 备注
     */
    private String notes;
}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java

@@ -105,4 +105,9 @@
     * 型号id
     */
    private String specificationId;

    /**
     * 备注
     */
    private String notes;
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

@@ -155,6 +155,7 @@
                .specifications(inspectionVo.getSpecifications())
                .formTime(inspectionVo.getFormTime())
                .inspectionId(inspection.getId())
                .notes(inspectionVo.getNotes())
                .build();
        inspectionMaterialMapper.insert(inspectionMaterial);
        /*新增检验项目表*/

 inspection-server/src/main/resources/mapper/InspectionMapper.xml

@@ -22,8 +22,8 @@
        join lims_laboratory.inspection_material im on i.id = im.inspection_id
        where i.state=1
        <if test="message!=null">
            and i.code like concat('%', #{message}, '%')
            or im.name like concat('%', #{message}, '%')
            and (i.code like concat('%', #{message}, '%')
            or im.name like concat('%', #{message}, '%'))
        </if>
    </select>


 inspection-server/src/main/resources/mapper/ReportMapper.xml

@@ -58,18 +58,38 @@
    </resultMap>

    <select id="getReportContext" resultMap="report">
        SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.num,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
        FROM report r
                 LEFT JOIN inspection i
                           ON r.inspection_id = i.id
                 LEFT JOIN inspection_material im
                           ON im.inspection_id = i.id
                 LEFT JOIN inspection_product ip
                           ON ip.inspection_material_id = im.id
        WHERE ip.state != 0
          and im.state != 0
          and i.state != 0
          and r.`code` = #{code}
        SELECT
            r.`code` rcode,
            date_format( r.create_time, '%Y-%m-%d' ) create_time,
            date_format( r.check_time, '%Y-%m-%d' ) check_time,
            i.inspection_status,
            im.`name`,
            im.num,
            im.specifications,
            im.supplier,
            im.`code` im_code,
            i.`code` ins_code,
            i.type,
            ip.id,
            ip.`name` ip_name,
            im.form_time formTime,
            ip.unit,
            ip.required,
            ip.test_value,
            ip.test_state,
            u.`name` ipName,
            im.notes
        FROM
            report r
                LEFT JOIN inspection i ON r.inspection_id = i.id
                LEFT JOIN inspection_material im ON im.inspection_id = i.id
                LEFT JOIN inspection_product ip ON ip.inspection_material_id = im.id
                LEFT JOIN `user` u on ip.user_id =u.id
        WHERE
            ip.state != 0
    AND im.state != 0
    AND i.state != 0
    AND r.`code` = #{code}
    </select>

</mapper>