FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!372
This commit is contained in:
王夏晖
2022-01-17 15:54:17 +08:00
parent 70d8ba058b 4a821e87b5
commit 728cd5d48f
6 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+24 -21
View File
@@ -193,9 +193,9 @@ public class ScheduledJob {
logger.info("开始更新文本状态!!!"); logger.info("开始更新文本状态!!!");
logger.info("========================================================================================================="); logger.info("=========================================================================================================");
logger.info("========================================================================================================="); logger.info("=========================================================================================================");
QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>(); // QueryWrapper<SarStandardsInfo> 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<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); List<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH);
HashMap<String, Integer> replaceIdCountMap = new HashMap<>(); HashMap<String, Integer> replaceIdCountMap = new HashMap<>();
// 格式为 T/CSAE 175-2021 // 格式为 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->{ replaceStandIdMaps.forEach(item->{
if (item!=null){ if (item!=null){
//此标准代替的标准的标准号的数组 //此标准代替的标准的标准号的数组
@@ -241,30 +244,30 @@ public class ScheduledJob {
String[] DTBJHArray = DTBJHStr.split(","); String[] DTBJHArray = DTBJHStr.split(",");
for (String DTBJH : DTBJHArray) { for (String DTBJH : DTBJHArray) {
if (!pattern.matcher(DTBJH).matches()){ // if (!pattern.matcher(DTBJH).matches()){
continue; // continue;
} // }
String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 // String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割
String sort = split[0]; // String sort = split[0];
String number = split[1]; // String number = split[1];
String year = split[2]; // String year = split[2];
//
QueryWrapper<SarStandardsInfo> infoWrapper = new QueryWrapper<>(); // QueryWrapper<SarStandardsInfo> infoWrapper = new QueryWrapper<>();
infoWrapper.select("ID") // infoWrapper.select("ID")
.eq("STAND_SORT", sort) // .eq("STAND_SORT", sort)
.eq("STAND_NUMBER", number) // .eq("STAND_NUMBER", number)
.eq("STAND_YEAR", year); // .eq("STAND_YEAR", year);
List<Map<String, Object>> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); List<String> standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH);
if (idMaps.size() > 0) { if (standId.size() > 0) {
String standId = idMaps.get(0).get("ID").toString();
//如果代替标准id已存在则映射为2不存在则添加并映射为1 //如果代替标准id已存在则映射为2不存在则添加并映射为1
if (replaceIdCountMap.containsKey(standId)) { if (replaceIdCountMap.containsKey(standId)) {
replaceIdCountMap.replace(standId, 2); replaceIdCountMap.replace(standId.get(0), 2);
} else { } else {
replaceIdCountMap.put(standId, 1); replaceIdCountMap.put(standId.get(0), 1);
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+3
View File
@@ -74,4 +74,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List<String> list); int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List<String> list);
List<String> selectIdFormDTBZH(String DTBZHCode);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+2
View File
@@ -134,6 +134,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
selectFieldMap.put("country","COUNTRY"); selectFieldMap.put("country","COUNTRY");
selectFieldMap.put("standSort","STANDCLASSIFY"); selectFieldMap.put("standSort","STANDCLASSIFY");
selectFieldMap.put("standState","STANDSTATE"); selectFieldMap.put("standState","STANDSTATE");
selectFieldMap.put("standNature","STANDNATURE");
} else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) { } else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) {
selectFieldMap = InitStandAttrUtil.selectFieldMapLaws; selectFieldMap = InitStandAttrUtil.selectFieldMapLaws;
selectFieldMap.put("isRelateAccess","SHIFOUGL"); selectFieldMap.put("isRelateAccess","SHIFOUGL");
@@ -149,6 +150,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
if (StringUtils.isNotBlank(selVal)) { if (StringUtils.isNotBlank(selVal)) {
value = getSelectionValueName(selVal,value); value = getSelectionValueName(selVal,value);
} else { } else {
//变更字段是否是文件
List<String> fileList = new ArrayList<>(); List<String> fileList = new ArrayList<>();
if (SarTypeEnum.INLAND_STAND.getValue().equals(sarType) || SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) { if (SarTypeEnum.INLAND_STAND.getValue().equals(sarType) || SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) {
fileList = InitStandAttrUtil.fileFieldList; fileList = InitStandAttrUtil.fileFieldList;
adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java
+2 -2
View File
@@ -62,7 +62,7 @@ public class SysInfoEOService {
String[] idArr = userIds.split(","); String[] idArr = userIds.split(",");
userNames = userEODao.getNamesByIds(idArr); userNames = userEODao.getNamesByIds(idArr);
if (StringUtils.isBlank(userNames) || "null".equals(userNames)) { if (StringUtils.isBlank(userNames) || "null".equals(userNames)) {
userNames = ""; userNames = userIds;
} }
} }
return userNames; return userNames;
@@ -81,7 +81,7 @@ public class SysInfoEOService {
String[] idArr = orgIds.split(","); String[] idArr = orgIds.split(",");
names = orgEODao.getNamesByIds(idArr); names = orgEODao.getNamesByIds(idArr);
if (StringUtils.isBlank(names) || "null".equals(names)) { if (StringUtils.isBlank(names) || "null".equals(names)) {
names = ""; names = orgIds;
} }
} }
return names; return names;
adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
+8
View File
@@ -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')"; 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; 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: default:
} }
sqlBuilder.append(sql); sqlBuilder.append(sql);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+28
View File
@@ -1719,4 +1719,32 @@
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select> </select>
<select id="selectIdFormDTBZH" resultType="java.lang.String">
SELECT ID FROM sar_standards_info as sarInfo
WHERE
(
REPLACE (
concat(
sarInfo.STAND_SORT,
' ',
sarInfo.STAND_NUMBER,
'-',
sarInfo.STAND_YEAR
),
' ',
''
) = REPLACE ( #{DTBZHCode},' ', '')
AND sarInfo.STAND_YEAR != ''
)
OR (
REPLACE (
concat(sarInfo.STAND_SORT,sarInfo.STAND_NUMBER),
' ',
''
) = REPLACE ( #{DTBZHCode},' ', '')
)
</select>
</mapper> </mapper>