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

add:添加海外标准中英文名称可查，添加标准发布后培训文件自动上传到宣贯记录处

Browse Source
This commit is contained in:
wxyclub
2023-08-30 10:05:27 +08:00
parent 8e0237888c
commit 7860a92fad
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+20
View File
@@ -350,6 +350,7 @@ public class ActSarItemsBussEOService {
String standType = String.valueOf(standMap.get("standType"));
String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
String standNum = String.valueOf(standMap.get("standNum"));//制修订时顺序号
String madelSub = String.valueOf(standMap.get("madelSub")); // 培训文件
// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
SarBussionessStand sarBussionessStand = new SarBussionessStand();
// if(standMap.containsKey("standId")) {
@@ -472,6 +473,23 @@ public class ActSarItemsBussEOService {
} else {
relatePro = prcNum;
}
if (StringUtils.isNotBlank(madelSub)) {
// 查询原宣贯记录
String xgjlBuss = sarBussStandAttrInfoService.selectFieldValByStandId("XGJLBUSS", standId);
if (StringUtils.isNotBlank(xgjlBuss)) {
String[] xgjlBussSplit = xgjlBuss.split(",");
Set<String> xgjlBussSet = new HashSet<>();
for (String xgjlBussData : xgjlBussSplit) {
xgjlBussSet.add(xgjlBussData);
}
xgjlBussSet.add(madelSub);
xgjlBuss = StringUtils.join(xgjlBussSet.toArray(), ',');
} else {
xgjlBuss = madelSub;
}
// 编辑宣贯记录
sarBussStandAttrInfoService.updateStandInfo(standId,"XGJLBUSS",xgjlBuss);
}
// 编辑标准
sarBussionessStand.setId(standId);
iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
@@ -497,6 +515,8 @@ public class ActSarItemsBussEOService {
// 编辑相关流程
sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",prcNum);
// 编辑宣贯记录
sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGJLBUSS",madelSub);
}
List<SarStandItems> allItems = new ArrayList<>();
//开始处理条款数据，从去重后的结果中直接处理即可
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+9
View File
@@ -1915,6 +1915,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
getAttrMap.put("FBGBUSS", obj);
}
}
if (StringUtils.isNotBlank((String) getAttrMap.get("XGJLBUSS"))) {
String[] xgjlBussList = getAttrMap.get("XGJLBUSS").toString().split(",");
StringBuilder xgjlBussName = new StringBuilder();
for (String xgjlBuss : xgjlBussList) {
AttFileEO fileInfo = attFileEOService.getFileInfo(xgjlBuss);
xgjlBussName.append(fileInfo.getOldFileName());
}
getAttrMap.put("xgjlBussName",xgjlBussName.toString());
}
}
if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) {
// 遍历修改所有clob类型的值
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2
View File
@@ -1004,6 +1004,7 @@
<!-- 标准名称 -->
<if test="page.standName != null and page.standName != ''">
and stand_name like concat(concat('%',#{page.standName}),'%')
or stand_en_name like concat(concat('%',#{page.standName},'%'))
<!-- or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
<!-- or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
<!-- or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->
@@ -1196,6 +1197,7 @@
<!-- 标准名称 -->
<if test="page.standName != null and page.standName != ''">
and stand_name like concat(concat('%',#{page.standName}),'%')
or stand_en_name like concat(concat('%',#{page.standName}),'%')
<!-- or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
<!-- or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
<!-- or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->