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

文档拆分条款-bug修改

Browse Source
This commit is contained in:
liyawei
2022-04-02 13:33:26 +08:00
parent 85f25aa800
commit b4059adf00
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java
+1 -1
View File
@@ -57,7 +57,7 @@ public interface IFileSplitItemsEOService extends IService<SarFileSplitItemsEO>
List<Map<String, Object>> getBatchSetForm(String flag, String cut); List<Map<String, Object>> getBatchSetForm(String flag, String cut);
void filterMap(Map<String, Object> map); Map<String, Object> filterMap(Map<String, Object> map);
List<Map<String, Object>> queryByOrdersForExport(String cut, String field, List<String> idList, String infoId); List<Map<String, Object>> queryByOrdersForExport(String cut, String field, List<String> idList, String infoId);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+36 -18
View File
@@ -179,7 +179,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
parameter.remove("itemValEOList"); parameter.remove("itemValEOList");
parameter.remove("delItemIds"); // TODO parameter.remove("delItemIds"); // TODO
filterMap(parameter); parameter = filterMap(parameter);
resultCount = insertInfo(parameter, itemId); resultCount = insertInfo(parameter, itemId);
return resultCount; return resultCount;
} }
@@ -281,7 +281,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
parameter.remove("modify_user"); parameter.remove("modify_user");
parameter.remove("modify_time"); parameter.remove("modify_time");
parameter.remove("sys_org_code"); parameter.remove("sys_org_code");
filterMap(parameter); parameter = filterMap(parameter);
resultCount = insertInfo(parameter, itemId); resultCount = insertInfo(parameter, itemId);
} else { } else {
// SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO(); // SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO();
@@ -298,7 +298,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
parameter.remove("modify_user"); parameter.remove("modify_user");
parameter.remove("modify_time"); parameter.remove("modify_time");
parameter.remove("sys_org_code"); parameter.remove("sys_org_code");
filterMap(parameter); parameter = filterMap(parameter);
resultCount = insertInfo(parameter, itemId); resultCount = insertInfo(parameter, itemId);
// 删除val表全部信息 // 删除val表全部信息
sarFileSplitItemsValEOMapper.deleteByitemId(itemId); sarFileSplitItemsValEOMapper.deleteByitemId(itemId);
@@ -334,6 +334,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
//处理日期格式 //处理日期格式
if (fieldDateList.contains(key) && ("creation_time".equals(key) || "modify_time".equals(key))) { if (fieldDateList.contains(key) && ("creation_time".equals(key) || "modify_time".equals(key))) {
if (ObjectUtils.isNotEmpty(value)) { if (ObjectUtils.isNotEmpty(value)) {
if(value.toString().equals("") || value.toString().equals("null")){
continue;
}
value = "str_to_date('" + value + "','%Y-%m-%d')"; value = "str_to_date('" + value + "','%Y-%m-%d')";
} else { } else {
value = null; value = null;
@@ -359,10 +362,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
} else if(fieldPersonList.contains(key)){ } else if(fieldPersonList.contains(key)){
// 人员选择类型 // 人员选择类型
value = parameter.get(key+"_id"); if(ObjectUtil.isNotNull(parameter.get(key+"_id"))) {
value = parameter.get(key + "_id");
}
valuesBuilder.append("," + "'" + value + "'"); valuesBuilder.append("," + "'" + value + "'");
} else if(fieldPersonIdList.contains(key)){ } else if(fieldPersonIdList.contains(key)){
continue; continue;
} else { } else {
@@ -627,7 +630,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
itemsMap.remove("modify_user"); itemsMap.remove("modify_user");
itemsMap.remove("modify_time"); itemsMap.remove("modify_time");
itemsMap.remove("sys_org_code"); itemsMap.remove("sys_org_code");
filterMap(itemsMap); itemsMap = filterMap(itemsMap);
result += insertInfo(itemsMap, newItemId); result += insertInfo(itemsMap, newItemId);
// 添加条目 // 添加条目
@@ -694,7 +697,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
newItemMap.put(dbFieldName, conditionSb.toString()); newItemMap.put(dbFieldName, conditionSb.toString());
} else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType) } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
|| FieldTypeEnum.PULL_MORE.getValue().equals(fieldType) || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
|| FieldTypeEnum.TREE.getValue().equals(fieldType)) { || FieldTypeEnum.TREE.getValue().equals(fieldType)
|| FieldTypeEnum.PERSON.getValue().equals(fieldType)) {
StringBuilder con = new StringBuilder(); StringBuilder con = new StringBuilder();
// 去重合并内容 // 去重合并内容
oldItemMapList.forEach(item -> { oldItemMapList.forEach(item -> {
@@ -708,13 +712,25 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
conditionSb.append(StringUtils.join(conditionList, ",")); conditionSb.append(StringUtils.join(conditionList, ","));
} }
newItemMap.put(dbFieldName, conditionSb.toString()); newItemMap.put(dbFieldName, conditionSb.toString());
} else if(FieldTypeEnum.FILE.getValue().equals(fieldType)){
} else if(FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)){
Double num = null;
for(Map<String, Object> oldItemMap : oldItemMapList){
num = num + (Double)oldItemMap.get(dbFieldName); //累加数字
}
}else if(FieldTypeEnum.STANDARD.getValue().equals(fieldType)){
}else if(FieldTypeEnum.TEXT_LINK.getValue().equals(fieldType)){
} }
} }
// 删除合并前的条款及目录 // 删除合并前的条款
dao.deleteByItemsIdList(oldItemIdList); dao.deleteByItemsIdList(oldItemIdList); // 条款
// TODO 同一目录下有多个条款时 如何处理
sarFileSplitMenuEOMapper.deleteByIdList(oldMenuIdList); //同一目录下有多个条款时 如何处理？
// sarFileSplitMenuEOMapper.deleteByIdList(oldMenuIdList);
// 添加合并后的条款及目录 （新条款和新目录的id为第一条的） // 添加合并后的条款及目录 （新条款和新目录的id为第一条的）
newItemMap.remove("id"); newItemMap.remove("id");
newItemMap.remove("creation_user"); newItemMap.remove("creation_user");
@@ -722,9 +738,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
newItemMap.remove("modify_user"); newItemMap.remove("modify_user");
newItemMap.remove("modify_time"); newItemMap.remove("modify_time");
newItemMap.remove("sys_org_code"); newItemMap.remove("sys_org_code");
filterMap(newItemMap); newItemMap = filterMap(newItemMap);
insertInfo(newItemMap, newItemId); insertInfo(newItemMap, newItemId);
sarFileSplitMenuEOMapper.insertSelective(newMenuEO); // sarFileSplitMenuEOMapper.insertSelective(newMenuEO);
// 修改条目 关联的条款id和顺序 // 修改条目 关联的条款id和顺序
List<SarFileSplitItemsValEO> oldItemsValList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList); List<SarFileSplitItemsValEO> oldItemsValList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList);
List<SarFileSplitItemsValEO> newItemsValList = new ArrayList<>(); List<SarFileSplitItemsValEO> newItemsValList = new ArrayList<>();
@@ -771,7 +787,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
newItemMap.remove("modify_user"); newItemMap.remove("modify_user");
newItemMap.remove("modify_time"); newItemMap.remove("modify_time");
newItemMap.remove("sys_org_code"); newItemMap.remove("sys_org_code");
filterMap(newItemMap); newItemMap = filterMap(newItemMap);
insertInfo(newItemMap, itemId); insertInfo(newItemMap, itemId);
resultCount ++; resultCount ++;
} }
@@ -1710,7 +1726,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
valContent += "<p>" + valEO.getItemContent() + "</p>"; valContent += "<p>" + valEO.getItemContent() + "</p>";
} else if ("IMG".equals(valEO.getType())) { } else if ("IMG".equals(valEO.getType())) {
valContent += "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">"; valContent += "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">";
valContent += valEO.getItemContent(); // valContent += valEO.getItemContent();
} else if ("TABLE".equals(valEO.getType())) { } else if ("TABLE".equals(valEO.getType())) {
valContent += valEO.getItemContent(); valContent += valEO.getItemContent();
} }
@@ -2207,12 +2223,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
* @param map * @param map
*/ */
@Override @Override
public void filterMap(Map<String, Object> map){ public Map<String, Object> filterMap(Map<String, Object> map){
Map<String, Object> newMap = new HashMap<>(map);
for(Map.Entry<String, Object> entity : map.entrySet()){ for(Map.Entry<String, Object> entity : map.entrySet()){
if(ObjectUtils.isEmpty(entity.getValue())){ if(ObjectUtils.isEmpty(entity.getValue())){
entity.setValue(""); newMap.remove(entity.getKey());
} }
} }
return newMap;
} }
public List<Map<String, Object>> queryByOrdersForExport(String cut, String field, List<String> idList, String infoId){ public List<Map<String, Object>> queryByOrdersForExport(String cut, String field, List<String> idList, String infoId){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+1 -1
View File
@@ -421,7 +421,7 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
itemsMap.remove("modify_user"); itemsMap.remove("modify_user");
itemsMap.remove("modify_time"); itemsMap.remove("modify_time");
itemsMap.remove("sys_org_code"); itemsMap.remove("sys_org_code");
fileSplitItemsEOService.filterMap(itemsMap); itemsMap = fileSplitItemsEOService.filterMap(itemsMap);
result += fileSplitItemsEOService.insertInfo(itemsMap, newItemId); result += fileSplitItemsEOService.insertInfo(itemsMap, newItemId);
// SAR_FILE_ITEMS_VAL 添加数据， // SAR_FILE_ITEMS_VAL 添加数据，