修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -67,6 +67,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 客户
      */
     private String customerName;
+    /**
+     * 客户电话
+     */
+    private String customerPhone;
     /**
      * 车牌号
      */

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

@@ -75,11 +75,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             statusSet.addAll(statusList);
         }
         //  公司ID
-        pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        pageView.put("compId", paymentManagement.getCompId());
         pageView.put("searchKeyWord", paymentManagement.getSearchKeyWord());
         pageView.put("searchType", paymentManagement.getSearchType());
         pageView.put("pageSize", paymentManagement.getPageSize());
         pageView.put("warehouseName",paymentManagement.getWarehouseName());
+        pageView.put("customerPhone",paymentManagement.getCustomerPhone());
         pageView.put("currentPage", paymentManagement.getCurrentPage());
         pageView.put("managementType",paymentManagement.getManagementType());
         pageView.put("businessKeys", businessKeys);

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

@@ -188,6 +188,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setCompId(weighingManagement1.getCompId());
                 paymentManagement1.setPaymentNo(weighingManagement1.getNumber());
                 paymentManagement1.setCustomerName(weighingManagement1.getCustomer());
+                paymentManagement1.setCustomerPhone(weighingManagement1.getCustomerPhone());
                 paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
                 paymentManagement1.setType(weighingManagement1.getType());
                 paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
@@ -280,6 +281,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         String relationId=IdGenerator.generateUUID();
         weighingManagement.setId(IdGenerator.generateUUID());
         weighingManagement.setRelationId(relationId);
+        weighingManagement.setTareDate(new Date());
         weighingManagement.setManagementType("3");
         //生成质检信息
         QualityInspectionManagement qualityInspectionManagement = new QualityInspectionManagement();

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

@@ -21,6 +21,9 @@
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
+        <if test="customerPhone != null and customerPhone != ''">
+            AND customer_phone = #{customerPhone}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
@@ -77,6 +80,9 @@
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
+        <if test="customerPhone != null and customerPhone != ''">
+            AND customer_phone = #{customerPhone}
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>

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

@@ -6,8 +6,8 @@
         SELECT
         COUNT(q.id)
         FROM quality_inspection_management q
-        WHERE
-        q.delete_flag = '0'
+        WHERE q.comp_id = #{compId}
+        and q.delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(q.quality_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(q.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
@@ -42,8 +42,8 @@
         q.update_date as updateDate,
         q.quality_date as qualityDate
         FROM quality_inspection_management q
-        WHERE
-        q.delete_flag = '0'
+        WHERE q.comp_id = #{compId}
+        and q.delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(q.quality_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(q.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))

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

@@ -6,7 +6,8 @@
         SELECT
         COUNT(id)
         FROM weighing_management
-        WHERE delete_flag = '0'
+        WHERE  comp_id = #{compId}
+        and delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%'))
@@ -45,7 +46,8 @@
         address_url as addressUrl,
         status_flag as statusFlag
         FROM weighing_management
-        WHERE delete_flag = '0'
+        WHERE comp_id = #{compId}
+        and delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%'))