yzj
/
RK-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增图书，人事档案

master
彭皓 3 years ago
parent
cf46ce653a
commit
1fe6bed0a0
6 changed files with 347 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-archives/src/main/java/com/ruoyi/archives/domain/CategoryDict.java
  2. 31
      ruoyi-archives/src/main/java/com/ruoyi/archives/domain/importdata/BookArchivesModel.java
  3. 32
      ruoyi-archives/src/main/java/com/ruoyi/archives/domain/importdata/PersonnelArchivesModel.java
  4. 35
      ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
  5. 248
      ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
  6. 10
      ruoyi-archives/src/main/java/com/ruoyi/archives/util/NumberGenUtil.java

2
ruoyi-archives/src/main/java/com/ruoyi/archives/domain/CategoryDict.java
Unescape View File

@ -23,5 +23,7 @@ public class CategoryDict { @@ -23,5 +23,7 @@ public class CategoryDict {
public static final String JYDA_RECORD="JYDA";//机要文件
public static final String DAYJJL_RECORD="DAYJJL";//档案移交记录库
public static final String NJ_RECORD="NJ";//年鉴档案
public static final String RS_RECORD="RS";//人事档案
public static final String TS_RECORD="TS";//图书档案
}

31
ruoyi-archives/src/main/java/com/ruoyi/archives/domain/importdata/BookArchivesModel.java
Unescape View File

@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
package com.ruoyi.archives.domain.importdata;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.metadata.BaseRowModel;
import lombok.Data;
/**
* 图书档案
*/
@Data
public class BookArchivesModel extends BaseRowModel {
@ExcelProperty(index = 0,value = "档号")
private String fileNum;
@ExcelProperty(index = 1,value = "题名")
private String boxName;
@ExcelProperty(index = 2,value = "作者")
private String ownerName;
@ExcelProperty(index = 3,value = "出版社")
private String issuingUnit;;
@ExcelProperty(index = 4,value = "出版时间")
private String descriptionTime;
// @ExcelProperty(index = 5,value = "图书类别")
// private String archiveScope;
@ExcelProperty(index = 5,value = "图书载体")
public String type;
@ExcelProperty(index = 6, value = "年度")
private String year;
@ExcelProperty(index = 7, value = "册/套")
private String number;
}

32
ruoyi-archives/src/main/java/com/ruoyi/archives/domain/importdata/PersonnelArchivesModel.java
Unescape View File

@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
package com.ruoyi.archives.domain.importdata;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.metadata.BaseRowModel;
import lombok.Data;
import java.util.Date;
/**
* 人事档案
*/
@Data
public class PersonnelArchivesModel extends BaseRowModel {
@ExcelProperty(index = 0,value = "档号")
private String fileNum;
@ExcelProperty(index = 1,value = "文号")
private String received_number;
@ExcelProperty(index = 2,value = "题名")
private String boxName;
@ExcelProperty(index = 3,value = "归档时间")
private String archive_date;;
@ExcelProperty(index = 4,value = "备注")
private String remark;
@ExcelProperty(index = 5,value = "密级")
private String secretLevel;
@ExcelProperty(index = 6,value = "保管期限")
public String storageTime;
@ExcelProperty(index = 7, value = "年度")
private String year;
}

35
ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
Unescape View File

@ -16,19 +16,19 @@ import com.ruoyi.archives.service.IArchiveCategoryInfoService; @@ -16,19 +16,19 @@ import com.ruoyi.archives.service.IArchiveCategoryInfoService;
/**
* 类目管理Service业务层处理
*
*
* @author ruoyi
* @date 2021-03-20
*/
@Service
public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoService
public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoService
{
@Autowired
private ArchiveCategoryInfoMapper archiveCategoryInfoMapper;
/**
* 查询类目管理
*
*
* @param id 类目管理ID
* @return 类目管理
*/
@ -40,7 +40,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -40,7 +40,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
/**
* 查询类目管理列表
*
*
* @param archiveCategoryInfo 类目管理
* @return 类目管理
*/
@ -52,7 +52,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -52,7 +52,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
/**
* 新增类目管理
*
*
* @param archiveCategoryInfo 类目管理
* @return 结果
*/
@ -67,7 +67,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -67,7 +67,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
/**
* 修改类目管理
*
*
* @param archiveCategoryInfo 类目管理
* @return 结果
*/
@ -80,7 +80,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -80,7 +80,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
/**
* 批量删除类目管理
*
*
* @param ids 需要删除的类目管理ID
* @return 结果
*/
@ -92,7 +92,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -92,7 +92,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
/**
* 删除类目管理信息
*
*
* @param id 类目管理ID
* @return 结果
*/
@ -125,7 +125,24 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -125,7 +125,24 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
son.setName(record.getFileNum()+"-"+record.getProject_name());
result.add(son);
});
}else{
}else
// if (CategoryDict.TS_RECORD.equals(item.getCode())){
// Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
// while(it.hasNext()){
// ArchiveRecordInfo next = it.next();
// if(next.getArchiveCategory().equals(item.getCode())&&next.getYear()!=null){
// ArchiveCategoryInfo son=new ArchiveCategoryInfo();
// son.setParentId(item.getId());
// son.setCode(item.getCode()+"-"+next.getYear());
// son.setId(new Random().nextLong()+100000L);
// son.setSort(1l);
// son.setName(next.getArchiveScope().toString());
// it.remove();//相同则添加，添加后删除
// result.add(son);
// }
// }
// } else
{
Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
while(it.hasNext()){
ArchiveRecordInfo next = it.next();

248
ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
Unescape View File

@ -37,6 +37,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -37,6 +37,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import java.awt.print.Book;
import java.io.*;
import java.lang.reflect.Field;
@ -94,6 +95,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -94,6 +95,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
private static String SX_FILE_NUM_EXAMPLE="^SX[0-9]{4}-\\w+-[0-9]+-[0-9]+";
private static String HT_FILE_NUM_EXAMPLE="^HTZ[0-9]{4}-\\w+-[0-9]+";
private static String HTY_FILE_NUM_EXAMPLE="^HTY[0-9]{4}-\\w+-[0-9]+";
private static String RS_FILE_NUM_EXAMPLE="^RS-\\w+-[0-9]+";
private static String TS_FILE_NUM_EXAMPLE="^TS+-[0-9]+-[0-9]+";
private static SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyyMMdd");
private static final String RECORD_TYPE="record";
private static final String FILE_TYPE="file";
@ -139,6 +142,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -139,6 +142,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
}else if (CategoryDict.DAYJJL_RECORD.equals(type)){
// 档案移交记录库
dayjArchivesModelExcelImport(file,type);
}else if (CategoryDict.RS_RECORD.equals(type)){
//人事档案
rsArchivesModelExcelImport(file,type);
}else if (CategoryDict.TS_RECORD.equals(type)){
//图书档案
tsArchivesModelExcelImport(file,type);
}else{
// 年鉴档案
njArchivesModelExcelImport(file,type);
@ -217,7 +226,13 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -217,7 +226,13 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
} else if (CategoryDict.DAYJJL_RECORD.equals(type)) {
// 档案移交记录库
key = archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear();
} else {
} else if(CategoryDict.RS_RECORD.equals(type)){
//人事档案
key = CategoryDict.RS_RECORD.toUpperCase()+"-"+archiveRecordInfo.getStorageTime();
} else if (CategoryDict.TS_RECORD.equals(type)){
//图书档案
key = CategoryDict.TS_RECORD.toUpperCase()+"-"+archiveRecordInfo.getRecordType();
}else{
// 年鉴档案
key = archiveRecordInfo.getArchiveCategory().toUpperCase();
}
@ -229,6 +244,235 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -229,6 +244,235 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
}
numberGenUtil.removeKey(archiveRecordInfo.getId().toString());//arId
}
/*
图书档案
*/
private void tsArchivesModelExcelImport(MultipartFile file, String type) throws Exception {
List<BookArchivesModel> archivesModels = ExcelUtil.readExcel(file, BookArchivesModel.class, 1, 2);
if (archivesModels==null||archivesModels.size()<=0){
throw new RuntimeException("["+file.getOriginalFilename()+"]导入数据为空,请检查后提交");
}
//去重
archivesModels=archivesModels.stream().distinct().collect(Collectors.toList());
ArrayList<ArchiveRecordInfo> list = new ArrayList<>(archivesModels.size());
for (int i = 0; i < archivesModels.size(); i++) {
BookArchivesModel item = archivesModels.get(i);
// 验证数据完整性
if ( StringUtils.isEmpty(item.getFileNum())||
StringUtils.isEmpty(item.getBoxName())){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]数据填写不完整,请检查[档号,案卷题名]是否填写完整");
}
//校验数据
String fileNum =item.getFileNum().trim();
//校验档号
boolean flag = fileNum.matches(TS_FILE_NUM_EXAMPLE);
if (Boolean.FALSE==flag){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]档号不符合标准,请检查后提交");
}
ArchiveRecordInfo archiveRecordInfo = new ArchiveRecordInfo();
BeanUtils.copyProperties(item,archiveRecordInfo);
String[] split = fileNum.split("-");
archiveRecordInfo.setFileNum(fileNum);
archiveRecordInfo.setArchiveCategory(type);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Date date = new Date();
archiveRecordInfo.setYear(sdf.format(date));
archiveRecordInfo.setStorageTime(split[1]);
archiveRecordInfo.setCaseNum(split[2]);
List<ArchiveCategoryInfo> archiveCategoryInfos = categoryInfoService.selectByCode(type,fileNum.substring(fileNum.indexOf("-")+1,fileNum.lastIndexOf("-")));
if (archiveCategoryInfos==null||archiveCategoryInfos.size()<=0){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]档号(分类号部分)填写错误,请检查后提交");
}
archiveRecordInfo.setArchiveScope(archiveCategoryInfos.get(0).getId());
archiveRecordInfo.setCategoryCode(archiveCategoryInfos.get(0).getCode());
archiveRecordInfo.setArchiveCategory(type);
if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
}
if (StringUtils.isNotEmpty(item.getDescriptionTime())){
archiveRecordInfo.setDescriptionTime(simpleDateFormat.parse(item.getDescriptionTime()));
}
archiveRecordInfo.setCreateId(SecurityUtils.getUserId().toString());
archiveRecordInfo.setSource("0");
archiveRecordInfo.setStatus("0");//预导入状态
archiveRecordInfo.setUpdateTime(DateUtils.getNowDate());
archiveRecordInfo.setCreateTime(DateUtils.getNowDate());
list.add(archiveRecordInfo);
}
Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap = batchSaveRecordInfoList(list);
//上传相关的文件
// List<FileUploadList> upladDown = uploadAllFiles(stringArchiveRecordInfoMap, ArchiveUploadConfig.getHTAction());
this.setCacheByRecord(stringArchiveRecordInfoMap,type);
//读取文件
List<ContractFileModel> writFileModels = ExcelUtil.readExcel(file, ContractFileModel.class, 2, 2);
//去重
writFileModels=writFileModels.stream().distinct().collect(Collectors.toList());
ArrayList<ArchiveFileInfo> archiveFileInfos = new ArrayList<>(writFileModels.size());
if (writFileModels!=null&&writFileModels.size()>0){
for (int i = 0; i < writFileModels.size(); i++) {
ContractFileModel tmp = writFileModels.get(i);
// 验证数据完整性
if ( StringUtils.isEmpty(tmp.getRecordFileNum())||
StringUtils.isEmpty(tmp.getArSort())||
StringUtils.isEmpty(tmp.getTitle())){
throw new RuntimeException("["+file.getOriginalFilename()+"——卷内目录——行号" + (i + 3) + "]数据填写不完整,请检查[案卷档号,卷内顺序号,文件标题]是否填写完整");
}
ArchiveFileInfo archiveFileInfo = new ArchiveFileInfo();
ArchiveRecordInfo archiveRecordInfo = stringArchiveRecordInfoMap.get(tmp.getRecordFileNum().trim());
if (archiveRecordInfo == null || archiveRecordInfo.getId() == null) {
throw new RuntimeException("["+file.getOriginalFilename()+"——卷内目录——行号" + (i + 3) + "]未匹配到对应的档案信息请检查");
}
BeanUtils.copyProperties(tmp,archiveFileInfo);
if (StringUtils.isNotEmpty(tmp.getFileDate())){
archiveFileInfo.setFileDate(simpleDateFormat.parse(tmp.getFileDate()));
}
archiveFileInfo.setArId(String.valueOf(archiveRecordInfo.getId()));
archiveFileInfo.setCreateId(SecurityUtils.getUserId().toString());
archiveFileInfo.setCreateTime(DateUtils.getNowDate());
archiveFileInfo.setUpdateTime(DateUtils.getNowDate());
archiveFileInfo.setStatus("0");
archiveFileInfos.add(archiveFileInfo);
}
batchSaveFileInfoList(archiveFileInfos);
this.setCacheByFile(archiveFileInfos,type);
}
List<KeyValue> keyValues=new ArrayList<>();
for (ArchiveRecordInfo archiveRecordInfo : list) {
//再次查询
if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
//发现已存在相同流水号，则excel删除刚保存的redis数据
numberGenUtil.removeValueByKey(keyValues);
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——档号" + archiveRecordInfo.getFileNum() + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
}
//无误后push
KeyValue keyValue=new KeyValue();
keyValue.setKey(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime());
keyValue.setValue(Integer.valueOf(archiveRecordInfo.getCaseNum()));
keyValues.add(keyValue);
numberGenUtil.pushXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()));
}
for (ArchiveFileInfo archiveFileInfo : archiveFileInfos) {
if (archiveFileInfo!=null){
numberGenUtil.pushXmNum(archiveFileInfo.getArId(),Integer.valueOf(archiveFileInfo.getArSort()));
}
}
}
/*
人事档案
*/
private void rsArchivesModelExcelImport(MultipartFile file, String type) throws Exception {
List<PersonnelArchivesModel> archivesModels = ExcelUtil.readExcel(file, PersonnelArchivesModel.class, 1, 2);
if (archivesModels==null||archivesModels.size()<=0){
throw new RuntimeException("["+file.getOriginalFilename()+"]导入数据为空,请检查后提交");
}
//去重
archivesModels=archivesModels.stream().distinct().collect(Collectors.toList());
ArrayList<ArchiveRecordInfo> list = new ArrayList<>(archivesModels.size());
for (int i = 0; i < archivesModels.size(); i++) {
PersonnelArchivesModel item = archivesModels.get(i);
// 验证数据完整性
if ( StringUtils.isEmpty(item.getFileNum())||
StringUtils.isEmpty(item.getBoxName())){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]数据填写不完整,请检查[档号,案卷题名]是否填写完整");
}
//校验数据
String fileNum =item.getFileNum().trim();
//校验档号
boolean flag = fileNum.matches(RS_FILE_NUM_EXAMPLE);
if (Boolean.FALSE==flag){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]档号不符合标准,请检查后提交");
}
ArchiveRecordInfo archiveRecordInfo = new ArchiveRecordInfo();
BeanUtils.copyProperties(item,archiveRecordInfo);
String[] split = fileNum.split("-");
archiveRecordInfo.setFileNum(fileNum);
archiveRecordInfo.setArchiveCategory(type);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Date date = new Date();
archiveRecordInfo.setYear(sdf.format(date));
archiveRecordInfo.setStorageTime(split[1]);
archiveRecordInfo.setCaseNum(split[2]);
if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
}
if (StringUtils.isNotEmpty(item.getArchive_date())){
archiveRecordInfo.setArchive_date(simpleDateFormat.parse(item.getArchive_date()));
}
archiveRecordInfo.setCreateId(SecurityUtils.getUserId().toString());
archiveRecordInfo.setSource("0");
archiveRecordInfo.setStatus("0");//预导入状态
archiveRecordInfo.setUpdateTime(DateUtils.getNowDate());
archiveRecordInfo.setCreateTime(DateUtils.getNowDate());
list.add(archiveRecordInfo);
}
Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap = batchSaveRecordInfoList(list);
//上传相关的文件
// List<FileUploadList> upladDown = uploadAllFiles(stringArchiveRecordInfoMap, ArchiveUploadConfig.getHTAction());
this.setCacheByRecord(stringArchiveRecordInfoMap,type);
//读取文件
List<ContractFileModel> writFileModels = ExcelUtil.readExcel(file, ContractFileModel.class, 2, 2);
//去重
writFileModels=writFileModels.stream().distinct().collect(Collectors.toList());
ArrayList<ArchiveFileInfo> archiveFileInfos = new ArrayList<>(writFileModels.size());
if (writFileModels!=null&&writFileModels.size()>0){
for (int i = 0; i < writFileModels.size(); i++) {
ContractFileModel tmp = writFileModels.get(i);
// 验证数据完整性
if ( StringUtils.isEmpty(tmp.getRecordFileNum())||
StringUtils.isEmpty(tmp.getArSort())||
StringUtils.isEmpty(tmp.getTitle())){
throw new RuntimeException("["+file.getOriginalFilename()+"——卷内目录——行号" + (i + 3) + "]数据填写不完整,请检查[案卷档号,卷内顺序号,文件标题]是否填写完整");
}
ArchiveFileInfo archiveFileInfo = new ArchiveFileInfo();
ArchiveRecordInfo archiveRecordInfo = stringArchiveRecordInfoMap.get(tmp.getRecordFileNum().trim());
if (archiveRecordInfo == null || archiveRecordInfo.getId() == null) {
throw new RuntimeException("["+file.getOriginalFilename()+"——卷内目录——行号" + (i + 3) + "]未匹配到对应的档案信息请检查");
}
BeanUtils.copyProperties(tmp,archiveFileInfo);
if (StringUtils.isNotEmpty(tmp.getFileDate())){
archiveFileInfo.setFileDate(simpleDateFormat.parse(tmp.getFileDate()));
}
archiveFileInfo.setArId(String.valueOf(archiveRecordInfo.getId()));
archiveFileInfo.setCreateId(SecurityUtils.getUserId().toString());
archiveFileInfo.setCreateTime(DateUtils.getNowDate());
archiveFileInfo.setUpdateTime(DateUtils.getNowDate());
archiveFileInfo.setStatus("0");
archiveFileInfos.add(archiveFileInfo);
}
batchSaveFileInfoList(archiveFileInfos);
this.setCacheByFile(archiveFileInfos,type);
}
List<KeyValue> keyValues=new ArrayList<>();
for (ArchiveRecordInfo archiveRecordInfo : list) {
//再次查询
if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
//发现已存在相同流水号，则excel删除刚保存的redis数据
numberGenUtil.removeValueByKey(keyValues);
throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——档号" + archiveRecordInfo.getFileNum() + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
}
//无误后push
KeyValue keyValue=new KeyValue();
keyValue.setKey(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime());
keyValue.setValue(Integer.valueOf(archiveRecordInfo.getCaseNum()));
keyValues.add(keyValue);
numberGenUtil.pushXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+"-"+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()));
}
for (ArchiveFileInfo archiveFileInfo : archiveFileInfos) {
if (archiveFileInfo!=null){
numberGenUtil.pushXmNum(archiveFileInfo.getArId(),Integer.valueOf(archiveFileInfo.getArSort()));
}
}
}
/*
合同档案(中文)
*/
@ -1713,7 +1957,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1713,7 +1957,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
fos.close();
fis.close();
}
/**
* @Description:批量上传文件

10
ruoyi-archives/src/main/java/com/ruoyi/archives/util/NumberGenUtil.java
Unescape View File

@ -90,6 +90,16 @@ public class NumberGenUtil { @@ -90,6 +90,16 @@ public class NumberGenUtil {
number = CategoryDict.ZXXM_SECOND_RECORD.toUpperCase()+archiveRecordInfo.getProjectNumber();//咨询项目档号变更为KJ
numLength=4;
content="-"+archiveRecordInfo.getCategoryCode()+"-";
}else if (CategoryDict.RS_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){
//组装编号 RS-YJ-001(人事档案)
number = CategoryDict.RS_RECORD.toUpperCase();
numLength=3;
content="-"+archiveRecordInfo.getStorageTime()+"-";
}else if (CategoryDict.TS_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){
//组装编号 TS-01-001(图书档案)
number = CategoryDict.TS_RECORD.toUpperCase();
numLength=4;
content="-"+archiveRecordInfo.getCategoryCode()+"-";
}
String fileNum = this.createXmNum(archiveRecordInfo, number, numLength, content);

Write Preview
Loading…
Cancel
Save