1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -101,7 +101,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                     paymentManagement1.setCompName(commonCompany.getCompName());
                 }
                 WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                        .eq("relation_id", paymentManagement.getRelationId()));
+                        .eq("relation_id", paymentManagement1.getRelationId()));
                 if (weighingManagement!=null){
                     paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -10,7 +10,13 @@
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND amount_ing_payable-amount_ed_payable>0
+                AND status='待结算'
+            </if>
+            <if test="searchType == 3">
+                AND actual_collectionment-amount_ed_collectionable>0
+            </if>
+            <if test="searchType == 4">
+                AND actual_collectionment-amount_ed_collectionable=0
             </if>
         </if>
         <if test="warehouseName != null and warehouseName != ''">
@@ -88,7 +94,13 @@
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND amount_ing_payable-amount_ed_payable>0
+                AND status='待结算'
+            </if>
+            <if test="searchType == 3">
+                AND actual_collectionment-amount_ed_collectionable>0
+            </if>
+            <if test="searchType == 4">
+                AND actual_collectionment-amount_ed_collectionable=0
             </if>
         </if>
         <if test="managementType != null and managementType != ''">