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:
wangzhijiang
2022-05-10 18:02:11 +08:00
parent c410979e85 eb63d96c96
commit 85daf53a16
3 changed files with 186 additions and 105 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
+126 -83
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;
// }
/**
* 详情数据查询
jero-web/src/components/CollectionType/index.vue
+59 -21
View File
@@ -3,43 +3,78 @@
<div class='box'>
<!-- 纯文本-->
<div v-if='detailDate.controlType === "1"'>
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.nioNumber"
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
<div v-for='(item,index) in detailDate.list' :key='index'>
<div v-if='item.type==="text"'>
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.nioNumber"
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
</div>
</div>
</div>
<!-- 纯下拉单选-->
<div v-if='detailDate.controlType === "2"'>
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
<a-select-option v-for="(item, key) in detailDate.list" :key="key" :value="item.value">
<div v-for='(item,index) in detailDate.list' :key='index'>
<div v-if='item.type === "pull"'>
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
<a-select-option v-for="(item, key) in item.list" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.nioNumber"
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
</a-select-option>
</a-select>
</div>
</div>
</div>
<!-- 纯下拉多选-->
<div v-if='detailDate.controlType === "3"'>22</div>
<div v-if='detailDate.controlType === "3"'>
</div>
<!-- 纯附件-->
<div v-if='detailDate.controlType === "4"'>22</div>
<div v-if='detailDate.controlType === "4"'>
</div>
<!-- 文本+下拉单选-->
<div v-if='detailDate.controlType === "5"'>22</div>
<div v-if='detailDate.controlType === "5"'>
</div>
<!-- 文本+下拉多选-->
<div v-if='detailDate.controlType === "6"'>22</div>
<div v-if='detailDate.controlType === "6"'>
</div>
<!-- 文本+附件-->
<div v-if='detailDate.controlType === "7"'>22</div>
<div v-if='detailDate.controlType === "7"'>
</div>
<!-- 下拉单选+附件-->
<div v-if='detailDate.controlType === "8"'>22</div>
<div v-if='detailDate.controlType === "8"'>
</div>
<!-- 下拉多选+附件-->
<div v-if='detailDate.controlType === "9"'>22</div>
<div v-if='detailDate.controlType === "9"'>
</div>
<!-- 文本+下拉单选+附件-->
<div v-if='detailDate.controlType === "10"'>22</div>
<div v-if='detailDate.controlType === "10"' style='display: flex'>
<div v-for='(item,index) in detailDate.list' :key='index'>
<div v-if='item.type==="pull"'>
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
</div>
<div v-if='item.type==="text"'>
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.nioNumber"
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
</div>
</div>
</div>
</div>
<!-- {{ detailDate.controlType }}-->
</div>
</template>
@@ -67,6 +102,9 @@ export default {
},
watch: {
detailDate(newold,oldold) {
console.log(newold,oldold,'ll')
}
}
}
</script>
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -27,7 +27,7 @@
</a>
</span>
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='record' />
<collection-type :detailDate='text' />
</span>
</a-table>
</div>