修改查询发票方法

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -648,7 +648,8 @@ public class IoOrderDetailBizController extends BaseController {
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
             ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
-            ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailCodeRespons.getId());
+            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
+            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk().toString());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
             for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
                 if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {

src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml

@@ -12,18 +12,30 @@
 
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
-        select *
+        SELECT ic.*,
-        from io_order_invoice
+        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
+        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+        FROM io_order_invoice ic
+        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
-            <if test="id != null">
+            <if test="orderIdFk != null and orderIdFk != ''">
-                AND id = #{id}
+                AND ic.orderIdFk = #{orderIdFk}
             </if>
-            <if test="bizIdFk != null">
+            <if test="orderIdFk == null || orderIdFk == ''">
-                AND bizIdFk = #{bizIdFk}
+                AND (ic.orderIdFk is null or ic.orderIdFk = '')
             </if>
-            <if test="orderIdFk != null and orderIdFk != ''">
+            <if test="bindRlFk != null">
-                AND orderIdFk = #{orderIdFk}
+                AND ic.bindRlFk = #{bindRlFk}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ic.batchNo = #{batchNo}
             </if>
+            <if test="batchNo == null || batchNo == ''">
+                AND (ic.batchNo is null or ic.batchNo = '')
+            </if>
+
         </where>
+        GROUP BY ic.id
     </select>
 </mapper>