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-26 17:05:11 +08:00
parent 4b1d2fca5c cbcba93bbb
commit 70a0649bf1
58 changed files with 1319 additions and 170 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
+37
View File
@@ -725,17 +725,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
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<OnlCgformField> onlCgformFieldPersonList = fieldList.stream().filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> personList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
List<String> dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//通过id查询数据
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
//多选日期
List<String> userNameList = new ArrayList<>();
for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
String key = entry.getKey();
if(personList.contains(key)){
String value = (String) entry.getValue();
userNameList.addAll(Arrays.asList(value.split(",")));
}
if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){
String value = (String) entry.getValue();
entry.setValue(Arrays.asList(value.split(",")));
}
}
List<SysUser> userList = new ArrayList<>();
if(userNameList.size() != 0){
LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysUser::getUsername,userNameList);
userList = sysUserService.list(wrapper);
}
//查询所有
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
@@ -750,6 +764,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
List<String> personKeyList = new ArrayList<>();
for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
if(treeList.contains(entry.getKey())){
String value = (String) entry.getValue();
@@ -759,6 +774,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
dataList.get(0).put(entry.getKey(), null);
}
}
if(personList.contains(entry.getKey())){
if(StringUtils.isNotBlank((String)entry.getValue())){
personKeyList.add(entry.getKey());
}
}
}
//标准选择字段,添加id(用于回显)
if(personKeyList.size() != 0){
for (String personKey : personKeyList) {
String value = (String)dataList.get(0).get(personKey);
List<SysUser> users = new ArrayList<>();
if(userList.size() != 0 && StringUtils.isNotBlank(value)){
for (String s : value.split(",")) {
List<SysUser> sysUserList = userList.stream().filter(e -> e.getUsername().equals(s)).collect(Collectors.toList());
users.addAll(sysUserList);
}
if(users.size() != 0){
List<String> userIdList = users.stream().map(SysUser::getId).collect(Collectors.toList());
dataList.get(0).put(personKey + "_id",StringUtils.join(userIdList,","));
}
}
}
}
return dataList;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java
+6 -6
View File
@@ -186,13 +186,13 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "design-Initiator", width = 15,dicCode ="fa1_qi3_ren2")
@Excel(name = "design-Initiator", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "design-Assignee", width = 15,dicCode ="ze2_ren4_ren2")
@Excel(name = "design-Assignee", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
@@ -213,13 +213,13 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String prehomoDeliverableTemplateName;
/**prehomo确认-发起人*/
@Excel(name = "Prehomo-Initiator", width = 15,dicCode ="fa1_qi3_ren2")
@Excel(name = "Prehomo-Initiator", width = 15)
@ApiModelProperty(value = "prehomo确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String prehomoInitiator;
/**prehomo确认-责任人*/
@Excel(name = "Prehomo-Assignee", width = 15,dicCode ="ze2_ren4_ren2")
@Excel(name = "Prehomo-Assignee", width = 15)
@ApiModelProperty(value = "prehomo确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String prehomoDuty;
@@ -240,13 +240,13 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "verify-Initiator", width = 15,dicCode ="fa1_qi3_ren2")
@Excel(name = "verify-Initiator", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-责任人*/
@Excel(name = "verify-Assignee", width = 15,dicCode ="ze2_ren4_ren2")
@Excel(name = "verify-Assignee", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+2 -2
View File
@@ -174,7 +174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//订阅标识
List<String> ids = records.stream().map(DummyInventoryBaseEO::getId).collect(Collectors.toList());
LambdaQueryWrapper<DummyReadEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids);
wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids).in(DummyReadEO::getCreateBy,sysUser.getUsername());
List<DummyReadEO> dummyReadEOS = iDummyReadEOService.list(wrapper);
List<String> dummyReadIdList = dummyReadEOS.stream().map(DummyReadEO::getDummyInventoryBaseId).collect(Collectors.toList());
for (DummyInventoryBaseEO record : pageList.getRecords()) {
@@ -685,7 +685,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//封装消息的实体类
SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
bussDocumentLibraryEOService.sendWebsocket(idTemp, idTemp);
bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
//飞书
try {
iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), href);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+72 -29
View File
@@ -148,7 +148,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String serialNumber = list.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
String contentLog = username+"向清单中添加了标准\""+serialNumber+"\"";
String contentLog = username+"向清单中添加了标准“"+serialNumber+"”";
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId());
}
}
@@ -167,7 +167,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"编辑了清单中的\"" + dummyInventoryInfoEO.getSerialNumber() + "\"标准:";
String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:";
List<DummyInventoryInfoEO> infoEOList = new ArrayList<>();
infoEOList.add(dummyInventoryInfoEO);
//查询数据库里原来的数据
@@ -234,7 +234,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String username = sysUser.getUsername();
String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准";
String contentLog = username+"删除了清单中的“"+serialNumber+"”标准";
dummyLogEOService.updateLog(contentLog, projectId);
}
@@ -258,7 +258,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
// queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
queryWrapper.orderByDesc("create_time");
queryWrapper.orderByDesc("create_time","serial_number");
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
//技术领域处理
@@ -287,7 +287,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String username = sysUser.getUsername();
String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
String contentLog = username+"复制了\""+serialNumber+"\"";
String contentLog = username+"复制了“"+serialNumber+"”";
dummyLogEOService.updateLog(contentLog, projectId);
}
}
@@ -303,7 +303,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"批量设置了";
String contentLog = username+"批量设置了“";
StringBuilder contentLogBuilder = new StringBuilder(contentLog);
//根据id查询数据库中完整信息,翻译
@@ -423,6 +423,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
this.updateBatchById(dummyInventoryInfoEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
contentLog += "”";
dummyLogEOService.updateLog(contentLog, projectId);
}
}
@@ -1193,7 +1194,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"向清单中导入了\""+serialNumber+"\"标准";
String contentLog = username+"向清单中导入了“"+serialNumber+"”标准";
dummyLogEOService.updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId());
}
}
@@ -1538,7 +1539,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//文件
List<OSSFile> fileInfos = getOssFiles(dataList);
//数据转换(文件名称,技术领域,对应标准)
//数据转换(文件名称,技术领域,对应标准,发起人,责任人)
dataTransition(dataList, fileInfos,dummyInventoryInfoEO);
OutputStream os = null;
@@ -1713,6 +1714,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
private void dataTransition(List<DummyInventoryInfoEO> dataList, List<OSSFile> fileInfos,DummyInventoryInfoEO dummyInventoryInfoEO) {
//技术领域
List<SysCategory> sysCategoryList = sysCategoryService.list();
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
List<SysDictItem> sysDictItemInitiator = dictItemList.stream().filter(e -> "fa1_qi3_ren2".equals(e.getDictCode())).collect(Collectors.toList());
List<SysDictItem> sysDictItemDuty = dictItemList.stream().filter(e -> "ze2_ren4_ren2".equals(e.getDictCode())).collect(Collectors.toList());
//文档库数据
List<String> correspondingStandardIdList = new ArrayList<>();
for (DummyInventoryInfoEO inventoryInfoEO : dataList) {
@@ -1721,33 +1727,49 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
correspondingStandardIdList.addAll(Arrays.asList(correspondingStandard.split(",")));
}
}
// LambdaQueryWrapper<BussDocumentLibraryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardIdList);
// List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(lambdaQueryWrapper);
for (DummyInventoryInfoEO inventoryInfoEO : dataList) {
String correspondingStandard = inventoryInfoEO.getCorrespondingStandard();
String technologyTerritory = inventoryInfoEO.getTechnologyTerritory();
String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate();
String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate();
String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate();
//对应标准
// if(StringUtils.isNotBlank(correspondingStandard)){
// StringBuilder sb = new StringBuilder();
// for (String s : correspondingStandard.split(",")) {
// List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
// .filter(e -> s.equals(e.getId())).collect(Collectors.toList());
// if(collect.size() != 0){
// sb.append(collect.get(0).getSerialNumber() + ",");
// }else{
// sb.append(s + ",");
// }
// }
// if(StringUtils.isNotBlank(sb)){
// String substring = sb.substring(0, sb.length() - 1);
// inventoryInfoEO.setCorrespondingStandard(substring);
// }
// }
//技术的发起人,责任人
String designInitiator = inventoryInfoEO.getDesignInitiator();
String designInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, designInitiator);
if(StringUtils.isNotBlank(designInitiatorPerson)){
inventoryInfoEO.setDesignInitiator(designInitiatorPerson);
}
String designDuty = inventoryInfoEO.getDesignDuty();
String designDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, designDuty);
if(StringUtils.isNotBlank(designDutyPerson)){
inventoryInfoEO.setDesignDuty(designDutyPerson);
}
//pre的发起人,责任人
String prehomoInitiator = inventoryInfoEO.getPrehomoInitiator();
String prehomoInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, prehomoInitiator);
if(StringUtils.isNotBlank(prehomoInitiatorPerson)){
inventoryInfoEO.setPrehomoInitiator(prehomoInitiatorPerson);
}
String prehomoDuty = inventoryInfoEO.getPrehomoDuty();
String prehomoDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, prehomoDuty);
if(StringUtils.isNotBlank(prehomoDutyPerson)){
inventoryInfoEO.setPrehomoDuty(prehomoDutyPerson);
}
//验证的发起人,责任人
String verifyInitiator = inventoryInfoEO.getVerifyInitiator();
String verifyInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, verifyInitiator);
if(StringUtils.isNotBlank(verifyInitiatorPerson)){
inventoryInfoEO.setVerifyInitiator(verifyInitiatorPerson);
}
String verifyDuty = inventoryInfoEO.getVerifyDuty();
String verifyDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, verifyDuty);
if(StringUtils.isNotBlank(verifyDutyPerson)){
inventoryInfoEO.setVerifyDuty(verifyDutyPerson);
}
//技术领域
if(StringUtils.isNotBlank(technologyTerritory)){
StringBuilder sb = new StringBuilder();
@@ -1786,6 +1808,27 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
}
}
private String getPerson(DummyInventoryInfoEO dummyInventoryInfoEO, List<SysDictItem> sysDictItemList, String designInitiator) {
if(StringUtils.isNotBlank(designInitiator)){
StringBuilder sb = new StringBuilder();
for (String s : designInitiator.split(",")) {
List<SysDictItem> itemList = sysDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList());
if(itemList.size() != 0){
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
sb.append(itemList.get(0).getItemText()+",");
}else{
sb.append(itemList.get(0).getEnName()+",");
}
}
if(StringUtils.isNotBlank(sb)){
String substring = sb.substring(0, sb.length() - 1);
return substring;
}
}
}
return null;
}
/**
* 模板名称转换
* @param fileInfos
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
LambdaQueryWrapper<HomeFunctionModuleEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort);
List<HomeFunctionModuleEO> homeFunctionModuleEOS = this.list(wrapperTemp);
if(homeFunctionModuleEOList.size() == 0){
if(homeFunctionModuleEOS.size() == 0){
if(CutEnum.EN.getValue().equals(cut)){
for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) {
homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+3 -1
View File
@@ -1473,7 +1473,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//翻译传入的数据
List<ProjectLawsInventoryEO> inputList = new ArrayList<>();
inputList.add(projectLawsInventoryEO);
ProjectLawsInventoryEO projectLawsInventoryEONew = new ProjectLawsInventoryEO();
BeanUtils.copyProperties(projectLawsInventoryEO,projectLawsInventoryEONew);
inputList.add(projectLawsInventoryEONew);
translateData(inputList);
ProjectLawsInventoryEO inputInfoEO = inputList.get(0);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+1 -1
View File
@@ -259,7 +259,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = languageSwitchService.getHeader(flag, cut);
List<Map<String, Object>> list = fileSplitItemsEOService.getHeader(flag, cut);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
+1 -1
View File
@@ -243,7 +243,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@RequiresPermissions("split:sarFileSplitInfo:page")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = languageSwitchService.getHeader(flag, cut);
List<Map<String, Object>> list = sarFileSplitInfoService.getHeader(flag, cut);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java
+2
View File
@@ -81,4 +81,6 @@ public interface IFileSplitItemsEOService extends IService<SarFileSplitItemsEO>
String getFieldForExport();
int insertForeach(List<SarFileSplitItemsEO> messageList); // 拆分已入库文件专用
List<Map<String, Object>> getHeader(String flag, String cut);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java
+4
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.split.entity.SarFileSplitInfoEO;
import java.util.List;
import java.util.Map;
/**
* @Description: 文档拆分表
@@ -65,4 +66,7 @@ public interface ISarFileSplitInfoService extends IService<SarFileSplitInfoEO> {
boolean bindToDocumentLibrary(String id, String connectId, String fileName);
void dataProcessing(String cut, List<SarFileSplitInfoEO> sarFileSplitInfoEOList);
List<Map<String, Object>> getHeader(String flag, String cut);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+44
View File
@@ -23,6 +23,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.ocr.util.UUIDUtils;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -3574,4 +3575,47 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
return dao.insertForeach(messageList);
}
/**
* 列表表头中英文切换
*
* @return
*/
@Override
public List<Map<String, Object>> getHeader(String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
if (fieldList.size() != 0) {
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
}
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();
if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){
map.put("urlClick","true");
}
if("file_name".equals(onlCgformField.getDbFieldName())
|| "iterms_conditions".equals(onlCgformField.getDbFieldName())){
//跳转详情的标识
map.put("click","true");
}
//日期添加排序标识
if ("create_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识
}
if ("update_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识
}
String dbFieldName = onlCgformField.getDbFieldName();
map.put("db_field_name", dbFieldName);
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
}else{
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
}
list.add(map);
}
return list;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+48
View File
@@ -10,6 +10,8 @@ import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.split.entity.SarFileSplitInfoEO;
@@ -263,4 +265,50 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
}
}
}
/**
* 列表表头中英文切换
*
* @return
*/
@Override
public List<Map<String, Object>> getHeader(String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
if (fieldList.size() != 0) {
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
}
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();
if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){
map.put("urlClick","true");
}
if("file_name".equals(onlCgformField.getDbFieldName())
|| "serial_number".equals(onlCgformField.getDbFieldName())
|| "title".equals(onlCgformField.getDbFieldName())){
//跳转详情的标识
map.put("click","true");
}
//日期添加排序标识
if ("create_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识
}
if ("update_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识
}
String dbFieldName = onlCgformField.getDbFieldName();
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
}else{
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
}
list.add(map);
}
return list;
}
}