Skip to content

T
traffic-front
Commit cc905c6b authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent 5b563b2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 36 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/FileTypesController.java
View file @ cc905c6b
......@@ -39,6 +39,20 @@ public class FileTypesController {
return returnData;
}
/**
* 查询档案文件类型列表-可用
* @return
*/
@RequestMapping("/selectEnableList")
@ResponseBody
public ReturnData selectEnableFileTypesList(){
List<FileTypes> fileTypes = fileTypesService.selectEnableFileTypesList();
ReturnData returnData = new ReturnData();
returnData.setItems(fileTypes);
returnData.setTotalCount(fileTypes.size());
return returnData;
}
/**
* 查询档案属性和档案类型给前端下拉选择框
* @return
......@@ -93,10 +107,10 @@ public class FileTypesController {
public void exportExcelFile (HttpServletResponse response){
try {
Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id");
headers.put("id", "序号");
headers.put("file_attr", "档案属性");
headers.put("file_type", "档案类型");
headers.put("file_type", "必填字段");
headers.put("required_field", "必填字段");
headers.put("description", "说明");
headers.put("creator", "办事人");
headers.put("create_time", "创建时间");
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/FileTypesServiceImpl.java
View file @ cc905c6b
......@@ -36,6 +36,13 @@ public class FileTypesServiceImpl {
return fileTypesMapper.selectByExample(example);
}
public List<FileTypes> selectEnableFileTypesList() {
FileTypesExample example = new FileTypesExample();
FileTypesExample.Criteria criteria = example.createCriteria();
criteria.andStatusEqualTo("1");
return fileTypesMapper.selectByExample(example);
}
/**
* 查询档案属性和档案类型给前端下拉选择框
* @return
......@@ -70,7 +77,7 @@ public class FileTypesServiceImpl {
return false;
}
} catch (Exception e) {
log.error("FileTypesServiceImpl addFileTypesList error : " + e.getMessage());
// log.error("FileTypesServiceImpl addFileTypesList error : " + e.getMessage());
return false;
}
}
......@@ -93,7 +100,7 @@ public class FileTypesServiceImpl {
return false;
}
} catch (Exception e) {
log.error("FileTypesServiceImpl deleteFileTypes error : " + e.getMessage());
// log.error("FileTypesServiceImpl deleteFileTypes error : " + e.getMessage());
return false;
}
}
......@@ -121,7 +128,7 @@ public class FileTypesServiceImpl {
return false;
}
} catch (Exception e) {
log.error("FileTypesServiceImpl editFilesType error : " + e.getMessage());
// log.error("FileTypesServiceImpl editFilesType error : " + e.getMessage());
return false;
}
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ cc905c6b
......@@ -211,7 +211,7 @@ public class TaxDocumentServiceImpl {
return false;
}
} catch (Exception e) {
log.error("TaxDocumentServiceImpl addTaxDocument error : " + e.getMessage());
// log.error("TaxDocumentServiceImpl addTaxDocument error : " + e.getMessage());
return false;
}
}
......@@ -234,7 +234,7 @@ public class TaxDocumentServiceImpl {
return false;
}
} catch (Exception e) {
log.error("TaxDocumentServiceImpl deleteTaxDocument error : " + e.getMessage());
// log.error("TaxDocumentServiceImpl deleteTaxDocument error : " + e.getMessage());
return false;
}
}
......@@ -267,7 +267,7 @@ public class TaxDocumentServiceImpl {
}
return true;
} catch (Exception e) {
log.error("TaxDocumentServiceImpl batchDelete error : " + e.getMessage());
// log.error("TaxDocumentServiceImpl batchDelete error : " + e.getMessage());
return false;
}
}
......@@ -292,7 +292,7 @@ public class TaxDocumentServiceImpl {
return false;
}
} catch (Exception e) {
log.error("TaxDocumentServiceImpl updateTaxDocument error : " + e.getMessage());
// log.error("TaxDocumentServiceImpl updateTaxDocument error : " + e.getMessage());
return false;
}
}
......@@ -341,7 +341,7 @@ public class TaxDocumentServiceImpl {
}
return true;
} catch (Exception e) {
log.error("TaxDocumentServiceImpl queryWhetherData error :" + e.getMessage());
// log.error("TaxDocumentServiceImpl queryWhetherData error :" + e.getMessage());
return false;
}
}
......@@ -360,8 +360,7 @@ public class TaxDocumentServiceImpl {
//文件名称（带后缀） 文件名前+7位uuid截取码以防文件名相同
String fileName = StringUtils.isBlank(taxDocument.getFileName())
? "未知文件(请修改后缀名).xlsx"
: UUID.randomUUID().toString().substring(0, 6) + "_" + taxDocument.getFileOriginalName();
//设置输出流信息
: taxDocument.getFileOriginalName();//设置输出流信息
try {
response.setContentType("multipart/form-data");
response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));
......@@ -398,27 +397,27 @@ public class TaxDocumentServiceImpl {
out.write(buffer, 0, len);
}
} catch (IOException e) {
log.error("单个附件下载异常:" + e.getMessage());
// log.error("单个附件下载异常:" + e.getMessage());
} finally {
if (null != out) {
try {
out.close();
} catch (IOException e) {
log.error("关闭输出流错误:" + e.getMessage());
// log.error("关闭输出流错误:" + e.getMessage());
}
}
if (null != is) {
try {
is.close();
} catch (IOException e) {
log.error("关闭输入流错误:" + e.getMessage());
// log.error("关闭输入流错误:" + e.getMessage());
}
}
if (null != in) {
try {
in.close();
} catch (IOException e) {
log.error("关闭缓存输入流错误:" + e.getMessage());
// log.error("关闭缓存输入流错误:" + e.getMessage());
}
}
}
......@@ -441,20 +440,20 @@ public class TaxDocumentServiceImpl {
downloadTolocal(zos, ids);
} catch (IOException e) {
log.error("downloadAllFile-xxx下载全部附件失败，ids=[{}],错误信息=[{}]", ids, e);
// log.error("downloadAllFile-xxx下载全部附件失败，ids=[{}],错误信息=[{}]", ids, e);
} finally {
if (zos != null) {
try {
zos.close();
} catch (Exception e2) {
log.info("关闭输入流时出现错误", e2);
// log.info("关闭输入流时出现错误", e2);
}
}
if (outputStream != null) {
try {
outputStream.close();
} catch (Exception e2) {
log.info("关闭输入流时出现错误", e2);
// log.info("关闭输入流时出现错误", e2);
}
}
......@@ -487,7 +486,7 @@ public class TaxDocumentServiceImpl {
//文件名称（带后缀） 文件名前+7位uuid截取码以防文件名相同
String fileName = StringUtils.isBlank(item.getFileName())
? "未知文件(请修改后缀名).xlsx"
: UUID.randomUUID().toString().substring(0, 6) + "_" + item.getFileName();
: item.getFileName();
InputStream is = null;
BufferedInputStream in = null;
byte[] buffer = new byte[1024];
......@@ -519,27 +518,27 @@ public class TaxDocumentServiceImpl {
zos.write(buffer, 0, len);
}
} catch (Exception e) {
log.info("xxx--下载全部附件--压缩文件出错", e);
// log.info("xxx--下载全部附件--压缩文件出错", e);
} finally {
if (entry != null) {
try {
zos.closeEntry();
} catch (Exception e2) {
log.info("xxx下载全部附件--zip实体关闭失败", e2);
// log.info("xxx下载全部附件--zip实体关闭失败", e2);
}
}
if (in != null) {
try {
in.close();
} catch (Exception e2) {
log.info("xxx下载全部附件--文件输入流关闭失败", e2);
// log.info("xxx下载全部附件--文件输入流关闭失败", e2);
}
}
if (is != null) {
try {
is.close();
} catch (Exception e) {
log.info("xxx下载全部附件--输入缓冲流关闭失败", e);
// log.info("xxx下载全部附件--输入缓冲流关闭失败", e);
}
}
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/FileTypes.java
View file @ cc905c6b
......@@ -69,7 +69,7 @@ public class FileTypes implements Serializable {
* 必填字段(转换后)
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column file_types.file_type
* This field corresponds to the database column file_types.required_field
*
* @mbg.generated
*/
......
atms-web/src/main/webapp/app-resources/i18n/en-us/taxDocumentList.json
View file @ cc905c6b
{
"DocumentAttr":"DocumentAttr",
"DocumentType":"DocumentType",
"DocumentName":"DocumentName",
"BusinessLine":"BusinessLine",
"CorporationName":"CorporationName",
"AvailabilityDate":"AvailabilityDate",
"Duration":"Duration",
"DueDate":"DueDate",
"TaxType":"TaxType",
"EntityIndex":"EntityIndex",
"EntityStorageLocation":"EntityStorageLocation",
"EntityCustodian":"EntityCustodian",
"ApprovalStatus":"ApprovalStatus",
"ApprovalPass":"ApprovalPass",
"ApprovalReject":"ApprovalReject",
"ApprovalStandby":"ApprovalStandby",
"UploadDate":"UploadDate",
"Creator":"Creator",
"Remarks":"Remarks",
"MoreFields":"MoreFields",
"LessFields":"LessFields",
"Search":"Search",
"Reset":"Reset",
"Preview":"Preview",
"DelRecord":"DelRecord",
"CreateRecord":"CreateRecord",
"ExportTable":"ExportTable",
"DownloadAttachment":"DownloadAttachment",
"Log":"Log",
"MultiUpload":"MultiUpload",
"MultiUploadFailList":"MultiUploadFailList",
"UnFile":"UnFile",
"UnRecord":"UnRecord",
"UnReadFile":"UnReadFile",
"NeedLoadUp":"NeedLoadUp",
"UploadLimit":"UploadLimit",
"FailUpload":"FailUpload",
"NeedChecked":"NeedChecked",
"Deleted":"Deleted",
"Uploaded":"Uploaded",
"Edited":"Edited",
"Created":"Created",
"CoverConfirm":"CoverConfirm",
"NoData":"NoData",
"PleaseSelected":"PleaseSelected",
"PleaseType":"PleaseType",
"EntityStorageDescription":"EntityStorageDescription",
"multiUpload":"multiUpload",
"UploadAttach":"UploadAttach",
"Edit":"Edit",
"DocumentPath":"DocumentPath",
"PreviewFile":"PreviewFile",
"UploadSuccessCount":"UploadSuccessCount",
"UploadFailCount":"UploadFailCount"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/taxDocumentList.json
View file @ cc905c6b
......@@ -12,6 +12,9 @@
"EntityStorageLocation":"实物存放地点",
"EntityCustodian":"保管人",
"ApprovalStatus":"审批状态",
"ApprovalPass":"审批通过",
"ApprovalReject":"拒绝审批",
"ApprovalStandby":"待审批",
"UploadDate":"上传日期",
"Creator":"创建人",
"Remarks":"档案备注",
......@@ -26,6 +29,7 @@
"DownloadAttachment":"下载附件",
"Log":"日志",
"MultiUpload":"批量上传",
"MultiUploadFailList":"批量上传失败列表",
"UnFile":"未支持的文件类型",
"UnRecord":"当前记录没有附件信息",
"UnReadFile":"文件内有不规则内容，无法读取，暂不支持预览",
......@@ -46,5 +50,7 @@
"UploadAttach":"上传附件",
"Edit":"编辑",
"DocumentPath":"档案路径",
"PreviewFile":"预览文件"
"PreviewFile":"预览文件",
"UploadSuccessCount":"个档案上传成功",
"UploadFailCount":"个档案上传失败"
}
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.ctrl.js
View file @ cc905c6b
......@@ -296,7 +296,8 @@
// 默认status为1
if(uploadModel.status === undefined
|| uploadModel.status === null) uploadModel.status = 1;
|| uploadModel.status === null
|| uploadModel.status === "") uploadModel.status = 1;
$scope.queryStatusType(uploadModel);
docManageService.addFileType(uploadModel).then(function (data) {
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ cc905c6b
......@@ -12,11 +12,13 @@
display: none;
}
.edit-panel-left-part{
padding-left:0;
padding-right:0;
}
.required-tip{
color: red;
position: absolute;
left: 2rem;
top: 0.7rem;
}
</style>
<div class="menu-header">
......@@ -73,7 +75,7 @@
</div>
<!--档案属性-->
<div class="form-group">
<label for="DocumentAttr" class="col-sm-3 control-label">
<label for="DocumentAttr" class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span>
<span translate="DocumentAttr"></span>
</label>
......@@ -91,7 +93,7 @@
<!--档案类型-->
<div class="form-group">
<label for="DocumentType" class="col-sm-3 control-label">
<label for="DocumentType" class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span>
<span translate="DocumentType"></span>
</label>
......@@ -121,7 +123,7 @@
<!--必填字段-->
<div class="form-group">
<label class="col-sm-3 control-label">
<label class="col-sm-3 control-label edit-panel-left-part">
<span class="required-tip"> * </span>
<span translate="RequiredFields"></span>
</label>
......@@ -156,7 +158,10 @@
<label class="col-sm-5 DM-state-label">
<input type="radio" name="editModelState"
value=1
ng-checked="editModel.status == 1 || editModel.status == null || editModel.status == undefined"
ng-checked="editModel.status == 1
|| editModel.status == null
|| editModel.status == undefined
|| editModel.status == ''"
ng-model="editModel.status"/>
<span translate="Enable"></span>
</label>
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js
View file @ cc905c6b
......@@ -73,7 +73,7 @@ taxDocumentManageModule.factory('taxDocumentListService',
return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
},
getDocumentsAttrAndType:function(params){
return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/selectList', params);
return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/selectEnableList', params);
},
getBusinessList:function(params){
return jqFetch.get(apiInterceptor.webApiHostUrl + '/businessunit/getlist', params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment