代码更新

applications/common-dto/src/main/java/com/usoftchina/saas/common/dto/BatchDealBaseDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.common.dto;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -7,7 +8,7 @@ import java.util.List;
  * @author: guq
  * @create: 2018-10-15 13:46
  **/
-public class BatchDealBaseDTO {
+public class BatchDealBaseDTO implements Serializable{
     private List<DocBaseDTO> baseDTOs;
 
     public List<DocBaseDTO> getBaseDTOs() {

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -18,9 +18,9 @@ import com.usoftchina.saas.purchase.po.*;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 import com.usoftchina.saas.utils.BeanMapper;
 
-import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -97,13 +97,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Purchase purchase = BeanMapper.map(main, Purchase.class);
 
         //编号获取
-        if (!StringUtils.hasText(pu_code)) {
+        if (StringUtils.isEmpty(pu_code)) {
             pu_code = "PU" + Math.random() * 1000;
             purchase.setPu_code(pu_code);
         }
         saveDTO.setCode(pu_code);
         //判断更新与保存动作
-        if (StringUtils.hasText(pu_id)) {
+        if (!StringUtils.isEmpty(pu_id)) {
             //更新主表
             purchaseMapper.updateByPrimaryKey(purchase);
             //添加从表传输对象
@@ -111,7 +111,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 PurchaseItem detail = BeanMapper.map(item, PurchaseItem.class);
                 detail.setPd_puid(pu_id);
                 detail.setPd_code(pu_code);
-                if (StringUtils.hasText(detail.getId())) {
+                if (!StringUtils.isEmpty(detail.getId())) {
                     updateDetails.add(detail);
                 } else {
                     insertDetails.add(detail);
@@ -162,7 +162,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Long id = null;
         if (null != formData) {
             id = formData.getMain().getId();
-            if (!StringUtils.hasText(id)) {
+            if (StringUtils.isEmpty(id)) {
                 DocSavedDTO saveDTO = saveFormData(formData);
                 id = saveDTO.getId();
             }
@@ -177,7 +177,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 baseDTOs.getBaseDTOs().size() == 0)
             return;
         String validate = purchaseMapper.validateAudit(baseDTOs.getBaseDTOs());
-        if (StringUtils.hasText(validate)) {
+        if (!StringUtils.isEmpty(validate)) {
             throw new BizException(500, "存在已审核单据,单据编号:" + validate);
         }
         for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
@@ -219,7 +219,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     private List<PurchaseList> getListByMode(PurchaseReqDTO req) {
         List<PurchaseList> list = null;
-        if (null == req || !StringUtils.hasText(req.getMode()) || "Main".equals(req.getMode())) {
+        if (null == req || StringUtils.isEmpty(req.getMode()) || "Main".equals(req.getMode())) {
             list = purchaseListMapper.selectPurchaseBycondition(req);
         } else {
             list = purchaseListMapper.selectPurchaseListByCondition(req);

framework/core/src/main/java/com/usoftchina/saas/utils/StringUtils.java

@@ -15,14 +15,4 @@ public class StringUtils {
     public static String nullIf(String target, String nullValue) {
         return (null == target || target.isEmpty()) ? nullValue : target;
     }
-
-    /**
-     * 判断参数是否为空、空字符串、空白格
-     *
-     * @param object
-     * @return
-     */
-    public static boolean hasText(Object object) {
-        return object == null ? false : org.springframework.util.StringUtils.hasText(object.toString());
-    }
 }