ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf(文档拆分): 完善列表页数据

Browse Source
This commit is contained in:
yjz
2023-10-12 14:38:02 +08:00
parent 9bca6e2a69
commit 98f37dcbdc
2 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+1 -2
View File
@@ -77,7 +77,7 @@ public class SarFileSplitInfoEO implements Serializable {
/**文本状态*/
@Excel(name = "文本状态", width = 15, dicCode = "file_type")
// @Dict(dicCode = "file_type")
@Dict(dicCode = "file_type")
@ApiModelProperty(value = "文本状态")
private String fileType;
@@ -95,7 +95,6 @@ public class SarFileSplitInfoEO implements Serializable {
/**编辑人*/
@Excel(name = "编辑人", width = 15)
@ApiModelProperty(value = "编辑人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String author;
/**拆分结果*/
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+7 -26
View File
@@ -34,8 +34,10 @@ import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
import com.jero.modules.split.vo.SplitFilePageInfoParam;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysDictItemService;
import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +83,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
@Autowired
private ISysDictService sysDictService;
@Autowired
private ISysUserService sysUserService;
/**
@@ -263,33 +267,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
// 处理数据中所有下拉字典值
for (SarFileSplitInfoEO splitInfoEO : sarFileSplitInfoEOList){
String fileType = null;
OnlCgformField fileTypeField = onlCgformFieldService.queryById(splitInfoEO.getFileType());
if (ObjectUtil.isNotEmpty(fileTypeField)) {
if (LanguageEnum.CN.getValue().equals(cut)) {
fileType = fileTypeField.getDbFieldTxt();
} else {
fileType = fileTypeField.getDbFieldEnName();
}
}
// if (LanguageEnum.CN.getValue().equals(cut)) {
// Map<String, String> cnMap = dictItemListAll.stream()
// .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
// .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
// splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult()));
// } else {
// Map<String, String> enMap = dictItemListAll.stream()
// .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
// .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
// splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
// }
splitInfoEO.setFileType(fileType);
SysUser sysUser = sysUserService.getById(splitInfoEO.getAuthor());
splitInfoEO.setAuthor(sysUser.calcNameWorkNo());
splitInfoEO.setFileType(sysDictService.queryDictTextByKey("process_manuscript", splitInfoEO.getFileType()));
// 处理文档库id字段 根据编号和标题查询
// List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
// if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
// splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString());
// }
if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {
splitInfoEO.setFlag("1");
}else{