Merge remote-tracking branch 'origin/master'

gaoluyang

4 天以前 7787f57521297df847bfd5f2b9af410b3fdac67e

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

@@ -3,6 +3,27 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.InsOrderMapper">
    <update id="updateInspectionOrderEntrustCode">
        UPDATE cnas_inspection_order
        SET entrust_code = #{entrustCode}
        WHERE ins_order_id = #{orderId}
    </update>

    <select id="selectQualityMonitorEvaluatorId" resultType="java.lang.Integer">
        SELECT cqmd.evaluator_user_id
        FROM ins_order io
        JOIN cnas_quality_monitor_details cqmd
          ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
        WHERE io.id = #{orderId}
    </select>

    <select id="selectQualityMonitorInspectorId" resultType="java.lang.Integer">
        SELECT cqmd.inspector_user_id
        FROM ins_order io
        JOIN cnas_quality_monitor_details cqmd
          ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
        WHERE io.id = #{orderId}
    </select>

    <resultMap id="selectSampleDefectsMap" type="com.ruoyi.inspect.vo.SampleDefectsFatherVo">
        <id column="id" property="id"/>
@@ -246,6 +267,7 @@
               en_device_name,
               specification_model,
               management_number,
               factory_no,
               date_format(activation_date,'%Y-%m-%d')
        latest_traceability
        from device
@@ -416,7 +438,8 @@
        from (select io2.id insOrderId,
                     io2.sample_view,
                     io2.production,
                     io2.send_time,
                     io2.sample_status,
                     io2.sample_date,
                     GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
                     io2.prepare_user,
                     io2.entrust_code,