Просмотр исходного кода

feat:别名编辑去掉前后空格

chenjianhua 1 неделя назад
Родитель
Сommit
259c14fa5c

+ 2 - 2
service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -177,8 +177,8 @@
                alias.updatetime,
                alias.updaterid
         from PPW_EMAIL.fund_alias alias
-                 left join PPW_EMAIL.pvn_fund_info info
-                           on alias.target_fund_id = info.fund_id and info.isvalid=1
+        left join PPW_EMAIL.pvn_fund_info info
+        on alias.target_fund_id = info.fund_id and info.isvalid=1
         where alias.isvalid=1 and alias.id=#{id}
     </select>
     <select id="getNotMappingFundList" resultType="com.simuwang.base.pojo.dos.FundRegisterDO">

+ 2 - 2
service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -37,7 +37,7 @@
         f.register_number as "registerNumber"
         from PPW_EMAIL.pvn_fund_info f where f.isvalid =1
         <if test="keyword != null and keyword !=''">
-            and (f.fund_name like concat('%',#{keyword},'%') or f.fund_short_name like concat('%',#{keyword},'%') or f.register_number like concat('%',#{keyword},'%') or f.fund_id like concat('%',#{keyword},'%'))
+            and (f.fund_name like concat(#{keyword},'%') or f.fund_short_name like concat(#{keyword},'%') or f.register_number like concat(#{keyword},'%'))
         </if>
         limit #{offset},#{pageSize}
     </select>
@@ -162,7 +162,7 @@
         select count(f.fund_id)
         from PPW_EMAIL.pvn_fund_info f where f.isvalid =1
         <if test="keyword != null and keyword !=''">
-            and (f.fund_name like concat('%',#{keyword},'%') or f.fund_short_name like concat('%',#{keyword},'%') or f.register_number like concat('%',#{keyword},'%') or f.fund_id like concat('%',#{keyword},'%'))
+            and (f.fund_name like concat(#{keyword},'%') or f.fund_short_name like concat(#{keyword},'%') or f.register_number like concat(#{keyword},'%') or f.fund_id like concat(#{keyword},'%'))
         </if>
     </select>
     <select id="countFundInfo" resultType="java.lang.Long"

+ 4 - 0
service-manage/src/main/java/com/simuwang/manage/api/company/CompanyInformationController.java

@@ -1,5 +1,6 @@
 package com.simuwang.manage.api.company;
 
+import com.simuwang.base.common.util.StringUtil;
 import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.CompanyInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,9 @@ public class CompanyInformationController {
      */
     @RequestMapping("search-info")
     public List<Map<String,String>> searchCompanyInfo(@RequestParam(value = "keyword",required = false)String keyword){
+        if(StringUtil.isNotEmpty(keyword)){
+            keyword = keyword.trim();
+        }
         List<Map<String,String>> result = companyInformationService.searchCompanyInfo(keyword);
         return result;
     }

+ 6 - 0
service-manage/src/main/java/com/simuwang/manage/service/impl/FundInformationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.simuwang.manage.service.impl;
 
 import com.simuwang.base.common.support.MybatisPage;
+import com.simuwang.base.common.util.StringUtil;
 import com.simuwang.base.mapper.FundInfoMapper;
 import com.simuwang.base.pojo.dos.FundInfoDO;
 import com.simuwang.base.pojo.dos.FundInformationDO;
@@ -32,6 +33,11 @@ public class FundInformationServiceImpl implements FundInformationService {
     private FundInfoMapper fundInfoMapper;
     @Override
     public MybatisPage<FundInfoSearchVO> searchFundInfo(FundInputPageQuery fundInputPageQuery) {
+        String keyword = fundInputPageQuery.getKeyword();
+        if(StringUtil.isNotEmpty(keyword)){
+            keyword = keyword.trim();
+            fundInputPageQuery.setKeyword(keyword);
+        }
         List<Map<String,String>> fundInfoList = fundInfoMapper.searchFundInfoByKeyword(fundInputPageQuery);
         List<FundInfoSearchVO> fundInfoSearchVOList = new ArrayList<>();
         for(Map<String,String> map : fundInfoList){