Quellcode durchsuchen

Merge branch 'master' into smb

liutao vor 1 Monat
Ursprung
Commit
ad589998a3

+ 1 - 1
build.gradle

@@ -9,7 +9,7 @@ targetCompatibility = 1.8
 
 jar {
     baseName = 'factoring-trade-prod'
-    version = '1.0.61'
+    version = '1.0.63'
 }
 
 springBoot {

+ 2 - 0
src/main/java/com/sunxung/factoring/entity/sys/request/ClientUserQueryRequest.java

@@ -11,6 +11,8 @@ import java.util.List;
 @Setter
 public class ClientUserQueryRequest extends BaseSearch {
 
+  private String keyword;
+
   /**
    * 用户id / 手机号码
    */

+ 13 - 0
src/main/java/com/sunxung/factoring/service/sys/impl/ClientUserServiceImpl.java

@@ -30,6 +30,7 @@ import com.sunxung.factoring.entity.sys.*;
 import com.sunxung.factoring.entity.sys.request.ClientUserQueryRequest;
 import com.sunxung.factoring.entity.sys.request.DistributePMRequest;
 import com.sunxung.factoring.entity.sys.request.DistributeRMRequest;
+import com.sunxung.factoring.entity.sys.vo.ClientUserCompanyInfoVO;
 import com.sunxung.factoring.entity.sys.vo.ClientUserVO;
 import com.sunxung.factoring.entity.underlying.UnderlyingBasicInfo;
 import com.sunxung.factoring.mapper.project.BusinessProcessingLogMapper;
@@ -69,6 +70,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -196,6 +198,17 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
         vo.setList(this.baseMapper.getCompanyByClientUserId(vo.getId()));
       }
     }
+    if(StringUtil.isNotEmpty(clientUserQueryRequest.getKeyword())){
+      clientUserVOS = clientUserVOS.stream().filter(r->{
+        List<ClientUserCompanyInfoVO> list = r.getList();
+        boolean anyMatch = list.stream().anyMatch(l -> l.getMainCompany().contains(clientUserQueryRequest.getKeyword()));
+        if(anyMatch){
+          return true;
+        }else {
+          return false;
+        }
+      }).collect(Collectors.toList());
+    }
     return new GridPage<>(clientUserQueryRequest.getRows(), clientUserQueryRequest.getPage(),
         objects.getTotal(), clientUserVOS);
   }

+ 7 - 1
src/main/resources/data/update/smb0826.sql

@@ -79,4 +79,10 @@ VALUES ( (select t.id from t_permission t where t.ename = 'CapitalLoanMoney'), '
 INSERT INTO `t_permission`( `parentId`, `type`, `cname`, `ename`, `gradation`, `moduleName`, `url`, `icon`, `user_create`, `user_modified`, `gmt_create`, `gmt_modified`)
 VALUES ( (select t.id from t_permission t where t.ename = 'CapitalLoanMoney'), 'button', '重新发起 ', 'loanApplyAgain', 2, '资方融资管理', null, NULL, NULL, NULL, now(), now());
 INSERT INTO `t_permission`( `parentId`, `type`, `cname`, `ename`, `gradation`, `moduleName`, `url`, `icon`, `user_create`, `user_modified`, `gmt_create`, `gmt_modified`)
-VALUES ( (select t.id from t_permission t where t.ename = 'CapitalLoanMoney'), 'button', '数据全员可见 ', 'viewAllFinancingLoanInfo', 3, '资方融资管理', null, NULL, NULL, NULL, now(), now());
+VALUES ( (select t.id from t_permission t where t.ename = 'CapitalLoanMoney'), 'button', '数据全员可见 ', 'viewAllFinancingLoanInfo', 3, '资方融资管理', null, NULL, NULL, NULL, now(), now());
+
+INSERT INTO `t_dictionary` ( `name`, `parentId`, `code`, `value`, `gradation`, `gmt_create`, `gmt_modified`)
+VALUES ('苏商银行主合同文件', 1349, 'sushangFirstContrat', NULL, 3, '2024-02-07 14:54:49', '2024-02-07 14:54:49');
+
+INSERT INTO `t_dictionary` ( `name`, `parentId`, `code`, `value`, `gradation`, `gmt_create`, `gmt_modified`)
+VALUES ('苏商银行担保合同文件', 1349, 'sushangGuaranteeContrat', NULL, 3, '2024-02-07 14:54:49', '2024-02-07 14:54:49');