身份证号筛选

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

@@ -75,6 +75,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 客户电话
      */
     private String customerPhone;
+    /**
+     * 身份证号码
+     */
+    private String customerNumberCard;
     /**
      * 车牌号
      */

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

@@ -241,6 +241,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String flag;
+    /**
+     * 身份证号码
+     */
+    @TableField(exist = false)
+    private String customerNumberCard;
     /**
      *检斤对象
      */

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

@@ -72,6 +72,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 客户电话
      */
     private String customerPhone;
+    /**
+     * 身份证号码
+     */
+    private String customerNumberCard;
     /**
      * 联系人
      */
@@ -241,6 +245,7 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String warehouseId;
+
     /**
      *质检对象
      */

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

@@ -581,10 +581,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             paymentManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }
         List<PaymentManagement> paymentManagementList = this.selectList(new EntityWrapper<PaymentManagement>()
-        .eq("goods_name",paymentManagement.getGoodsName())
-        .eq("customer_name",paymentManagement.getCustomerName())
-        .eq("comp_id",paymentManagement.getCompId())
-        .ge("create_date",year));
+                .eq("goods_name",paymentManagement.getGoodsName())
+                .eq("customer_number_card",paymentManagement.getCustomerNumberCard())
+                .eq("comp_id",paymentManagement.getCompId())
+                .ge("create_date",year));
         if (!CollectionUtils.isEmpty(paymentManagementList)){
             Float netWeight = 0f;
             for (PaymentManagement paymentManagement1:paymentManagementList){

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

@@ -198,6 +198,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setNumber(qualityInspectionManagement.getQualityNo());
         weighingManagement.setCustomer(qualityInspectionManagement.getCustomerName());
         weighingManagement.setCustomerPhone(qualityInspectionManagement.getCustomerPhone());
+        weighingManagement.setCustomerNumberCard(qualityInspectionManagement.getCustomerNumberCard());
         weighingManagement.setCarNumber(qualityInspectionManagement.getCarNumber());
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
@@ -248,10 +249,10 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }
         Integer count=paymentManagementService.selectCount(new EntityWrapper<PaymentManagement>()
-        .eq("comp_id",qualityInspectionManagement.getCompId())
-        .eq("customer_name",qualityInspectionManagement.getCustomerName())
-        .eq("goods_name",qualityInspectionManagement.getGoodsName())
-        .eq("status_flag","1"));
+                .eq("comp_id",qualityInspectionManagement.getCompId())
+                .eq("customer_number_card",qualityInspectionManagement.getCustomerNumberCard())
+                .eq("goods_name",qualityInspectionManagement.getGoodsName())
+                .eq("status_flag","1"));
         return count;
     }
 }

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

@@ -216,6 +216,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setId(IdGenerator.generateUUID());
                 paymentManagement1.setRelationId(weighingManagement1.getRelationId());
                 paymentManagement1.setCompId(weighingManagement1.getCompId());
+                paymentManagement1.setCustomerNumberCard(weighingManagement1.getCustomerNumberCard());
                 paymentManagement1.setPaymentNo(weighingManagement1.getNumber());
                 paymentManagement1.setContractNo(weighingManagement1.getContractNo());
                 paymentManagement1.setCustomerName(weighingManagement1.getCustomer());