Просмотр исходного кода

进行开票过滤的时候,将已经开过票的数据过滤掉

lipf 2 месяцев назад
Родитель
Сommit
3b419ef8c7

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -66,7 +66,8 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
      * @date 2026/5/12 14:50
      */
     List<InsPlyIncome> queryIncomeDatasByOrderIds(@Param("orderNos") List<String> orderNos,
-                                                  @Param("companyId") String companyId);
+                                                  @Param("companyId") String companyId,
+                                                  @Param("invoiceType") String invoiceType);
 
     /**
      * 查询应收总额

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -396,9 +396,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public HttpResult<List<InsPlyIncome>> queryIncomeDatas(IncomeDataVO incomeDataVO) {
         log.info("应收数据的二次过滤:incomeDataVO=[{}]", JSONUtil.toJsonStr(incomeDataVO));
+        // add by lipf ,二次过滤查询可开票订单的时候,应该查询未开票的订单
         List<String> orderNos = incomeDataVO.getOrderNos();
         String companyId = incomeDataVO.getCompanyId();
-        List<InsPlyIncome> incomes =  baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId);
+        List<InsPlyIncome> incomes =  baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId,incomeDataVO.getInvoiceType());
         log.info("根据订单号和保司id查询出[{}]条记录。 orderNos =[{}],companyId=[{}]",CollUtil.size(incomes), JSONUtil.toJsonStr(orderNos), companyId);
         // 需要查询未结算的数据 modify by lipf 2026年6月4日11:06:50
         incomes = incomes.stream().filter(action->{

+ 3 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -310,6 +310,9 @@
         <if test="companyId != null and companyId != ''">
             AND io.company_id = #{companyId}
         </if>
+        AND ipi.id not in (
+         select ipiil.income_id from   ins_ply_income_invoice_link	ipiil where  ipiil.invoice_type = #{invoiceType} and ipiil.is_delete  = 0
+        )
         <if test="orderNos != null and orderNos.size() > 0">
             AND io.id in
             <foreach collection="orderNos" item="id" open="(" separator="," close=")">