feature:发票列表显示凭证号和排序

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/PageOrderInvoiceDetail.java

@@ -86,4 +86,6 @@ public class PageOrderInvoiceDetail implements Serializable {
      * 前端使用,取值为特殊票种发票查询 特殊票种
      */
     private String fpcxTspz;
+
+    private String pzh;
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -409,6 +409,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
 
     @Override
     public PageInfo<PageOrderInvoiceDetail> selectRedAndInvoiceByMap(Map<String, Object> paramMap, List<String> shList, List<String> entList) {
+
         log.info("MAP===={}", JsonUtils.getInstance().toJsonString(paramMap));
         int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
         int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));

order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml

@@ -136,6 +136,7 @@
         <result column="sykchje" property="sykchje" jdbcType="VARCHAR"/>
         <result column="sykchbhsje" jdbcType="VARCHAR" property="sykchbhsje"/>
         <result column="sykchse" jdbcType="VARCHAR" property="sykchse"/>
+        <result column="byzd2" jdbcType="VARCHAR" property="pzh"/>
     </resultMap>
 
 
@@ -1325,8 +1326,8 @@
         oii.qdfwlx,
         oii.qdyhm,
         oii.skcwdm,
-        oii.skcwms
-
+        oii.skcwms,
+        oi.byzd2
         FROM order_invoice_info oii
         LEFT JOIN order_info oi ON oii.fpqqlsh = oi.fpqqlsh
         LEFT JOIN order_process_info opi ON oii.fpqqlsh = opi.fpqqlsh
@@ -1648,6 +1649,12 @@
             <when test="map.orderBy !=null and map.orderBy == 'checkTime' ">
                 order by check_time desc
             </when>
+            <when test="map.orderBy !=null and map.orderBy == 'pzhAsc' ">
+                order by oi.byzd2 asc,kprq DESC
+            </when>
+            <when test="map.orderBy !=null and map.orderBy == 'pzhDesc' ">
+                order by oi.byzd2 desc,kprq DESC
+            </when>
             <otherwise>
                 ORDER BY kprq DESC
             </otherwise>

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java

@@ -366,10 +366,10 @@ public class YyOrderServiceImpl implements OrderService {
         yyOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         yyOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         yyOrderInfo.setBz(bz.toString());
-        if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_26)) {
+        if (ConfigureConstant.STRING_26.equals(yyOrderInfo.getCvouchtype())) {
             yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_001);
         }
-        if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_27)) {
+        if (ConfigureConstant.STRING_27.equals(yyOrderInfo.getCvouchtype())) {
             yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_002);
         }
         yyOrderInfoMapper.insertYyOrderInfo(yyOrderInfo);
@@ -422,7 +422,7 @@ public class YyOrderServiceImpl implements OrderService {
 //        ddtxxBO.setSFZSXFYHZH(ebsOrderInfo.getSalebankAccountJud());
         ddtxxBO.setGMFLX("04");
         ddtxxBO.setBYZD1(yyOrderInfo.getYscdlcode());
-
+        ddtxxBO.setBYZD2(yyOrderInfo.getCpznum());
 
         String invoiceAmount = ConfigureConstant.STRING_0;
         String taxAmount = ConfigureConstant.STRING_0;