前端联调修改2.0

zss

2024-11-26 a5b1bad21ba279ade3954852a5e281e9086042f0

前端联调修改2.0

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

@@ -16,5 +16,5 @@

    private String urlS;

    private String name;
    private String codeUrl;
}

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

@@ -246,7 +246,7 @@
                info.setContent("您有一条检验订单待审核消息,订单的外部编号是:" + insOrder.getOutEntrustCode());
                info.setSenderId(userId);
                info.setViewStatus(false);
                info.setJumpPath("b1-inspect-order");
                info.setJumpPath("b1-inspection-order");
                info.setConsigneeId(user.getId());
                notificationArrayList.add(info);
            }
@@ -278,7 +278,7 @@
                info.setContent("您有一条检验订单待审核消息,订单的外部编号是:" + insOrder.getOutEntrustCode());
                info.setSenderId(userId);
                info.setViewStatus(false);
                info.setJumpPath("b1-inspect-order");
                info.setJumpPath("b1-inspection-order");
                info.setConsigneeId(user.getId());
                notificationArrayList.add(info);
            }
@@ -344,7 +344,7 @@
            info.setSenderId(userId);
            info.setConsigneeId(insOrder.getIssueUser());
            info.setViewStatus(false);
            info.setJumpPath("b1-inspect-order");
            info.setJumpPath("b1-inspection-order");
            informationNotificationService.addInformationNotification(info);
        }
        return insOrder.getId();

 inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java

@@ -539,7 +539,7 @@
        try {
            InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
            String[] split = insOrderFile.getFileName().split("\\.");
            String name = insOrderFile.getFileName().substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
            String name = insOrderFile.getFileName().replace('#','&').substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
            FileOutputStream out = new FileOutputStream(wordUrl + "/" + UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "解析的辐射站点报告.docx");
            document.write(out);
            out.close();

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

@@ -89,21 +89,22 @@
        <collection property="reportDtos" ofType="com.yuanchu.mom.dto.ReportDto" resultMap="reportDto"/>
    </resultMap>
    <resultMap id="reportDto" type="com.yuanchu.mom.dto.ReportDto">
        <result property="reportId" column="reportId"/>
        <result property="reportId" column="report_id"/>
        <result property="url" column="url"/>
        <result property="urlS" column="urlS"/>
        <result property="name" column="name"/>
        <result property="codeUrl" column="codeUrl"/>
    </resultMap>

    <select id="selectInsOrderPage" resultMap="SampleOrderDto">
        select *
        select *from (select a.* ,
        ir.id report_id,
        ir.url,
        ir.url_s,
        ir.sample_code as codeUrl
        from (
        SELECT
        io.*,
        isau.user_id assign,
        ir.id report_id,
        ir.url,
        ir.url_s,
        sample_counts.sample_num,
        CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS
        insProgress,
@@ -118,9 +119,6 @@
        ins_sample isa ON io.id = isa.ins_order_id
        LEFT JOIN
        ins_sample_user isau ON isau.ins_sample_id = io.id
        LEFT JOIN
        (SELECT id, ins_order_id, is_ratify, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id =
        ir.ins_order_id
        LEFT JOIN
        user u ON io.create_user = u.id
        LEFT JOIN
@@ -149,6 +147,9 @@
        GROUP BY io.id,type
        order by type desc,io.id desc
        ) a
        LEFT JOIN
        (SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join  ins_sample isa on r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
        ir.ins_order_id )b
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>