From fa7f7651957b5c07d8d64b0a7789ee75e9cbab83 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 14 Jan 2022 13:57:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=20=20"=E7=94=A8=E6=88=B7?= =?UTF-8?q?id"=20=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E6=97=B6=E8=BF=94=E5=9B=9E=20"=E7=94=A8=E6=88=B7id"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java index 717efb75..31f73ea4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java @@ -62,7 +62,7 @@ public class SysInfoEOService { String[] idArr = userIds.split(","); userNames = userEODao.getNamesByIds(idArr); if (StringUtils.isBlank(userNames) || "null".equals(userNames)) { - userNames = ""; + userNames = userIds; } } return userNames; From c8bd8fefcf9f65b83f0ae67a7631a00cfbd77613 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 14:54:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8F=91=E7=94=9F=E9=94=99=E8=AF=AF=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5(sar=5Fstand=5Fattr=5Fdetail=E8=A1=A8=E7=9A=84SEL=5FVA?= =?UTF-8?q?l=E5=AD=97=E6=AE=B5),=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9?= =?UTF-8?q?=E9=9D=9E=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=80=A7=E8=B4=A8=E7=9A=84=E6=97=A5=E5=BF=97=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index e93a057d..2bf7bade 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -134,6 +134,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i selectFieldMap.put("country","COUNTRY"); selectFieldMap.put("standSort","STANDCLASSIFY"); selectFieldMap.put("standState","STANDSTATE"); + selectFieldMap.put("standNature","STANDNATURE"); } else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) { selectFieldMap = InitStandAttrUtil.selectFieldMapLaws; selectFieldMap.put("isRelateAccess","SHIFOUGL"); @@ -149,6 +150,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i if (StringUtils.isNotBlank(selVal)) { value = getSelectionValueName(selVal,value); } else { + //变更字段是否是文件 List fileList = new ArrayList<>(); if (SarTypeEnum.INLAND_STAND.getValue().equals(sarType) || SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) { fileList = InitStandAttrUtil.fileFieldList; From 421df00d9b1ecd1367079d5eb606a65e5e9ab998 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 15:30:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF,=E4=BF=AE=E6=94=B9=E4=BA=86sar=5Fstand=5Fatt?= =?UTF-8?q?r=5Fdetail=E4=B8=AD=E7=9A=84sycpx=E5=92=8CTXLB=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E8=BF=94=E5=9B=9E=E6=9C=AC=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java index 31f73ea4..e59d1507 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java @@ -81,7 +81,7 @@ public class SysInfoEOService { String[] idArr = orgIds.split(","); names = orgEODao.getNamesByIds(idArr); if (StringUtils.isBlank(names) || "null".equals(names)) { - names = ""; + names = orgIds; } } return names; From 84a246ea06181308a6d2640ec214076914e66622 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 17:02:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?,=E7=94=B1=E4=BA=8E=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F=E4=B8=8E=E4=B8=8D=E4=B8=8E=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E7=9B=B8=E5=90=8C,=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 41 ++++++++++--------- .../dao/SarStandardsInfoDao.java | 3 ++ .../SarStandardsInfoMapper.xml | 28 +++++++++++++ 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 586a8736..da7a421a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -230,7 +230,10 @@ public class ScheduledJob { List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); HashMap replaceIdCountMap = new HashMap<>(); // 格式为 T/CSAE 175-2021 - Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); + /** + * 国内外表准号格式不统一 + */ +// Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); replaceStandIdMaps.forEach(item->{ if (item!=null){ //此标准代替的标准的标准号的数组 @@ -241,30 +244,30 @@ public class ScheduledJob { String[] DTBJHArray = DTBJHStr.split(","); for (String DTBJH : DTBJHArray) { - if (!pattern.matcher(DTBJH).matches()){ - continue; - } +// if (!pattern.matcher(DTBJH).matches()){ +// continue; +// } - String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 - String sort = split[0]; - String number = split[1]; - String year = split[2]; - - QueryWrapper infoWrapper = new QueryWrapper<>(); - infoWrapper.select("ID") - .eq("STAND_SORT", sort) - .eq("STAND_NUMBER", number) - .eq("STAND_YEAR", year); +// String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 +// String sort = split[0]; +// String number = split[1]; +// String year = split[2]; +// +// QueryWrapper infoWrapper = new QueryWrapper<>(); +// infoWrapper.select("ID") +// .eq("STAND_SORT", sort) +// .eq("STAND_NUMBER", number) +// .eq("STAND_YEAR", year); - List> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); - if (idMaps.size() > 0) { - String standId = idMaps.get(0).get("ID").toString(); + List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); + if (standId.size() > 0) { + //如果代替标准id已存在则映射为2不存在则添加并映射为1 if (replaceIdCountMap.containsKey(standId)) { - replaceIdCountMap.replace(standId, 2); + replaceIdCountMap.replace(standId.get(0), 2); } else { - replaceIdCountMap.put(standId, 1); + replaceIdCountMap.put(standId.get(0), 1); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 0b9dfd4b..07a0949b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -74,4 +74,7 @@ public interface SarStandardsInfoDao extends BaseMapper { int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List list); + + List selectIdFormDTBZH(String DTBZHCode); + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 88544600..557e4d0b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1719,4 +1719,32 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + + + From 2abdb7e2537a5e2ffd861e1e841b4656b2b2d838 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 17:05:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=AA=E8=A2=AB?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index da7a421a..d837037a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -193,9 +193,9 @@ public class ScheduledJob { logger.info("开始更新文本状态!!!"); logger.info("========================================================================================================="); logger.info("========================================================================================================="); - QueryWrapper wrapper = new QueryWrapper<>(); +// QueryWrapper wrapper = new QueryWrapper<>(); - TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); +// TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' From 0136a396e072774d4f5f09b105a72cb0189e99ad Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 17 Jan 2022 15:49:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2advance?= =?UTF-8?q?VOStr=E6=97=A5=E6=9C=9F=E7=AD=89=E5=80=BC=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/utils/util/SarAdvanceSearchUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 1b872090..60a53752 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -127,6 +127,14 @@ public class SarAdvanceSearchUtil { sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; } break; + case "equals": + case "EQUALS": + if (i==0){ + sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; + }else { + sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; + } + break; default: } sqlBuilder.append(sql);