捐款明细汉字与数字分别搜索

donate-console/src/main/java/com/uas/console/donate/service/impl/ProjectRecodeServiceImpl.java

@@ -6,6 +6,7 @@ import com.uas.console.donate.model.SearchFilter;
 import com.uas.console.donate.service.ProjectRecodeService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -44,12 +45,19 @@ public class ProjectRecodeServiceImpl implements ProjectRecodeService {
                 if (null != filter) {
                     String keyword = filter.getKeyword();
                     if (StringUtils.hasText(keyword)) {
-                        pageInfo.expression(PredicateUtils.or(PredicateUtils.like("way", keyword, false),
-                                // 这里用like会造成数据不匹配错误，金额采用相等比较
-                                PredicateUtils.eq("amount", keyword, false),
-                                PredicateUtils.like("user.name", keyword, false, true),
-                                PredicateUtils.like("user.tel", keyword, false, true),
-                                PredicateUtils.like("user.userEmail", keyword, false, true)));
+                        if (NumberUtils.isNumber(keyword)) {
+                            pageInfo.expression(PredicateUtils.or(PredicateUtils.like("way", keyword, false),
+                                    // 这里用like会造成数据不匹配错误，金额采用相等比较
+                                    PredicateUtils.eq("amount", keyword, false),
+                                    PredicateUtils.like("user.name", keyword, false, true),
+                                    PredicateUtils.like("user.tel", keyword, false, true),
+                                    PredicateUtils.like("user.userEmail", keyword, false, true)));
+                        } else {
+                            pageInfo.expression(PredicateUtils.or(PredicateUtils.like("way", keyword, false),
+                                    PredicateUtils.like("user.name", keyword, false, true),
+                                    PredicateUtils.like("user.tel", keyword, false, true),
+                                    PredicateUtils.like("user.userEmail", keyword, false, true)));
+                        }
                     }
                     // 默认为全部方式
                     if (null != filter.getArea() && !"".equals(filter.getArea()) && !"全部方式".equals(filter.getArea())) {

donate-console/src/main/webapp/resources/css/base.css

@@ -1,6 +1,6 @@
 *{box-sizing: border-box;padding: 0;margin:0; font-family: "Microsoft Yahei", "微软雅黑";}
 html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-body,ol,table,tr,td,ul,li,dt,dd,dl,h1,h2,h3,h4,h5,h6,form,input,select,textarea,p,em,i,b,strong,span{font-size: 12px;font-weight: normal;list-style-type:none;font-style: inherit;}
+/*body,ol,table,tr,td,ul,li,dt,dd,dl,h1,h2,h3,h4,h5,h6,form,input,select,textarea,p,em,i,b,strong,span{font-size: 12px;font-weight: normal;list-style-type:none;font-style: inherit;}*/
 body{ padding-right: 0!important;}
 h1,h2,h3,h4,h5,h6{
 	margin: 0 !important;

donate-service/src/main/webapp/resources/css/base.css

@@ -1,6 +1,6 @@
 *{box-sizing: border-box;padding: 0;margin:0; font-family: "Microsoft Yahei", "微软雅黑";}
 html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-body,ol,table,tr,td,ul,li,dt,dd,dl,h1,h2,h3,h4,h5,h6,form,input,select,textarea,p,em,i,b,strong,span{font-size: 12px;font-weight: normal;list-style-type:none;font-style: inherit;}
+/*body,ol,table,tr,td,ul,li,dt,dd,dl,h1,h2,h3,h4,h5,h6,form,input,select,textarea,p,em,i,b,strong,span{font-size: 12px;font-weight: normal;list-style-type:none;font-style: inherit;}*/
 h1,h2,h3,h4,h5,h6{
 	margin: 0 !important;
 }