feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 ...

liding

18 小时以前 82ce59218139d9fefeae7b9e5fbc88b499ff023f

 cnas-process/src/main/resources/mapper/ProcessReportMapper.xml

@@ -5,8 +5,6 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.ProcessReport">
        <id column="id" property="id"/>
        <result column="ins_report_code" property="insReportCode"/>
        <result column="pages" property="pages"/>
        <result column="number" property="number"/>
        <result column="send" property="send"/>
        <result column="method" property="method"/>
        <result column="send_time" property="sendTime"/>
@@ -19,19 +17,65 @@
        <result column="update_time" property="updateTime"/>
    </resultMap>
    <select id="pageProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
        select * from (select cpr.* ,
        select * from (select cpr.id,
        cpr.ins_report_code,
        cpr.send,
        case io.report_delivery
            when 1 then '自取'
            when 2 then '快递'
            when 3 then '电子传送'
            else cpr.method
        end method,
        cpr.send_time,
        cpr.send_user,
        cpr.signatory,
        cpr.remark,
        cpr.create_user,
        cpr.create_time,
        cpr.update_user,
        cpr.update_time,
        cpr.inspection_order_id,
        cpr.receive_date,
        cpr.receive_user,
        u1.name sendUserName
        from cnas_process_report cpr
        left join user u1 on send_user=u1.id )A
        left join user u1 on send_user=u1.id
        inner join ins_report ir on ir.code = cpr.ins_report_code
            and ir.ins_order_id = cpr.inspection_order_id
            and ir.is_ratify = 1 and ir.is_pass = 1
        left join ins_order io on io.id = ir.ins_order_id )A
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
        select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
        cpr.* ,
        cpr.id,
        cpr.ins_report_code,
        cpr.send,
        case io.report_delivery
            when 1 then '自取'
            when 2 then '快递'
            when 3 then '电子传送'
            else cpr.method
        end method,
        cpr.send_time,
        cpr.send_user,
        cpr.signatory,
        cpr.remark,
        cpr.create_user,
        cpr.create_time,
        cpr.update_user,
        cpr.update_time,
        cpr.inspection_order_id,
        cpr.receive_date,
        cpr.receive_user,
        u1.signature_url sendUserUrl
        from cnas_process_report cpr
        left join user u1 on send_user=u1.id
        inner join ins_report ir on ir.code = cpr.ins_report_code
            and ir.ins_order_id = cpr.inspection_order_id
            and ir.is_ratify = 1 and ir.is_pass = 1
        left join ins_order io on io.id = ir.ins_order_id
    </select>
</mapper>