WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-10 18:36:49 +08:00
parent 17fd92a13a 700e3bda62
commit 1a9be0defb
24 changed files with 851 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+552 -262
View File
@@ -612,99 +612,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//查询所有
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
//对应标准id
String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
//代替标准id
String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
//处理被代替标准和对应标准
List<String> replaceStandardNameList = new ArrayList<>();//代替标准
List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
for (Map<String, Object> map : mapList) {
//对应标准处理
if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
for (String s : correspondingStandard.split(",")) {
if (s.equals((String) map.get("id"))) {
correspondingStandardNameList.add((String) map.get("serial_number"));
} else {
boolean flag = isId(s);
if (!flag && !correspondingStandardNameList.contains(s)) {
correspondingStandardNameList.add(s);
}
}
}
} else {
//处理已删除的文档的对应标准
if (StringUtils.isNotBlank(correspondingStandard)) {
for (String s : correspondingStandard.split(",")) {
boolean flag = isId(s);
if (!flag && !correspondingStandardNameList.contains(s)) {
correspondingStandardNameList.add(s);
}
}
}
}
//代替标准
if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
for (String s : replaceStandardTemp.split(",")) {
if (s.equals((String) map.get("id"))) {
replaceStandardNameList.add((String) map.get("serial_number"));
} else {
boolean flag = isId(s);
if (!flag && !replaceStandardNameList.contains(s)) {
replaceStandardNameList.add(s);
}
}
}
} else {
//处理已删除的代替标准
if (StringUtils.isNotBlank(replaceStandardTemp)) {
for (String s : replaceStandardTemp.split(",")) {
boolean flag = isId(s);
if (!flag && !replaceStandardNameList.contains(s)) {
replaceStandardNameList.add(s);
}
}
}
}
//被代替标准
String replaceStandard = (String) map.get("replace_standard");
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String) dataList.get(0).get("serial_number"))) {
String serialNumber = (String) map.get("serial_number");
replacedStandardNameList.add(serialNumber);
replacedStandardIdList.add((String) map.get("id"));
}
}
//对应标准中文
// if (correspondingStandardNameList.size() != 0) {
dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
dataList.get(0).put("corresponding_standard_id", correspondingStandard);
// }
// if (replacedStandardNameList.size() != 0) {
dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
// dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
// }
// if (replaceStandardNameList.size() != 0) {
dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
dataList.get(0).put("replace_standard_id", replaceStandardTemp);
// }
//代替标准中文
// String replaceStandard = (String) dataList.get(0).get("replace_standard");
// if (StringUtils.isNotBlank(replaceStandard)) {
// LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
// queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
// List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
// if (dataListTemp.size() != 0) {
// List<String> replaceStandardListNew = new ArrayList<>();
// for (Map<String, Object> map : dataListTemp) {
// replaceStandardListNew.add((String) map.get("serial_number"));
// }
// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
// dataList.get(0).put("replace_standard_id", replaceStandard);
// }
// }
for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
if(treeList.contains(entry.getKey())){
String value = (String) entry.getValue();
@@ -717,6 +635,131 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
return dataList;
}
// public List<Map<String, Object>> getDocumentInfoById(String id, String cut) {
// //字段属性
// List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
// List<OnlCgformField> treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
// List<String> treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
// List<OnlCgformField> onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
// List<String> dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
// //通过id查询数据
// List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
// //多选日期
// for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
// String key = entry.getKey();
// if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){
// String value = (String) entry.getValue();
// entry.setValue(Arrays.asList(value.split(",")));
// }
// }
//
// //查询所有
// List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
// //对应标准id
// String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
// //代替标准id
// String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
// //处理被代替标准和对应标准
// List<String> replaceStandardNameList = new ArrayList<>();//代替标准
// List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
// List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
// List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
// for (Map<String, Object> map : mapList) {
// //对应标准处理
// if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
// for (String s : correspondingStandard.split(",")) {
// if (s.equals((String) map.get("id"))) {
// correspondingStandardNameList.add((String) map.get("serial_number"));
// } else {
// boolean flag = isId(s);
// if (!flag && !correspondingStandardNameList.contains(s)) {
// correspondingStandardNameList.add(s);
// }
// }
// }
// } else {
// //处理已删除的文档的对应标准
// if (StringUtils.isNotBlank(correspondingStandard)) {
// for (String s : correspondingStandard.split(",")) {
// boolean flag = isId(s);
// if (!flag && !correspondingStandardNameList.contains(s)) {
// correspondingStandardNameList.add(s);
// }
// }
// }
// }
// //代替标准
// if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
// for (String s : replaceStandardTemp.split(",")) {
// if (s.equals((String) map.get("id"))) {
// replaceStandardNameList.add((String) map.get("serial_number"));
// } else {
// boolean flag = isId(s);
// if (!flag && !replaceStandardNameList.contains(s)) {
// replaceStandardNameList.add(s);
// }
// }
// }
// } else {
// //处理已删除的代替标准
// if (StringUtils.isNotBlank(replaceStandardTemp)) {
// for (String s : replaceStandardTemp.split(",")) {
// boolean flag = isId(s);
// if (!flag && !replaceStandardNameList.contains(s)) {
// replaceStandardNameList.add(s);
// }
// }
// }
//
// }
// //被代替标准
// String replaceStandard = (String) map.get("replace_standard");
// if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
// String serialNumber = (String) map.get("serial_number");
// replacedStandardNameList.add(serialNumber);
// replacedStandardIdList.add((String) map.get("id"));
// }
// }
// //对应标准中文
//// if (correspondingStandardNameList.size() != 0) {
// dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
// dataList.get(0).put("corresponding_standard_id", correspondingStandard);
//// }
//// if (replacedStandardNameList.size() != 0) {
// dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
//// dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
//// }
//// if (replaceStandardNameList.size() != 0) {
// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
// dataList.get(0).put("replace_standard_id", replaceStandardTemp);
//// }
// //代替标准中文
//// String replaceStandard = (String) dataList.get(0).get("replace_standard");
//// if (StringUtils.isNotBlank(replaceStandard)) {
//// LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
//// queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
//// List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
//// if (dataListTemp.size() != 0) {
//// List<String> replaceStandardListNew = new ArrayList<>();
//// for (Map<String, Object> map : dataListTemp) {
//// replaceStandardListNew.add((String) map.get("serial_number"));
//// }
//// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
//// dataList.get(0).put("replace_standard_id", replaceStandard);
//// }
//// }
// for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
// if(treeList.contains(entry.getKey())){
// String value = (String) entry.getValue();
// if(StringUtils.isNotBlank(value)){
// dataList.get(0).put(entry.getKey(), Arrays.asList(value.split(",")));
// }else{
// dataList.get(0).put(entry.getKey(), null);
// }
// }
// }
// return dataList;
// }
/**
* 详情数据查询
@@ -726,6 +769,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
*/
@Override
public List<Map<String, Object>> getInfoById(String id, String cut) {
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//标准选择字段
List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> standFieldList = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//通过id查询数据
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
@@ -738,129 +787,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//查询所有
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
//原始对应标准,代替标准,被代替标准(原始数据存的是iD)
String correspondingStandardId = "";
String replaceStandardId = "";//代替标准
if (!dataList.isEmpty()) {
correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准
replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准
}
//被代替标准
List<String> replacedStandardIdList = new ArrayList<>();//代替标准
//对应标准,代替标准,被代替标准对应的编码
List<String> correspondingStandardNameList = new ArrayList<>();//对应标准编码
List<String> replaceStandardNameList = new ArrayList<>();//代替标准编码
List<String> replacedStandardNameList = new ArrayList<>();//被代替标准编码
List<Map<String, Object>> listCorrespondingStandard = new ArrayList<>();
List<Map<String, Object>> listReplaceStandard = new ArrayList<>();
List<Map<String, Object>> listReplacedStandard = new ArrayList<>();
//处理被代替标准和对应标准
for (Map<String, Object> map : mapList) {
Map<String, Object> stringObjectMap = new HashMap<>();
//对应标准处理
if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
for (String s : correspondingStandardId.split(",")) {
Map<String, Object> mapTemp = new HashMap<>();
if (s.equals((String) map.get("id"))) {
correspondingStandardNameList.add((String) map.get("serial_number"));
mapTemp.put("title", (String) map.get("serial_number"));
mapTemp.put("id", (String) map.get("id"));
if (ObjectUtils.isNotEmpty(mapTemp)) {
listCorrespondingStandard.add(mapTemp);
}
} else {
boolean flag = isId(s);
if (!flag && !correspondingStandardNameList.contains(s)) {
correspondingStandardNameList.add(s);
mapTemp.put("title", s);
mapTemp.put("id", "");
if (ObjectUtils.isNotEmpty(mapTemp)) {
listCorrespondingStandard.add(mapTemp);
}
}
}
}
} else {
if (StringUtils.isNotBlank(correspondingStandardId)) {
for (String s : correspondingStandardId.split(",")) {
Map<String, Object> mapTemp = new HashMap<>();
boolean flag = isId(s);
if (!flag && !correspondingStandardNameList.contains(s)) {
correspondingStandardNameList.add(s);
mapTemp.put("title", s);
mapTemp.put("id", "");
if (ObjectUtils.isNotEmpty(mapTemp)) {
listCorrespondingStandard.add(mapTemp);
}
}
}
}
}
//代替标准
if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) {
for (String s : replaceStandardId.split(",")) {
Map<String, Object> mapTemp = new HashMap<>();
if (s.equals((String) map.get("id"))) {
replaceStandardNameList.add((String) map.get("serial_number"));
mapTemp.put("title", (String) map.get("serial_number"));
mapTemp.put("id", (String) map.get("id"));
if (ObjectUtils.isNotEmpty(mapTemp)) {
listReplaceStandard.add(mapTemp);
}
} else {
boolean flag = isId(s);
if (!flag && !replaceStandardNameList.contains(s)) {
replaceStandardNameList.add(s);
mapTemp.put("title", s);
mapTemp.put("id", "");
if (ObjectUtils.isNotEmpty(mapTemp)) {
listReplaceStandard.add(mapTemp);
}
}
}
}
} else {
if (StringUtils.isNotBlank(replaceStandardId)) {
for (String s : replaceStandardId.split(",")) {
Map<String, Object> mapTemp = new HashMap<>();
boolean flag = isId(s);
if (!flag && !replaceStandardNameList.contains(s)) {
replaceStandardNameList.add(s);
mapTemp.put("title", s);
mapTemp.put("id", "");
if (ObjectUtils.isNotEmpty(mapTemp)) {
listReplaceStandard.add(mapTemp);
}
}
}
}
}
//被代替标准
String replaceStandard = (String) map.get("replace_standard");
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
replacedStandardIdList.add((String) map.get("id"));
String serialNumber = (String) map.get("serial_number");
replacedStandardNameList.add(serialNumber);
stringObjectMap.put("title", (String) map.get("serial_number"));
stringObjectMap.put("id", (String) map.get("id"));
if (ObjectUtils.isNotEmpty(stringObjectMap)) {
listReplacedStandard.add(stringObjectMap);
}
}
}
//区域管理
OnlCgformArea onlCgformArea = new OnlCgformArea();
onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea);
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
//过滤出下拉选
List<OnlCgformField> onlCgformFieldList = fieldList.stream()
@@ -1005,22 +935,34 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else {
//处理字段类型为文件之外的字段
if (dataList.size() != 0) {
List<String> standardNameList = new ArrayList<>();//对应标准编码
List<Map<String, Object>> listStandard = new ArrayList<>();
String finalValue = value;
dataList.get(0).entrySet().forEach(entry -> {
if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
if (onlCgformField.getDbFieldName().equals("replace_standard")) {
//代替标准
map.put("value", StringUtils.join(replaceStandardNameList, ","));
map.put("list", listReplaceStandard);
} else if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
//被代替标准
map.put("value", StringUtils.join(replacedStandardNameList, ","));
map.put("list", listReplacedStandard);
} else if (onlCgformField.getDbFieldName().equals("corresponding_standard")) {
//对应标准
map.put("value", StringUtils.join(correspondingStandardNameList, ","));
map.put("list", listCorrespondingStandard);
} else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
//标准类型字段处理
if(standFieldList.contains(entry.getKey())){
if(ObjectUtils.isNotEmpty(entry.getValue())){
for (Map<String, Object> map1 : mapList) {
//对应标准处理
if (ObjectUtils.isNotEmpty(entry.getValue())) {
for (String s : entry.getValue().toString().split(",")) {
Map<String, Object> mapTemp1 = new HashMap<>();
if (s.equals((String) map1.get("serial_number"))) {
standardNameList.add((String) map1.get("serial_number"));
mapTemp1.put("title", (String) map1.get("serial_number"));
mapTemp1.put("id", (String) map1.get("id"));
if (ObjectUtils.isNotEmpty(mapTemp1)) {
listStandard.add(mapTemp1);
}
}
}
}
}
map.put("value", entry.getValue().toString());
map.put("list", listStandard);
}
}else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
map.put("value", finalValue);
} else {
map.put("value", entry.getValue());
@@ -1050,6 +992,331 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
return result;
}
// public List<Map<String, Object>> getInfoById(String id, String cut) {
// //通过id查询数据
// List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
//
// List<Map<String, Object>> result = new ArrayList<>(); // 要返回的结果
// if (dataList.isEmpty()){
// // 取不到数据，直接返回空结果
// return result;
// }
//
// //查询所有
// List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
//
// //原始对应标准,代替标准,被代替标准(原始数据存的是iD)
// String correspondingStandardId = "";
// String replaceStandardId = "";//代替标准
// if (!dataList.isEmpty()) {
// correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准
// replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准
// }
//
// //被代替标准
// List<String> replacedStandardIdList = new ArrayList<>();//代替标准
//
// //对应标准,代替标准,被代替标准对应的编码
// List<String> correspondingStandardNameList = new ArrayList<>();//对应标准编码
// List<String> replaceStandardNameList = new ArrayList<>();//代替标准编码
// List<String> replacedStandardNameList = new ArrayList<>();//被代替标准编码
//
// List<Map<String, Object>> listCorrespondingStandard = new ArrayList<>();
// List<Map<String, Object>> listReplaceStandard = new ArrayList<>();
// List<Map<String, Object>> listReplacedStandard = new ArrayList<>();
//
//
// //处理被代替标准和对应标准
// for (Map<String, Object> map : mapList) {
// Map<String, Object> stringObjectMap = new HashMap<>();
// //对应标准处理
// if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
// for (String s : correspondingStandardId.split(",")) {
// Map<String, Object> mapTemp = new HashMap<>();
// if (s.equals((String) map.get("id"))) {
// correspondingStandardNameList.add((String) map.get("serial_number"));
// mapTemp.put("title", (String) map.get("serial_number"));
// mapTemp.put("id", (String) map.get("id"));
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listCorrespondingStandard.add(mapTemp);
// }
// } else {
// boolean flag = isId(s);
// if (!flag && !correspondingStandardNameList.contains(s)) {
// correspondingStandardNameList.add(s);
// mapTemp.put("title", s);
// mapTemp.put("id", "");
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listCorrespondingStandard.add(mapTemp);
// }
// }
// }
// }
// } else {
// if (StringUtils.isNotBlank(correspondingStandardId)) {
// for (String s : correspondingStandardId.split(",")) {
// Map<String, Object> mapTemp = new HashMap<>();
// boolean flag = isId(s);
// if (!flag && !correspondingStandardNameList.contains(s)) {
// correspondingStandardNameList.add(s);
// mapTemp.put("title", s);
// mapTemp.put("id", "");
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listCorrespondingStandard.add(mapTemp);
// }
// }
// }
// }
//
// }
// //代替标准
// if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) {
// for (String s : replaceStandardId.split(",")) {
// Map<String, Object> mapTemp = new HashMap<>();
// if (s.equals((String) map.get("id"))) {
// replaceStandardNameList.add((String) map.get("serial_number"));
// mapTemp.put("title", (String) map.get("serial_number"));
// mapTemp.put("id", (String) map.get("id"));
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listReplaceStandard.add(mapTemp);
// }
// } else {
// boolean flag = isId(s);
// if (!flag && !replaceStandardNameList.contains(s)) {
// replaceStandardNameList.add(s);
// mapTemp.put("title", s);
// mapTemp.put("id", "");
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listReplaceStandard.add(mapTemp);
// }
// }
// }
// }
// } else {
// if (StringUtils.isNotBlank(replaceStandardId)) {
// for (String s : replaceStandardId.split(",")) {
// Map<String, Object> mapTemp = new HashMap<>();
// boolean flag = isId(s);
// if (!flag && !replaceStandardNameList.contains(s)) {
// replaceStandardNameList.add(s);
// mapTemp.put("title", s);
// mapTemp.put("id", "");
// if (ObjectUtils.isNotEmpty(mapTemp)) {
// listReplaceStandard.add(mapTemp);
// }
// }
// }
// }
// }
// //被代替标准
// String replaceStandard = (String) map.get("replace_standard");
// if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
// replacedStandardIdList.add((String) map.get("id"));
// String serialNumber = (String) map.get("serial_number");
// replacedStandardNameList.add(serialNumber);
// stringObjectMap.put("title", (String) map.get("serial_number"));
// stringObjectMap.put("id", (String) map.get("id"));
// if (ObjectUtils.isNotEmpty(stringObjectMap)) {
// listReplacedStandard.add(stringObjectMap);
// }
// }
// }
//
// //区域管理
// OnlCgformArea onlCgformArea = new OnlCgformArea();
// onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
// List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea);
// //字段属性
// List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
//
// //过滤出下拉选
// List<OnlCgformField> onlCgformFieldList = fieldList.stream()
// .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
// || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType()))
// .collect(Collectors.toList());
//
// //过滤出树形字段
// List<OnlCgformField> treeFieldList = fieldList.stream()
// .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
// .collect(Collectors.toList());
//
// //下拉选字段
// List<String> fieldPullList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//
// //数据字典
// List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
//
// //树形数据字典
// List<SysCategory> categoryList = sysCategoryService.list();
// //处理树形数据字典
// dataList.get(0).entrySet().forEach(entry -> {
// //下拉选处理数据字典
// treeDictItem(categoryList, entry, treeFieldList, cut,null);
// });
//
// //下拉单选和下拉多选数据字典处理
// List<OnlCgformField> finalFieldList = fieldList;
// dataList.get(0).entrySet().forEach(entry -> {
// if (fieldPullList.contains(entry.getKey())) {
// //下拉选处理数据字典
// dictItem(sysDictItems, entry, cut, finalFieldList,null);
// }
// });
//
// if (fieldList.size() != 0) {
// //过滤出表单字段(is_show_form-->表单是否显示0否 1是)
// fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
// }
//
// for (OnlCgformArea onlCgformAreaTemp : areaList) {
// String areaName = "";
// if (CutEnum.CN.getValue().equals(cut)) {
// areaName = onlCgformAreaTemp.getShowArea();
// } else {
// areaName = onlCgformAreaTemp.getEnName();
// }
// Map<String, Object> mapTemp = new HashMap<>();
// List<Map<String, Object>> resultTemp = new ArrayList<>();
// List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
// for (OnlCgformField onlCgformField : fieldListTemp) {
// //字段
// String dbFieldName = onlCgformField.getDbFieldName();
// //字段类型
// String fieldShowType = onlCgformField.getFieldShowType();
// String value = "";
// if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) {
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// if (ObjectUtils.isNotEmpty(dataList.get(0).get(dbFieldName))) {
// value = sdf.format(dataList.get(0).get(dbFieldName));
// }
// } else {
// value = String.valueOf(dataList.get(0).get(dbFieldName));
// if("null".equals(value)){
// value = "";
// }
// }
// Map<String, Object> map = new HashMap<>();
// //处理文件
// if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) {
// //处理文本信息和关联信息区域之外的区域中文件类型字段返归结果格式
// if(!"文本信息".equals(onlCgformAreaTemp.getShowArea()) && !"关联信息".equals(onlCgformAreaTemp.getShowArea())){
// List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId(value);
// List<String> fileIdList = fileInfos.stream().map(OSSFile::getId).collect(Collectors.toList());
// Map<String, Object> mapNew = new HashMap<>();
// mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
// mapNew.put("value",fileIdList);
// resultTemp.add(mapNew);
// }else{
// if (StringUtils.isNotBlank(value)) {
// List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId(value);
// //多文件处理
// if (fileInfos.size() > 1) {
// if (fileInfos.size() != 0) {
// int i = 0;
// for (OSSFile fileInfo : fileInfos) {
// if (i == 0) {
// Map<String, Object> mapNew = new HashMap<>();
// mapNew.put("value", fileInfo);
// mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
// mapNew.put("count", fileInfos.size());
// // 添加标准分解单跳转
// List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
// if (CollectionUtil.isNotEmpty(infoEOList)) {
// mapNew.put("splitFlag", 1);
// mapNew.put("splitInfoId", infoEOList.get(0).getId());
// } else{
// mapNew.put("splitFlag", 0);
// }
//
// resultTemp.add(mapNew);
// i++;
// } else {
// Map<String, Object> mapNew = new HashMap<>();
// mapNew.put("value", fileInfo);
// mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
// // 添加标准分解单跳转
// List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId());
// if (CollectionUtil.isNotEmpty(infoEOList)) {
// mapNew.put("splitFlag", 1);
// mapNew.put("splitInfoId", infoEOList.get(0).getId());
// } else{
// mapNew.put("splitFlag", 0);
// }
// resultTemp.add(mapNew);
// }
// }
// }
// } else if (fileInfos.size() == 1) {
// //单个文件处理
// Map<String, Object> mapNew = new HashMap<>();
// mapNew.put("count", fileInfos.size());
// mapNew.put("value", fileInfos.get(0));
// mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
// // 添加标准分解单跳转
// List<SarFileSplitInfoEO> infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId());
// if (CollectionUtil.isNotEmpty(infoEOList)) {
// mapNew.put("splitFlag", 1);
// mapNew.put("splitInfoId", infoEOList.get(0).getId());
// } else{
// mapNew.put("splitFlag", 0);
// }
// resultTemp.add(mapNew);
// }
// } else {
// Map<String, Object> mapNew = new HashMap<>();
// mapNew.put("value", "");
// mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
// resultTemp.add(mapNew);
// }
// }
// } else {
// //处理字段类型为文件之外的字段
// if (dataList.size() != 0) {
// String finalValue = value;
// dataList.get(0).entrySet().forEach(entry -> {
// if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
// if (onlCgformField.getDbFieldName().equals("replace_standard")) {
// //代替标准
// map.put("value", StringUtils.join(replaceStandardNameList, ","));
// map.put("list", listReplaceStandard);
// } else if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
// //被代替标准
// map.put("value", StringUtils.join(replacedStandardNameList, ","));
// map.put("list", listReplacedStandard);
// } else if (onlCgformField.getDbFieldName().equals("corresponding_standard")) {
// //对应标准
// map.put("value", StringUtils.join(correspondingStandardNameList, ","));
// map.put("list", listCorrespondingStandard);
// } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
// map.put("value", finalValue);
// } else {
// map.put("value", entry.getValue());
// }
// }
// });
// }
// mapPut(cut, map, "field_show_type",
// onlCgformField.getFieldShowType(), "dict_field",
// onlCgformField.getDictField(), "db_field_name",
// onlCgformField.getDbFieldName(), "db_field_txt",
// onlCgformField.getDbFieldTxt(), "db_field_en_name",
// onlCgformField.getDbFieldEnName(), "area", areaName, null);
// }
// if (map.size() != 0) {
// resultTemp.add(map);
// }
// }
// if (CutEnum.CN.getValue().equals(cut)) {
// areaName = onlCgformAreaTemp.getShowArea();
// mapTemp.put(areaName, resultTemp);
// } else {
// areaName = onlCgformAreaTemp.getEnName();
// mapTemp.put(areaName, resultTemp);
// }
// result.add(mapTemp);
// }
// return result;
// }
private void mapPut(String cut, Map<String, Object> map, String field_show_type,
String fieldShowType2, String dict_field, String dictField,
@@ -3004,7 +3271,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String condition = getConditionStr(map);
//导出数据(全部导出的数据)
List<Map<String, Object>> datas = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(conditionFieldList, ","), condition);
//处理对应标准,代替标准,被代替标准(由id转中文)
//处理被代替标准(由id转中文)
getStandard(datas);
//部分导出
String partId = (String) map.get("id");
@@ -3113,44 +3380,67 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
datasTemp.add(mapTemp);
}
for (Map<String, Object> data : datas) {
String idTemp = (String) data.get("id");
String correspondingStandard = (String) data.get("corresponding_standard");
String replaceStandard = (String) data.get("replace_standard");
StringBuilder correspondingStandardSb = new StringBuilder();
StringBuilder replaceStandardSb = new StringBuilder();
String idTemp = (String) data.get("serial_number");
StringBuilder replacedStandardSb = new StringBuilder();
datasTemp.forEach(entry -> {
String id = (String) entry.get("id");
String replaceStandardTemp = (String) entry.get("replace_standard");
//对应标准
if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains(id)) {
correspondingStandardSb.append((String) entry.get("serial_number") + ",");
}
//代替标准
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
replaceStandardSb.append((String) entry.get("serial_number") + ",");
}
//被代替标准
if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains(idTemp)) {
replacedStandardSb.append((String) entry.get("serial_number") + ",");
}
});
//对应标准
if (StringUtils.isNotBlank(correspondingStandardSb)) {
String correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
data.put("corresponding_standard", correspondingStandardStr);
}
//代替标准
if (StringUtils.isNotBlank(replaceStandardSb)) {
String replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
data.put("replace_standard", replaceStandardStr);
}
if (StringUtils.isNotBlank(replacedStandardSb)) {
String replacedStandardStr = replacedStandardSb.substring(0, replacedStandardSb.length() - 1);
data.put("replaced_standard", replacedStandardStr);
}
}
}
// private void getStandard(List<Map<String, Object>> datas) {
// List<Map<String, Object>> datasTemp = new ArrayList<>();
// for (Map<String, Object> data : datas) {
// Map<String, Object> mapTemp = new HashMap<>();
// mapCopy(data, mapTemp);
// datasTemp.add(mapTemp);
// }
// for (Map<String, Object> data : datas) {
// String idTemp = (String) data.get("id");
// String correspondingStandard = (String) data.get("corresponding_standard");
// String replaceStandard = (String) data.get("replace_standard");
// StringBuilder correspondingStandardSb = new StringBuilder();
// StringBuilder replaceStandardSb = new StringBuilder();
// StringBuilder replacedStandardSb = new StringBuilder();
// datasTemp.forEach(entry -> {
// String id = (String) entry.get("id");
// String replaceStandardTemp = (String) entry.get("replace_standard");
// //对应标准
// if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains(id)) {
// correspondingStandardSb.append((String) entry.get("serial_number") + ",");
// }
// //代替标准
// if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
// replaceStandardSb.append((String) entry.get("serial_number") + ",");
// }
// //被代替标准
// if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains(idTemp)) {
// replacedStandardSb.append((String) entry.get("serial_number") + ",");
// }
// });
// //对应标准
// if (StringUtils.isNotBlank(correspondingStandardSb)) {
// String correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
// data.put("corresponding_standard", correspondingStandardStr);
// }
// //代替标准
// if (StringUtils.isNotBlank(replaceStandardSb)) {
// String replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
// data.put("replace_standard", replaceStandardStr);
// }
// if (StringUtils.isNotBlank(replacedStandardSb)) {
// String replacedStandardStr = replacedStandardSb.substring(0, replacedStandardSb.length() - 1);
// data.put("replaced_standard", replacedStandardStr);
// }
// }
// }
public void createDatas(Workbook workbook, Sheet sheet, List<Map<String, Object>> datas, String header, List<OnlCgformField> fieldList, String cut) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -4377,28 +4667,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
countError++;
}
//判断库中是否存在,如果存在则存id,如果不存在则存输入的值
List<Map<String, Object>> listBySerialNumber = getListBySerialNumber(value);
String serialNumberStr = "";
StringBuilder sb = new StringBuilder();
List<String> list = new ArrayList<>();
for (Map<String, Object> stringObjectMap : listBySerialNumber) {
sb.append((String) stringObjectMap.get("id") + ",");
list.add((String) stringObjectMap.get("serial_number"));
}
if (StringUtils.isNotBlank(value)) {
for (String s : value.split(",")) {
if (!list.contains(s)) {
sb.append(s);
}
}
}
if (ObjectUtils.isNotEmpty(sb)) {
String substring = sb.toString();
if (substring.endsWith(",") || substring.endsWith("，")){
substring = substring.substring(0, substring.length() - 1);
}
value = substring;
}
// List<Map<String, Object>> listBySerialNumber = getListBySerialNumber(value);
// String serialNumberStr = "";
// StringBuilder sb = new StringBuilder();
// List<String> list = new ArrayList<>();
// for (Map<String, Object> stringObjectMap : listBySerialNumber) {
// sb.append((String) stringObjectMap.get("id") + ",");
// list.add((String) stringObjectMap.get("serial_number"));
// }
// if (StringUtils.isNotBlank(value)) {
// for (String s : value.split(",")) {
// if (!list.contains(s)) {
// sb.append(s);
// }
// }
// }
// if (ObjectUtils.isNotEmpty(sb)) {
// String substring = sb.toString();
// if (substring.endsWith(",") || substring.endsWith("，")){
// substring = substring.substring(0, substring.length() - 1);
// }
// value = substring;
// }
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+8
View File
@@ -274,6 +274,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
wrapperInfo.in(DummyContentChangeEO::getParentId,dummyInventoryBaseEO.getId());
List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo);
if(CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)){
//3.对比基础表数据
//3.1截止到现在发布,期间修改的数据(基础)
//最新的数据为-->dummyInventoryBaseEOList
@@ -410,6 +411,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
}
}
}else{
if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败");
}else{
throw new JeroBootException("The maintenance list is empty, and publishing failed.");
}
}
}
}else{
//撤回,需要发消息
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+14
View File
@@ -7,6 +7,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
import com.jero.modules.project.util.ExcelLangUtils;
import com.jero.modules.system.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -197,4 +198,17 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
Map<String, Object> objectMap = this.projectRelatedPersonnelService.queryPersonByProjectId(projectId, dutyTerritory);
return Result.OK(objectMap);
}
/**
* 通过projectId查询认证工程师
*
* @return
*/
@AutoLog(value = "项目库-相关人员维护表-根据projectId查询认证工程师")
@ApiOperation(value="项目库-相关人员维护表-根据projectId查询认证工程师", notes="项目库-相关人员维护表-根据projectId查询认证工程师")
@GetMapping(value = "/queryCertificationEngineer")
public Result<?> queryCertificationEngineer(@RequestParam(name="projectId",required=true) String projectId){
List<SysUser> certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId);
return Result.OK(certificationEngineerList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+13
View File
@@ -231,4 +231,17 @@ public class ProjectTaskInventoryEO implements Serializable {
/**中英文切换**/
@TableField(exist = false)
private String cut;
/**设计符合性流程-结束前三天发送消息标识0未发 1已发**/
private String designSendMsgFlag;
/**设计符合性流程-结束当天发送消息标识0未发 1已发**/
private String designSendMsgCurrentFlag;
/**prehomo确认流程-结束前三天发送消息标识0未发 1已发**/
private String prehomoSendMsgFlag;
/**prehomo确认流程-结束当天发送消息标识0未发 1已发**/
private String prehomoSendMsgCurrentFlag;
/**验证符合性流程-结束前三天发送消息标识0未发 1已发**/
private String verifySendMsgFlag;
/**验证符合性流程-结束当天发送消息标识0未发 1已发**/
private String verifySendMsgCurrentFlag;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
-2
View File
@@ -10,7 +10,6 @@ import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.system.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -19,7 +18,6 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import com.jero.modules.system.entity.SysUser;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -85,4 +86,5 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory);
List<SysUser> queryCertificationEngineer(String projectId);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+25
View File
@@ -759,4 +759,29 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
updateById(projectRelatedPersonnel);
}
}
@Override
public List<SysUser> queryCertificationEngineer(String projectId) {
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id",projectId));
List<String> certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList());
StringBuilder userIdBuilder=new StringBuilder();
List<SysUser> certificationEngineerUsers = new ArrayList<>();
if(CollectionUtils.isNotEmpty(certificationEngineerList)){
for(String certificationEngineerId :certificationEngineerList){
if(StringUtils.isNotBlank(certificationEngineerId)) {
userIdBuilder.append(certificationEngineerId).append(",");
}
}
String userId = userIdBuilder.substring(0, userIdBuilder.toString().length() - 1);
List userIdList = Arrays.asList(userId.split(","));
userIdList.stream().distinct().collect(Collectors.toList());
QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
userqueryWrapper.in("id ", userIdList);
certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper);
}
return certificationEngineerUsers;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+20 -15
View File
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,24 +62,28 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
projectTaskInventoryDetailEO.setCreateTime(now);
projectTaskInventoryDetailEO.setUpdateTime(now);
List<ProjectTaskInventoryDetailEO> list = new ArrayList<>();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(","));
userIdList.forEach(userId -> {
ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO();
BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO);
taskInventoryDetailEO.setUserId(userId);
list.add(taskInventoryDetailEO);
});
//过滤掉当前操作人。
userIdList = userIdList.stream().distinct().filter(userId-> !org.apache.commons.lang3.StringUtils.equals(userId,currentUser.getId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(userIdList)){
userIdList.forEach(userId -> {
ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO();
BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO);
taskInventoryDetailEO.setUserId(userId);
list.add(taskInventoryDetailEO);
});
//先删后加，确保一个用户只有一个任务。
QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId());
deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
this.baseMapper.delete(deleteWrapper);
//先删后加，确保一个用户只有一个任务。
QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId());
deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
this.baseMapper.delete(deleteWrapper);
super.saveBatch(list);
super.saveBatch(list);
sendMessage(projectTaskInventoryDetailEO,userIdList);
sendMessage(projectTaskInventoryDetailEO,userIdList);
}
}
}
@@ -92,7 +97,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
public void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
Date now = new Date();
projectTaskInventoryDetailEO.setUpdateTime(now);
saveOrUpdate(projectTaskInventoryDetailEO);
this.baseMapper.updateById(projectTaskInventoryDetailEO);
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+6 -6
View File
@@ -547,28 +547,28 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getDesignStatus(), cut);
projectTaskInventoryEO.setDesignStatus(textByValue);
}
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignFlowTaskStatus())){
/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignFlowTaskStatus())){
String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getDesignFlowTaskStatus(), cut);
projectTaskInventoryEO.setDesignFlowTaskStatus(textByValue);
}
}*/
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoStatus())){
String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getPrehomoStatus(), cut);
projectTaskInventoryEO.setPrehomoStatus(textByValue);
}
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoFlowTaskStatus())){
/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoFlowTaskStatus())){
String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getPrehomoFlowTaskStatus(), cut);
projectTaskInventoryEO.setPrehomoFlowTaskStatus(textByValue);
}
}*/
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())){
String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getVerifyStatus(), cut);
projectTaskInventoryEO.setVerifyStatus(textByValue);
}
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){
/*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){
String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getVerifyFlowTaskStatus(), cut);
projectTaskInventoryEO.setVerifyFlowTaskStatus(textByValue);
}
}*/
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
+1 -1
View File
@@ -40,8 +40,8 @@ public class SendMessageUtils {
SendMessageUtils.sysAnnouncementService = sysAnnouncementService;
}
@Autowired
private static IFeishuService iFeishuService;
@Autowired
public void setIFeishuService(IFeishuService iFeishuService){
SendMessageUtils.iFeishuService = iFeishuService;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+4 -4
View File
@@ -108,8 +108,8 @@ public class workFlowController {
@AutoLog(value = "流程实例明细列表")
@ApiOperation(value="流程实例明细列表", notes="流程实例明细列表")
@GetMapping("/get_list_by_instance")
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
}
@AutoLog(value = "获取图片")
@@ -143,8 +143,8 @@ public class workFlowController {
@AutoLog(value = "根据流程实例id查询流程历史")
@ApiOperation(value="根据流程实例id查询流程历史", notes="根据流程实例id查询流程历史")
@GetMapping("/queryProcessHistoryByPrcId")
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu);
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
+2
View File
@@ -47,4 +47,6 @@ public class TaskCommonQuery {
@ApiModelProperty(value = "高级搜索字符串")
private String advanceSearchVOStr;
private String cut;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
+2 -2
View File
@@ -87,7 +87,7 @@ public interface WorkFlowFeignClient {
* @return
*/
@RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET)
List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
/**
* 获取图片
@@ -125,6 +125,6 @@ public interface WorkFlowFeignClient {
* @return
*/
@RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET)
List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
+4 -4
View File
@@ -103,8 +103,8 @@ public class WorkFlowFeignClientImpl{
* @param shunxu
* @return
*/
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
}
/**
@@ -145,7 +145,7 @@ public class WorkFlowFeignClientImpl{
* @param shunxu
* @return
*/
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu);
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
}
}