Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -81,6 +81,7 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     int selectBySid(String join);
 
     FinBillApplicationDetailsVo fetchByQkkpBillNo(String qkkpBillNo);
+    FinBillApplicationDetailsVo fetchByBillNo(String qkkpBillNo);
 
     @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -136,4 +136,11 @@
         left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = fv.vehSid
         where fa.sid = #{businessSid}
     </select>
+
+    <select id="fetchByBillNo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo">
+        select *
+        from fin_bill_application
+        where billNo = #{qkkpBillNo}
+        ORDER BY createTime DESC LIMIT 1
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2243,6 +2243,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillStateKey("004");
             finBillApplication.setBillStateValue("欠款领票");
             finBillApplication.setNum(finBillVehicles.size());
+            finBillApplication.setIsLQOrigInvoice("是");
             //单台开票金额
             BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
             //计算开票金额合计
@@ -3449,7 +3450,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         dto.setOrgSidPath(orgSidPath);
-        FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(dto.getBillNo());
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByBillNo(dto.getBillNo());
         if(finBillApplicationDetailsVo != null){
             dto.setIsLQOrigInvoice(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         }