文档库--新增(标准选择类型字段修改)
This commit is contained in:
+2
@@ -85,6 +85,8 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
|
|||||||
|
|
||||||
List<Map<String,Object>> selectMapsAll(@Param("ids") String ids);
|
List<Map<String,Object>> selectMapsAll(@Param("ids") String ids);
|
||||||
|
|
||||||
|
List<Map<String,Object>> selectMapsAllBySerialNumber(@Param("serialNumberList") String serialNumberList);
|
||||||
|
|
||||||
List<Map<String,Object>> getListInfo(@Param("condition") String condition);
|
List<Map<String,Object>> getListInfo(@Param("condition") String condition);
|
||||||
|
|
||||||
List<Map<String,Object>> selectMapsByDeleteIds(@Param("id") String id);
|
List<Map<String,Object>> selectMapsByDeleteIds(@Param("id") String id);
|
||||||
|
|||||||
+11
@@ -78,6 +78,17 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectMapsAllBySerialNumber" resultType="java.util.LinkedHashMap">
|
||||||
|
select * from buss_document_library
|
||||||
|
where 1=1
|
||||||
|
<if test="serialNumberList != null" >
|
||||||
|
and serial_number in
|
||||||
|
<foreach collection="serialNumberList.split(',')" index="index" item="item" open="(" separator="," close=")">
|
||||||
|
#{item}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="getListInfo" resultType="java.util.LinkedHashMap">
|
<select id="getListInfo" resultType="java.util.LinkedHashMap">
|
||||||
select * from buss_document_library
|
select * from buss_document_library
|
||||||
where ${condition}
|
where ${condition}
|
||||||
|
|||||||
+35
-42
@@ -1102,12 +1102,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new JeroBootException(e.getMessage());
|
throw new JeroBootException(e.getMessage());
|
||||||
}
|
}
|
||||||
// if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
|
|
||||||
// map.put("replace_standard", map.get("replace_standard_id"));
|
|
||||||
// }
|
|
||||||
// if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) {
|
|
||||||
// map.put("corresponding_standard", map.get("corresponding_standard_id"));
|
|
||||||
// }
|
|
||||||
|
|
||||||
//字段属性
|
//字段属性
|
||||||
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
|
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
|
||||||
@@ -1133,29 +1127,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//标准选择字段
|
//标准选择字段
|
||||||
List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
|
// List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
|
||||||
.filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
|
// .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
|
||||||
if(standardOnlCgformFieldList.size() != 0){
|
// if(standardOnlCgformFieldList.size() != 0){
|
||||||
List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
|
// List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
|
||||||
List<String> standardList = new ArrayList<>();
|
// List<String> standardList = new ArrayList<>();
|
||||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
// for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||||
String key = entry.getKey();
|
// String key = entry.getKey();
|
||||||
if(collect.contains(key)){
|
// if(collect.contains(key)){
|
||||||
standardList.add(key);
|
// standardList.add(key);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if(standardList.size() != 0){
|
// if(standardList.size() != 0){
|
||||||
for (String standard : standardList) {
|
// for (String standard : standardList) {
|
||||||
map.put(standard, map.get(standard+"_id"));
|
// map.put(standard, map.get(standard+"_id"));
|
||||||
map.remove(standard+"_id");
|
// map.remove(standard+"_id");
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
//代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息,提醒内容:"新标准编号"已实施,请注意更新“替代标准编号”状态
|
//代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息,提醒内容:"新标准编号"已实施,请注意更新“替代标准编号”状态
|
||||||
String cut = (String) map.get("cut");
|
String cut = (String) map.get("cut");
|
||||||
map.remove("cut");
|
map.remove("cut");
|
||||||
// map.remove("replace_standard_id");
|
|
||||||
// map.remove("corresponding_standard_id");
|
|
||||||
//获取搜索中心字段
|
//获取搜索中心字段
|
||||||
List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
|
List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
|
||||||
//文件类型字段
|
//文件类型字段
|
||||||
@@ -1538,19 +1530,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//对应标准,代替标准
|
//对应标准,代替标准
|
||||||
for (String valueTemp : entry.getValue().toString().split(",")) {
|
standSb.append(entry.getValue().toString() + ",");
|
||||||
if (isId(valueTemp)) {
|
// for (String valueTemp : entry.getValue().toString().split(",")) {
|
||||||
//是id
|
// if (isId(valueTemp)) {
|
||||||
for (Map<String, Object> stringObjectMap : mapList) {
|
// //是id
|
||||||
if (stringObjectMap.get("id").equals(valueTemp)) {
|
// for (Map<String, Object> stringObjectMap : mapList) {
|
||||||
standSb.append(stringObjectMap.get("serial_number") + ",");
|
// if (stringObjectMap.get("id").equals(valueTemp)) {
|
||||||
}
|
// standSb.append(stringObjectMap.get("serial_number") + ",");
|
||||||
}
|
// }
|
||||||
} else {
|
// }
|
||||||
//不是id
|
// } else {
|
||||||
standSb.append(valueTemp + ",");
|
// //不是id
|
||||||
}
|
// standSb.append(valueTemp + ",");
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(standSb)) {
|
if (StringUtils.isNotBlank(standSb)) {
|
||||||
@@ -2371,8 +2364,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
webSocket.sendMessage(obj.toJSONString());
|
webSocket.sendMessage(obj.toJSONString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void replaceStandardSend(List<String> documentIdList) {
|
private void replaceStandardSend(List<String> serialNumberListTemp) {
|
||||||
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(documentIdList, ","));
|
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAllBySerialNumber(StringUtils.join(serialNumberListTemp, ","));
|
||||||
List<String> userNameListTemp = new ArrayList<>();
|
List<String> userNameListTemp = new ArrayList<>();
|
||||||
List<String> serialNumberList = new ArrayList<>();
|
List<String> serialNumberList = new ArrayList<>();
|
||||||
List<String> urlList = new ArrayList<>();
|
List<String> urlList = new ArrayList<>();
|
||||||
@@ -2403,7 +2396,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
//封装消息的实体类
|
//封装消息的实体类
|
||||||
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
|
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
|
||||||
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
||||||
sendWebsocket(StringUtils.join(documentIdList, ","), StringUtils.join(documentIdList, ","));
|
sendWebsocket(StringUtils.join(serialNumberListTemp, ","), StringUtils.join(serialNumberListTemp, ","));
|
||||||
//飞书
|
//飞书
|
||||||
try {
|
try {
|
||||||
for (String s : urlList) {
|
for (String s : urlList) {
|
||||||
|
|||||||
Reference in New Issue
Block a user