修改bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationPageDto.java

@@ -25,5 +25,5 @@ public class PreparationPageDto extends Page<PreparationMoney> {
     String documentState;//订单状态未完成已完成作废
     String shipmentStatus;//发货状态  未发货已发货
     String receivingStatus;//到货状态未到货已到货
-
+    Boolean isdocumentStatezf;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -41,6 +41,12 @@
           <artifactId>spring-boot-starter-activemq</artifactId>
           <version>2.5.4</version>
       </dependency>
+
+      <dependency>
+          <groupId>com.qiyuesuo.sdk</groupId>
+          <artifactId>sdk-java</artifactId>
+          <version>3.0.0</version>
+      </dependency>
   </dependencies>
   
   <build>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -46,6 +46,10 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         qw.eq(StringUtils.isNotEmpty(dto.getDocumentState()), "document_state", dto.getDocumentState());
         qw.eq(StringUtils.isNotEmpty(dto.getShipmentStatus()), "shipment_status", dto.getShipmentStatus());
         qw.eq(StringUtils.isNotEmpty(dto.getReceivingStatus()), "receiving_status", dto.getReceivingStatus());
+        if(dto.getIsdocumentStatezf()!=null&&dto.getIsdocumentStatezf()){
+            qw.ne( "document_state", "已作废");
+        }
+
         if (StringUtils.isNotEmpty(dto.getOrderBy())) {
             qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
         }else{