From 3bb6e45f23a8223a7ed2ca208ee0ada1cc119452 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 4 Nov 2022 16:27:09 +0800 Subject: [PATCH 1/9] bug --- .../adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index b93029f4..836d7a5b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableAsync; @@ -99,7 +100,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Override public ResponseMessage addRole(TsRole tsRole) { //判断是否是顶级角色 - if(tsRole.getParentId()==null){ + if(ObjectUtils.isEmpty(tsRole.getParentId())){ tsRole.setRoleHierarchy(1); }else { QueryWrapper parentQueryWrapper=new QueryWrapper<>(); From 02a3b6cc556590fb6105bde7a8bda9fe049cf035 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 4 Nov 2022 19:07:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=A4=E7=A9=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarRole/controller/TsRoleController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 60d50527..ad0efc6e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -15,6 +15,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.sys.entity.UserEO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ObjectUtils; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -104,7 +105,7 @@ public class TsRoleController extends BaseController { // tsRole.setParent(parent.getName()); // } TsRole tsRole=tsRoleDao.getAllDatas(roleId); - if(tsRole.getParentId()!=null){ + if(ObjectUtils.isNotEmpty(tsRole.getParentId())){ TsRole parent=tsRoleDao.getAllDatas(tsRole.getParentId()); tsRole.setParent(parent.getName()); } From 1403ca6b91a817feb85ef902d93e84d7af625940 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 7 Nov 2022 14:36:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E5=90=8E=E5=90=88=E8=A7=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 26ecbf36..26375cff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -555,11 +555,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { - p.setUnCount(s.getUnCount()); + p.setUnCount(s.getUnCount()); // uncount==0 }else if (s.getUnCount() == 0L && s.getCounts()==0L){ p.setUnCount(2L); }else { - p.setUnCount(1L); + p.setUnCount(1L); // 不符合 } p.setEndTimes(s.getEndTimes()); for (SarStandAttrInfo a:list2){ @@ -575,10 +575,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Mon, 7 Nov 2022 15:16:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=86=E5=88=AB=E5=AF=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BE=A4=E8=B7=9F=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryMapper.xml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index f1b4bd5b..90d86638 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -418,7 +418,7 @@ @@ -457,7 +460,12 @@ and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName} - )a + + + and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%') + + GROUP BY sar_stand_project_library.project_group + )a + + + update SAR_BUSS_STAND_ATTR_INFO set FSRQBUSS = #{time} + where id = #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 0bb01089..ecf551f9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -393,20 +393,20 @@ parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand"> SELECT , - DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime + DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime FROM sar_bussioness_stand WHERE stand_sort = 'Q/QCBFC' AND ISSUE_TIME IS NOT NULL - AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') + AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY) UNION SELECT , - DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime + DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime FROM sar_bussioness_stand WHERE stand_sort != 'Q/QCBFC' AND ISSUE_TIME IS NOT NULL - AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') + AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY) From e8d9117d90e629e1adf924dec2c9044a0d5587e5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 8 Nov 2022 14:55:29 +0800 Subject: [PATCH 8/9] =?UTF-8?q?279-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/search/entity/SeniorSearchInfoEO.java | 1 + .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index 4dba3f5a..c5aa6213 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -277,5 +277,6 @@ public class SeniorSearchInfoEO extends BasePage { private String standId; + private String clientType; // 客户端类型：空-web端， 2-手机端 } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ef43932f..6f2f3e03 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1645,6 +1645,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "title" // ).minimumShouldMatch("100%").field("title",1000f); + + if ("2".equals(searchInfoEO.getClientType())) { + boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3")); + } boolQueryBuilder.must(boolQueryShould); } @@ -1684,9 +1688,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) - .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standTypeOrder",SortOrder.ASC) .addSort("standSortOrder",SortOrder.ASC) + .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("numberTitle",SortOrder.ASC) .addSort("yearOrder.keyword",SortOrder.DESC) .addSort("sortTitle.keyword",SortOrder.ASC) From 447fa61549c0054ce0d68248c7a5f164736219a8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 8 Nov 2022 17:53:49 +0800 Subject: [PATCH 9/9] =?UTF-8?q?279-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/search/service/impl/SearchCenterServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 6f2f3e03..dc15c3fb 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1632,6 +1632,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1005f)) //非 .keyword 无法查询出结果 + .should(QueryBuilders.termQuery("numberTitle.keyword",searchInfoEO.getSelectValue()).boost(1004f)) .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f))