소스 검색

审批分页增加关键字查询

home 2 년 전
부모
커밋
7886b1cbb5

+ 5 - 0
bladex/blade-auth/pom.xml

@@ -85,6 +85,11 @@
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>common-tool</artifactId>
+            <version>3.2.0</version>
+        </dependency>
         <!-- 链路追踪、服务监控 -->
         <!--<dependency>
             <groupId>org.springblade</groupId>

+ 1 - 1
bladex/blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java

@@ -1,6 +1,6 @@
 package org.springblade.auth.granter;
 
-import org.springblade.auth.constant.WxAppletConstant;
+import com.fjhx.constants.WxAppletConstant;
 import org.springblade.auth.service.BladeUserDetails;
 import org.springblade.auth.utils.TokenUtil;
 import org.springblade.auth.utils.WxAppletUtil;

+ 1 - 1
bladex/blade-auth/src/main/java/org/springblade/auth/constant/WxAppletConstant.java → hx-common/common-tool/src/main/java/com/fjhx/constants/WxAppletConstant.java

@@ -1,4 +1,4 @@
-package org.springblade.auth.constant;
+package com.fjhx.constants;
 
 public interface WxAppletConstant {
 

+ 1 - 0
hx-service/storage/src/main/java/com/fjhx/applet/service/impl/FabricStatisticsServiceImpl.java

@@ -382,6 +382,7 @@ public class FabricStatisticsServiceImpl extends ServiceImpl<FabricStatisticsMap
     public Page<Map<String, Object>> flowPage(Map<String, String> condition) {
         WrapperUtil flowWrapper = getFlowWrapper(condition);
         flowWrapper.eq("fa.ID", "id");
+        flowWrapper.like("fa.ApprovalItem", "keyword");
 
         QueryWrapper<?> wrapper = flowWrapper.getWrapper();