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

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-05-05 15:30:52 +08:00
parent e222598ce3 b9b972d0fa
commit b02e61a6c5
6 changed files with 1883 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+4 -4
View File
@@ -3012,8 +3012,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
StringBuilder content = new StringBuilder("");
for (int i = 0; i < attidlist.length; i++) {
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && (attidlist[i].contains("att_file") || attidlist[i].contains("ATT_FILE"))) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
// String readFilePath = "E:\\上汽企标流程总览.pdf";
try {
@@ -3086,8 +3086,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(",");
StringBuilder content = new StringBuilder("");
for (int i = 0; i < attidlist.length; i++) {
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && (attidlist[i].contains("att_file") || attidlist[i].contains("ATT_FILE"))) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
if (null == attFileEO) {
continue;
}
adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml
+4 -4
View File
@@ -28,8 +28,8 @@
)
WHERE sar_standards_info.valid_flag = 0
<if test="vppsCode != null and vppsCode != ''">
and (SAR_STAND_ATTR_INFO.KCCVPPSBM like concat('%',#{vppsCode},'%') or SAR_STAND_ATTR_INFO.CYCVPPSBM like
concat('%',#{vppsCode},'%'))
and (SAR_STAND_ATTR_INFO.KCCVPPSBM like concat(#{vppsCode},'%') or SAR_STAND_ATTR_INFO.CYCVPPSBM like
concat(#{vppsCode},'%'))
</if>
<if test="vppsName != null and vppsName != ''">
and (SAR_STAND_ATTR_INFO.KCCVPPSCN like concat('%',#{vppsName},'%') or SAR_STAND_ATTR_INFO.CYCVPPSCN like
@@ -50,8 +50,8 @@
)
WHERE sar_bussioness_stand.valid_flag = 0
<if test="vppsCode != null and vppsCode != ''">
and (sar_buss_stand_attr_info.KCVPPSBMBUSS like concat('%',#{vppsCode},'%') or
sar_buss_stand_attr_info.CYCVPPSBMBUSS like concat('%',#{vppsCode},'%'))
and (sar_buss_stand_attr_info.KCVPPSBMBUSS like concat(#{vppsCode},'%') or
sar_buss_stand_attr_info.CYCVPPSBMBUSS like concat(#{vppsCode},'%'))
</if>
<if test="vppsName != null and vppsName != ''">
and (sar_buss_stand_attr_info.KCVPPSCNBUSS like concat('%',#{vppsName},'%') or