图片添加水印

src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -95,7 +95,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                                size =9;
                                break;
                        }
-                       if(StringUtils.isNotBlank(areaDTO.getRegionAreaCode())){
+                       if(StringUtils.isNotEmpty(areaDTO.getRegionAreaCode())){
                            order.setRegionAreaCode(areaDTO.getRegionAreaCode().substring(0,size));
                        }
 
@@ -229,7 +229,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                 }
             }
             orderExcelDTO.setPayAccount(getPayAccountString(orderExcelDTO.getPayAccount()));
-            orderExcelDTO.setStationOrGroupName(StringUtils.isNotBlank(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
+            orderExcelDTO.setStationOrGroupName(StringUtils.isNotEmpty(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
         }
         //ForkJoinPool pool = new ForkJoinPool();
 
@@ -299,7 +299,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                     }
                 }
                 orderExcelDTO.setPayAccount(getPayAccountString(orderExcelDTO.getPayAccount()));
-                orderExcelDTO.setStationOrGroupName(StringUtils.isNotBlank(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
+                orderExcelDTO.setStationOrGroupName(StringUtils.isNotEmpty(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
             }
             //ForkJoinPool pool = new ForkJoinPool();
 
@@ -320,7 +320,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
     private String getPayAccountString(String payAccount){
         StringBuilder sb = new StringBuilder();
         for (String s : payAccount.split(",")) {
-            if(StringUtils.isNotBlank(s)){
+            if(StringUtils.isNotEmpty(s)){
                 for (PayAccount account : EnumUtils.getEnumList(PayAccount.class)) {
                     if(account.getCode().equals(Integer.parseInt(s))){
                         sb.append(account.getDisplay()+",");
@@ -422,7 +422,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
     private QueryWrapper webCostQuery(OrderCostWebInDTO orderWebInDTO) {
         QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
         String searchTime = "o.order_time";
-        if(StringUtils.isNotBlank(orderWebInDTO.getSearchDateStr())){
+        if(StringUtils.isNotEmpty(orderWebInDTO.getSearchDateStr())){
             searchTime = orderWebInDTO.getSearchDateStr();
         }
         if (orderWebInDTO.getStartDate() != null) {
@@ -444,7 +444,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             orderQueryWrapper.eq( "o.employee_id", orderWebInDTO.getEmployeeId());
         }
 
-        if(StringUtils.isNotBlank(orderWebInDTO.getCode())){
+        if(StringUtils.isNotEmpty(orderWebInDTO.getCode())){
             orderQueryWrapper.eq( "o.sn", orderWebInDTO.getCode());
         }
         orderQueryWrapper.eq( "o.status", 1);
@@ -461,25 +461,25 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 
     private QueryWrapper<Order> webOrderQuery(OrderWebInDTO orderWebInDTO, String prefix) {
         QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(orderWebInDTO.getSearchValuePhone())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getSearchValuePhone())) {
             orderQueryWrapper.eq(prefix + "phone", orderWebInDTO.getSearchValuePhone());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getSearchValueName())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getSearchValueName())) {
             orderQueryWrapper.like(prefix + "name", orderWebInDTO.getSearchValueName());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getSearchValueOrderCode())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getSearchValueOrderCode())) {
             orderQueryWrapper.eq(prefix + "sn", orderWebInDTO.getSearchValueOrderCode());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getOrderStatus())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getOrderStatus())) {
             orderQueryWrapper.eq(prefix + "order_status", orderWebInDTO.getOrderStatus());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getPayStatus())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getPayStatus())) {
             orderQueryWrapper.eq(prefix + "pay_status", orderWebInDTO.getPayStatus());
         }
         if (orderWebInDTO.getPayWay() != null) {
             orderQueryWrapper.eq(prefix + "pay_way", orderWebInDTO.getPayWay());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getOrderStyle())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getOrderStyle())) {
             orderQueryWrapper.eq(prefix + "order_style", orderWebInDTO.getOrderStyle());
         }
         if (orderWebInDTO.getStartDate() != null) {
@@ -513,13 +513,13 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 
     private QueryWrapper webQuery(DishesOrderWebInDTO orderWebInDTO) {
         QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(orderWebInDTO.getSn())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getSn())) {
             orderQueryWrapper.eq("o.sn", orderWebInDTO.getSn());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getCustomerName())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getCustomerName())) {
             orderQueryWrapper.eq( "o.customer_name", orderWebInDTO.getCustomerName());
         }
