鉴定新增全宗号 目录号 案卷号

new
parent c0ea0f56a1
commit eaa1d23ac2

@ -0,0 +1,7 @@
--
ALTER TABLE archives_authenticate ADD COLUMN `case_num` varchar(255) NULL DEFAULT NULL COMMENT '';
ALTER TABLE archives_authenticate ADD COLUMN `catalog_num` varchar(255) NULL DEFAULT NULL COMMENT '';
ALTER TABLE archives_authenticate ADD COLUMN `files_num` varchar(255) NULL DEFAULT NULL COMMENT '';

@ -65,4 +65,13 @@ public class AuthenticateBaseVO {
@Schema(description = "鉴定结果", example = "鉴定结果") @Schema(description = "鉴定结果", example = "鉴定结果")
private String result; private String result;
@Schema(description = "全宗号", example = "全宗号")
private String caseNum;
@Schema(description = "目录号", example = "目录号")
private String catalogNum;
@Schema(description = "案卷号", example = "案卷号")
private String filesNum;
} }

@ -69,4 +69,13 @@ public class AuthenticateExcelVO {
@ExcelProperty("鉴定结果") @ExcelProperty("鉴定结果")
private String result; private String result;
@ExcelProperty("全宗号")
private String caseNum;
@ExcelProperty("目录号")
private String catalogNum;
@ExcelProperty("案卷号")
private String filesNum;
} }

@ -63,4 +63,13 @@ public class AuthenticateExportReqVO {
@Schema(description = "鉴定结果",example = "鉴定结果") @Schema(description = "鉴定结果",example = "鉴定结果")
private String result; private String result;
@Schema(description = "全宗号", example = "全宗号")
private String caseNum;
@Schema(description = "目录号", example = "目录号")
private String catalogNum;
@Schema(description = "案卷号", example = "案卷号")
private String filesNum;
} }

@ -65,4 +65,13 @@ public class AuthenticatePageReqVO extends PageParam {
@Schema(description = "鉴定结果",example = "鉴定结果") @Schema(description = "鉴定结果",example = "鉴定结果")
private String result; private String result;
@Schema(description = "全宗号", example = "全宗号")
private String caseNum;
@Schema(description = "目录号", example = "目录号")
private String catalogNum;
@Schema(description = "案卷号", example = "案卷号")
private String filesNum;
} }

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.archives.dal.dataobject.authenticate; package cn.iocoder.yudao.module.archives.dal.dataobject.authenticate;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -91,4 +92,17 @@ public class AuthenticateDO extends BaseDO {
*/ */
private String result; private String result;
/**
*
*/
private String caseNum;
/**
*
*/
private String catalogNum;
/**
*
*/
private String filesNum;
} }

@ -8,6 +8,7 @@ import com.alibaba.druid.sql.visitor.functions.Now;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.Record;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -107,9 +108,9 @@ public class AuthenticateServiceImpl implements AuthenticateService {
record.setIdentifyStatus("1"); record.setIdentifyStatus("1");
recordMapper.updateById(record); recordMapper.updateById(record);
//设置档案类型和档案位置 //设置档案基础信息到鉴定历史中
vo.setType(record.getFileType()); BeanUtils.copyProperties(record,vo);
vo.setPosition(record.getSite()); vo.setPosition(record.getSite()).setType(record.getFileType());
AuthenticateDO authenticate = AuthenticateConvert.INSTANCE.convert(vo); AuthenticateDO authenticate = AuthenticateConvert.INSTANCE.convert(vo);
authenticate.setDate(LocalDateTime.now()); authenticate.setDate(LocalDateTime.now());
//新增鉴定申请记录 //新增鉴定申请记录

@ -203,10 +203,10 @@ public class RecordServiceImpl implements RecordService {
@Override @Override
public PageResult<RecordDO> getRecordPage(RecordPageReqVO pageReqVO) { public PageResult<RecordDO> getRecordPage(RecordPageReqVO pageReqVO) {
// 这里加入authenticate字段区分是归档台账的调用接口还是鉴定调用接口 鉴定接口只查询未鉴定的归档台账 // 这里加入authenticate字段区分是归档台账的调用接口还是鉴定调用接口 鉴定接口只查询未鉴定的归档台账
if (StringUtils.isNotNull(pageReqVO.getAuthenticate())){ if (StringUtils.isNotNull(pageReqVO.getAuthenticate())){//查询列表
return recordMapper.selectPageAuthenticate(pageReqVO); return recordMapper.selectPageAuthenticate(pageReqVO);
} }
return recordMapper.selectPage(pageReqVO); return recordMapper.selectPage(pageReqVO);//查询历史
} }
@Override @Override

Loading…
Cancel
Save