zhangyuewww 3 anni fa
parent
commit
ffb10af567

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

@@ -81,6 +81,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         pageView.put("pageSize", paymentManagement.getPageSize());
         pageView.put("warehouseName",paymentManagement.getWarehouseName());
         pageView.put("currentPage", paymentManagement.getCurrentPage());
+        pageView.put("managementType",paymentManagement.getManagementType());
         pageView.put("businessKeys", businessKeys);
         pageView.put("statusSet", statusSet);
         // 查询服务商总数

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -55,6 +55,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("pageSize",qualityInspectionManagement.getPageSize());
         pageView.put("currentPage",qualityInspectionManagement.getCurrentPage());
         pageView.put("warehouseName",qualityInspectionManagement.getWarehouseName());
+        pageView.put("managementType",qualityInspectionManagement.getManagementType());
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -59,6 +59,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         pageView.put("searchKeyWord",weighingManagement.getSearchKeyWord());
         pageView.put("pageSize",weighingManagement.getPageSize());
         pageView.put("currentPage",weighingManagement.getCurrentPage());
+        pageView.put("managementType",weighingManagement.getManagementType());
         pageView.put("warehouseName",weighingManagement.getWarehouseName());
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);

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

@@ -18,6 +18,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND management_type = #{managementType}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
@@ -71,6 +74,9 @@
                 AND amount_ing_payable-amount_ed_payable>0
             </if>
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND management_type = #{managementType}
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>

+ 6 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -14,6 +14,9 @@
             OR lower(q.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(q.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND q.management_type = #{managementType}
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND q.warehouse_name= #{warehouseName}
         </if>
@@ -50,6 +53,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND q.warehouse_name= #{warehouseName}
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND q.management_type = #{managementType}
+        </if>
         ORDER BY q.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

+ 6 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -16,6 +16,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND management_type = #{managementType}
+        </if>
     </select>
     <!-- 获得检斤管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -52,6 +55,9 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
+        <if test="managementType != null and managementType != ''">
+            AND management_type = #{managementType}
+        </if>
         ORDER BY update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}