-        if (StringUtils.isNotBlank(orderWebInDTO.getCustomerPhone())) {
+        if (StringUtils.isNotEmpty(orderWebInDTO.getCustomerPhone())) {
             orderQueryWrapper.eq( "o.customer_phone", orderWebInDTO.getCustomerPhone());
         }
         if (orderWebInDTO.getPayStyle() != null) {
@@ -544,24 +544,24 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 
     private QueryWrapper orderServiceQuery(OrderServiceWebInDTO orderServiceWebInDTO, String prefix) {
         QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValueCustomerName())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValueCustomerName())) {
             orderQueryWrapper.eq(prefix + "customer_name", orderServiceWebInDTO.getSearchValueCustomerName());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValuePhone())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValuePhone())) {
             orderQueryWrapper.eq(prefix + "phone", orderServiceWebInDTO.getSearchValuePhone());
-        }else if (StringUtils.isNotBlank(orderServiceWebInDTO.getPhone())) {
+        }else if (StringUtils.isNotEmpty(orderServiceWebInDTO.getPhone())) {
             orderQueryWrapper.eq(prefix + "phone", orderServiceWebInDTO.getPhone());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValueName())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValueName())) {
             orderQueryWrapper.eq(prefix + "name", orderServiceWebInDTO.getSearchValueName());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValueIdNumber())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValueIdNumber())) {
             orderQueryWrapper.eq(prefix + "id_number", orderServiceWebInDTO.getSearchValueIdNumber());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValueEmployeeName())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValueEmployeeName())) {
             orderQueryWrapper.like(prefix + "employee_name", orderServiceWebInDTO.getSearchValueEmployeeName());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getSearchValueOrderCode())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getSearchValueOrderCode())) {
             orderQueryWrapper.eq(prefix + "sn", orderServiceWebInDTO.getSearchValueOrderCode());
         }
         if (null != orderServiceWebInDTO.getOrderStatus()) {
@@ -588,7 +588,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
         if (null != orderServiceWebInDTO.getEmployeeId()) {
             orderQueryWrapper.eq(prefix + "employee_id",orderServiceWebInDTO.getEmployeeId());
         }
-        if (StringUtils.isNotBlank(orderServiceWebInDTO.getReviewReason())) {
+        if (StringUtils.isNotEmpty(orderServiceWebInDTO.getReviewReason())) {
             orderQueryWrapper.likeRight(prefix + "review_reason",orderServiceWebInDTO.getReviewReason());
         }
         if(orderServiceWebInDTO.getStationId() != null && orderServiceWebInDTO.getSource() != null){

src/main/java/com/poteviohealth/cgp/statistics/utils/OrderExcelTask.java

@@ -81,7 +81,7 @@ public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
                     }
                 }
                 orderExcelDTO.setPayAccount(getPayAccountString(orderExcelDTO.getPayAccount()));
-                orderExcelDTO.setStationOrGroupName(StringUtils.isNotBlank(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
+                orderExcelDTO.setStationOrGroupName(StringUtils.isNotEmpty(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
             }
             return list;
         } else {
@@ -111,7 +111,7 @@ public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
     private String getPayAccountString(String payAccount){
         StringBuilder sb = new StringBuilder();
         for (String s : payAccount.split(",")) {
-            if(StringUtils.isNotBlank(s)){
+            if(StringUtils.isNotEmpty(s)){
                 for (PayAccount account : EnumUtils.getEnumList(PayAccount.class)) {
                     if(account.getCode().equals(Integer.parseInt(s))){
                         sb.append(account.getDisplay()+",");