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..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()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' @@ -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/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; 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..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 @@ -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; @@ -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; 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); 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 + + +