合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!81

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -125,7 +125,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*"))
-                            .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
+                            .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     break;
                 case "laws":
                     boolQueryShould.should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*"))
@@ -166,7 +168,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*"))
                             .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*"))
-                            .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*"));
+                            .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*"))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     if (isRqFormat(searchInfoEO.getSelectValue())) {
                         Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
                         Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
@@ -256,7 +260,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
-                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f));
+                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     break;
                 case "laws":
                     boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
@@ -274,7 +280,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
-                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f));
+                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     break;
                 default: break;
             }
@@ -424,7 +432,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
-                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f));
+                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     break;
                 case "laws":
                     boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
@@ -449,7 +459,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f))
                             .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
-                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f));
+                            .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f))
+                            .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                            .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
                     if (isRqFormat(searchInfoEO.getSelectValue())) {
                         Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
                         Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
@@ -1637,7 +1649,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                     .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f))
                     .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f))
                     .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f))
-                    .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f));
+                    .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f))
+                    .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
+                    .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f));
 //            queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
 //                    "sortTitle","numberTitle","yearOrder","nameTitle","title"
 //            ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -2450,23 +2450,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  String[] split3 = qcrbuss.split(",");
                                                  String account = "";
                                                  String str = "";
-                                                 String qcr = "";
                                                  String qcrs = "";
                                                      for (int j = 0; j < split3.length; j++) {
                                                          str = split3[j];
                                                          account = tsUserDao.selectByAccount(str);
-                                                         qcr = tsUserDao.selectByQcrName(account);
+                                                         String name = tsUserDao.selectByName(account);
                                                          if (str != null && !str.equals("")) {
-                                                             if (!str.equals(qcr)){
+                                                             if (!str.equals(account)){
                                                                  return Result.error("第"+ count +"行输入的起草人名称不存在");
                                                              }
                                                              if (str.length() > 100) {
                                                                  return Result.error("第"+ count +"行输入的起草人过长");
                                                              }
                                                              if (StringUtils.isNotBlank(qcrs)){
-                                                                 qcrs += "," + str + "(" + account +")";
+                                                                 qcrs += "," + name + "(" + account +")";
                                                              }else {
-                                                                 qcrs = str + "(" + account +")";
+                                                                 qcrs = name + "(" + account +")";
                                                              }
                                                          }
                                                      }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -76,9 +76,7 @@ public interface TsUserDao extends BaseMapper<TsUser> {
     @Select("select UNAME from ts_user where USID = #{userId}")
     String selectByName(String userId);
 
-    @Select("select ACCOUNT from ts_user where UNAME =#{qcrbuss}")
+    @Select("select ACCOUNT from ts_user where ACCOUNT =#{qcrbuss}")
     String selectByAccount(String qcrbuss);
 
-    @Select("select UNAME from ts_user where ACCOUNT =#{str}")
-    String selectByQcrName(String str);
 }

adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java

@@ -71,7 +71,7 @@ public class FieldConvertUtil {
     public static String exportName = "填写说明\n" +
             "1.导入数据从第三行开始,第一行为填写说明,第二行为表头,第三行是正式数据\n" +
             "2.所有带*号的字段必须填写\n" +
-            "3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+            "3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配,起草人因为涉及到同名问题只能填写账号例如(zhangsan3),如果有多个起草人需要使用英文逗号进行区分\n" +
             "4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文逗号分割\n" +
             "5.发布日期,企标实施日期字段为年-月-日格式,必须精确到日,例如(2023-04-01)\n" +
             "6.企标编号,企标名称,企标英文名称字段为文本,填写文本内容\n" +