ariesy 簽收導出

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java

@@ -79,12 +79,10 @@ public class ExportCautionServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
             // 认证状态为未认证
             .eq(TDxRecordInvoice::getRzhYesorno, RzztEnum.WRZ.getRzztDm())
             // 发票状态为异常的发票
-            .in(TDxRecordInvoice::getInvoiceStatus, FpztEnum.YC.getFpztDm(), FpztEnum.ZF.getFpztDm(),
-                FpztEnum.HC.getFpztDm(), FpztEnum.SK.getFpztDm());
+            .ne(TDxRecordInvoice::getInvoiceStatus, FpztEnum.ZC.getFpztDm());
         // 购方税号
-        if (reqVO.getAllTaxNo().size() > 0) {
-            queryWrapper.lambda().in(TDxRecordInvoice::getGfTaxNo, reqVO.getAllTaxNo());
-        }
+        queryWrapper.eq("gf_tax_no",reqVO.getGfsh());
+        queryWrapper.eq("comp_code",reqVO.getCompanyCode());
         // 发票号码
         if (!StringHelper.isBlank(reqVO.getInvoiceNo())) {
             queryWrapper.lambda().eq(TDxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo());

dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml

@@ -1034,7 +1034,7 @@
         t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
         <if test="gfsh!=null">
-            and t.gf_tax_no =#{gfsh}
+            and t.gf_tax_no =#{queryParams.gfsh}
         </if>
         <if test="companyCode!=null">
             and t.comp_code =#{companyCode}