仓库排序

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java

@@ -15,7 +15,7 @@ public class ContractMobilePagination extends Pagination {
 
     private String contractName;
 
-    private String name;
+    private String supperName;
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java

@@ -63,9 +63,9 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
             contractMNum++;
             contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getContractName, contractMobilePagination.getContractName());
         }
-        if (StringUtil.isNotEmpty(contractMobilePagination.getName())) {
+        if (StringUtil.isNotEmpty(contractMobilePagination.getSupperName())) {
             contractMNum++;
-            contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getName());
+            contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getSupperName());
         }
 
         //排序
@@ -150,9 +150,9 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
             contractMNum++;
             contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getContractName, contractMobilePagination.getContractName());
         }
-        if (StringUtil.isNotEmpty(contractMobilePagination.getName())) {
+        if (StringUtil.isNotEmpty(contractMobilePagination.getSupperName())) {
             contractMNum++;
-            contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getName());
+            contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getSupperName());
         }
 
         if(AllIdList.size()>0){

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerMobileListVo.java

@@ -1,5 +1,6 @@
 package jnpf.customer.model.customer;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,16 +15,22 @@ import java.util.List;
 @Data
 public class CustomerMobileListVo {
  /*   开票总重：所有客户 开票重量 的汇总*/
+    @JsonProperty("invoiceNum")
     private BigDecimal invoiceNum;
   /*  未开票总重：所有客户 未开票重量 的汇总*/
+  @JsonProperty("noInvoiceNum")
     private BigDecimal noInvoiceNum;
     /*垫资总金额：所有客户 垫资金额 的汇总*/
+    @JsonProperty("fundNum")
     private BigDecimal fundNum;
 /*    非垫资总金额：所有客户 非垫资金额 的汇总*/
+@JsonProperty("noFundNum")
     private BigDecimal noFundNum;
 /*    未回款总金额：所有客户 未回款金额 的汇总*/
+@JsonProperty("noPayCollectionNum")
     private BigDecimal noPayCollectionNum;
     /*总利润：所有客户 总利润 的汇总*/
+    @JsonProperty("profit")
     private BigDecimal profit;
     /*客户统计信息*/
     private List<CustomerMobileVO> customerMobileVOSList;

SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jnpf.customer.entity.CustomerEntity;
 import jnpf.customer.entity.CustomerMobileEntity;
 import jnpf.customer.mapper.CustomerVMapper;
@@ -330,10 +331,10 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
         }else{
             try {
                 String sidx = customerPagination.getSidx();
-                CustomerEntity customerEntity = new CustomerEntity();
-                Field declaredField = customerEntity.getClass().getDeclaredField(sidx);
+                CustomerMobileListVo customerMobileListVo = new CustomerMobileListVo();
+                Field declaredField = customerMobileListVo.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
-                String value = declaredField.getAnnotation(TableField.class).value();
+                String value = declaredField.getAnnotation(JsonProperty.class).value();
                 customerQueryWrapper="asc".equals(customerPagination.getSort().toLowerCase())?customerQueryWrapper.orderByAsc(value):customerQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();

SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePagination.java

@@ -1,9 +1,8 @@
 package jnpf.warehouse.model.warehouse;
 
 
-import lombok.Data;
 import jnpf.base.Pagination;
-import java.util.List;
+import lombok.Data;
 
 /**
  *
@@ -21,6 +20,10 @@ public class WareHousePagination extends Pagination {
 
         /** 仓库名称 */
         private String name;
+
+        /** 仓库位置 */
+        private String location;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java

@@ -91,6 +91,11 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
             wareHouseNum++;
             wareHouseQueryWrapper.lambda().like(WareHouseEntity::getName,wareHousePagination.getName());
                     }
+			if(StringUtil.isNotEmpty(wareHousePagination.getLocation())){
+            wareHouseNum++;
+            wareHouseQueryWrapper.lambda().like(WareHouseEntity::getLocation,wareHousePagination.getLocation());
+                    }
+
 
         if(AllIdList.size()>0){
             wareHouseQueryWrapper.lambda().in(WareHouseEntity::getId, AllIdList);
@@ -256,6 +261,10 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
             wareHouseNum++;
             wareHouseQueryWrapper.lambda().like(WareHouseEntity::getName,wareHousePagination.getName());
         }
+        if(StringUtil.isNotEmpty(wareHousePagination.getLocation())){
+            wareHouseNum++;
+            wareHouseQueryWrapper.lambda().like(WareHouseEntity::getLocation,wareHousePagination.getLocation());
+        }
 
         if(AllIdList.size()>0){
             wareHouseQueryWrapper.lambda().in(WareHouseEntity::getId, AllIdList);