Skip to content

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

merge 档案管理

parent 5af99a18
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 545 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/TaxDocumentDto.java
View file @ 66477505
......@@ -53,7 +53,9 @@ public class TaxDocumentDto {
private String physicalIndexNumber;//实物索引号
private Integer ownTime;//所属期间
private Integer ownBeginTime;//所属期间
private Integer ownEndTime;//所属期间
private Integer auditStatus;//审核状态
......@@ -215,12 +217,20 @@ public class TaxDocumentDto {
this.companyId = companyId;
}
public Integer getOwnTime() {
return ownTime;
public Integer getOwnBeginTime() {
return ownBeginTime;
}
public void setOwnBeginTime(Integer ownBeginTime) {
this.ownBeginTime = ownBeginTime;
}
public Integer getOwnEndTime() {
return ownEndTime;
}
public void setOwnTime(Integer ownTime) {
this.ownTime = ownTime;
public void setOwnEndTime(Integer ownEndTime) {
this.ownEndTime = ownEndTime;
}
public String getCompanyName() {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ 66477505
......@@ -105,9 +105,13 @@ public class TaxDocumentServiceImpl {
if (null != taxDocumentDto.getFileEndTTime()) {
criteria.andFileTimeLessThanOrEqualTo(taxDocumentDto.getFileEndTTime());
}
//所属时间 ownTime
if (null != taxDocumentDto.getOwnTime()) {
criteria.andOwnTimeEqualTo(taxDocumentDto.getOwnTime());
//所属開始时间 ownBeginTime
if (null != taxDocumentDto.getOwnBeginTime()) {
criteria.andOwnTimeGreaterThanOrEqualTo(taxDocumentDto.getOwnBeginTime());
}
//所属結束时间 ownEndTime
if (null != taxDocumentDto.getOwnEndTime()) {
criteria.andOwnTimeLessThanOrEqualTo(taxDocumentDto.getOwnEndTime());
}
//档案名称 fileName
if (StringUtils.isNotBlank(taxDocumentDto.getFileName())) {
......@@ -200,6 +204,7 @@ public class TaxDocumentServiceImpl {
taxDocument.setCreator(authUserHelper.getCurrentAuditor().get());
taxDocument.setCreatorId(authUserHelper.getCurrentUserId());
taxDocument.setUploadTime(new Date());
taxDocument.setAuditStatus(0);
taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
//根据公司Id 设置业务线
String businessLine = organizationService.queryBusinessByCompanyId(taxDocument.getCompanyId());
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocumentExample.java
View file @ 66477505
......@@ -335,52 +335,52 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andFileTypeIdEqualTo(Long value) {
public Criteria andFileTypeIdEqualTo(Integer value) {
addCriterion("file_type_id =", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdNotEqualTo(Long value) {
public Criteria andFileTypeIdNotEqualTo(Integer value) {
addCriterion("file_type_id <>", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdGreaterThan(Long value) {
public Criteria andFileTypeIdGreaterThan(Integer value) {
addCriterion("file_type_id >", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdGreaterThanOrEqualTo(Long value) {
public Criteria andFileTypeIdGreaterThanOrEqualTo(Integer value) {
addCriterion("file_type_id >=", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdLessThan(Long value) {
public Criteria andFileTypeIdLessThan(Integer value) {
addCriterion("file_type_id <", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdLessThanOrEqualTo(Long value) {
public Criteria andFileTypeIdLessThanOrEqualTo(Integer value) {
addCriterion("file_type_id <=", value, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdIn(List<Long> values) {
public Criteria andFileTypeIdIn(List<Integer> values) {
addCriterion("file_type_id in", values, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdNotIn(List<Long> values) {
public Criteria andFileTypeIdNotIn(List<Integer> values) {
addCriterion("file_type_id not in", values, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdBetween(Long value1, Long value2) {
public Criteria andFileTypeIdBetween(Integer value1, Integer value2) {
addCriterion("file_type_id between", value1, value2, "fileTypeId");
return (Criteria) this;
}
public Criteria andFileTypeIdNotBetween(Long value1, Long value2) {
public Criteria andFileTypeIdNotBetween(Integer value1, Integer value2) {
addCriterion("file_type_id not between", value1, value2, "fileTypeId");
return (Criteria) this;
}
......@@ -500,6 +500,11 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberLike(String value) {
addCriterion("physical_index_number like", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andFileNameNotLike(String value) {
addCriterion("file_name not like", value, "fileName");
return (Criteria) this;
......@@ -605,62 +610,52 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(String value) {
public Criteria andCompanyIdEqualTo(Integer value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(String value) {
public Criteria andCompanyIdNotEqualTo(Integer value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(String value) {
public Criteria andCompanyIdGreaterThan(Integer value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(String value) {
public Criteria andCompanyIdLessThan(Integer value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(String value) {
public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLike(String value) {
addCriterion("company_id like", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotLike(String value) {
addCriterion("company_id not like", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<String> values) {
public Criteria andCompanyIdIn(List<Integer> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<String> values) {
public Criteria andCompanyIdNotIn(List<Integer> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(String value1, String value2) {
public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(String value1, String value2) {
public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
......@@ -750,6 +745,31 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberEqualTo(String value) {
addCriterion("physical_index_number =", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andOwnTimeEqualTo(Integer value) {
addCriterion("own_time =", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeGreaterThanOrEqualTo(Integer value) {
addCriterion("own_time >=", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeLessThanOrEqualTo(Integer value) {
addCriterion("own_time <=", value, "ownTime");
return (Criteria) this;
}
public Criteria andAuditStatusEqualTo(Integer value) {
addCriterion("audit_status =", value, "auditStatus");
return (Criteria) this;
}
public Criteria andTaxTypeNotEqualTo(String value) {
addCriterion("tax_type <>", value, "taxType");
return (Criteria) this;
......@@ -805,66 +825,6 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andOwnTimeIsNull() {
addCriterion("own_time is null");
return (Criteria) this;
}
public Criteria andOwnTimeIsNotNull() {
addCriterion("own_time is not null");
return (Criteria) this;
}
public Criteria andOwnTimeEqualTo(Integer value) {
addCriterion("own_time =", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeNotEqualTo(Integer value) {
addCriterion("own_time <>", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeGreaterThan(Integer value) {
addCriterion("own_time >", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeGreaterThanOrEqualTo(Integer value) {
addCriterion("own_time >=", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeLessThan(Integer value) {
addCriterion("own_time <", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeLessThanOrEqualTo(Integer value) {
addCriterion("own_time <=", value, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeIn(List<Integer> values) {
addCriterion("own_time in", values, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeNotIn(List<Integer> values) {
addCriterion("own_time not in", values, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeBetween(Integer value1, Integer value2) {
addCriterion("own_time between", value1, value2, "ownTime");
return (Criteria) this;
}
public Criteria andOwnTimeNotBetween(Integer value1, Integer value2) {
addCriterion("own_time not between", value1, value2, "ownTime");
return (Criteria) this;
}
public Criteria andFileTimeIsNull() {
addCriterion("file_time is null");
return (Criteria) this;
......@@ -995,62 +955,52 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andCreatorIdEqualTo(String value) {
public Criteria andCreatorIdEqualTo(Integer value) {
addCriterion("creator_id =", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdNotEqualTo(String value) {
public Criteria andCreatorIdNotEqualTo(Integer value) {
addCriterion("creator_id <>", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdGreaterThan(String value) {
public Criteria andCreatorIdGreaterThan(Integer value) {
addCriterion("creator_id >", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdGreaterThanOrEqualTo(String value) {
public Criteria andCreatorIdGreaterThanOrEqualTo(Integer value) {
addCriterion("creator_id >=", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdLessThan(String value) {
public Criteria andCreatorIdLessThan(Integer value) {
addCriterion("creator_id <", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdLessThanOrEqualTo(String value) {
public Criteria andCreatorIdLessThanOrEqualTo(Integer value) {
addCriterion("creator_id <=", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdLike(String value) {
addCriterion("creator_id like", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdNotLike(String value) {
addCriterion("creator_id not like", value, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdIn(List<String> values) {
public Criteria andCreatorIdIn(List<Integer> values) {
addCriterion("creator_id in", values, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdNotIn(List<String> values) {
public Criteria andCreatorIdNotIn(List<Integer> values) {
addCriterion("creator_id not in", values, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdBetween(String value1, String value2) {
public Criteria andCreatorIdBetween(Integer value1, Integer value2) {
addCriterion("creator_id between", value1, value2, "creatorId");
return (Criteria) this;
}
public Criteria andCreatorIdNotBetween(String value1, String value2) {
public Criteria andCreatorIdNotBetween(Integer value1, Integer value2) {
addCriterion("creator_id not between", value1, value2, "creatorId");
return (Criteria) this;
}
......@@ -1200,6 +1150,11 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andOwnTimeEqualTo(Date value) {
addCriterion("own_time =", value, "ownTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
......@@ -1385,62 +1340,52 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andKeeperIdEqualTo(String value) {
public Criteria andKeeperIdEqualTo(Integer value) {
addCriterion("keeper_id =", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdNotEqualTo(String value) {
public Criteria andKeeperIdNotEqualTo(Integer value) {
addCriterion("keeper_id <>", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdGreaterThan(String value) {
public Criteria andKeeperIdGreaterThan(Integer value) {
addCriterion("keeper_id >", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdGreaterThanOrEqualTo(String value) {
public Criteria andKeeperIdGreaterThanOrEqualTo(Integer value) {
addCriterion("keeper_id >=", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdLessThan(String value) {
public Criteria andKeeperIdLessThan(Integer value) {
addCriterion("keeper_id <", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdLessThanOrEqualTo(String value) {
public Criteria andKeeperIdLessThanOrEqualTo(Integer value) {
addCriterion("keeper_id <=", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdLike(String value) {
addCriterion("keeper_id like", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdNotLike(String value) {
addCriterion("keeper_id not like", value, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdIn(List<String> values) {
public Criteria andKeeperIdIn(List<Integer> values) {
addCriterion("keeper_id in", values, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdNotIn(List<String> values) {
public Criteria andKeeperIdNotIn(List<Integer> values) {
addCriterion("keeper_id not in", values, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdBetween(String value1, String value2) {
public Criteria andKeeperIdBetween(Integer value1, Integer value2) {
addCriterion("keeper_id between", value1, value2, "keeperId");
return (Criteria) this;
}
public Criteria andKeeperIdNotBetween(String value1, String value2) {
public Criteria andKeeperIdNotBetween(Integer value1, Integer value2) {
addCriterion("keeper_id not between", value1, value2, "keeperId");
return (Criteria) this;
}
......@@ -1515,76 +1460,6 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberIsNull() {
addCriterion("physical_index_number is null");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberIsNotNull() {
addCriterion("physical_index_number is not null");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberEqualTo(String value) {
addCriterion("physical_index_number =", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberNotEqualTo(String value) {
addCriterion("physical_index_number <>", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberGreaterThan(String value) {
addCriterion("physical_index_number >", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberGreaterThanOrEqualTo(String value) {
addCriterion("physical_index_number >=", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberLessThan(String value) {
addCriterion("physical_index_number <", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberLessThanOrEqualTo(String value) {
addCriterion("physical_index_number <=", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberLike(String value) {
addCriterion("physical_index_number like", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberNotLike(String value) {
addCriterion("physical_index_number not like", value, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberIn(List<String> values) {
addCriterion("physical_index_number in", values, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberNotIn(List<String> values) {
addCriterion("physical_index_number not in", values, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberBetween(String value1, String value2) {
addCriterion("physical_index_number between", value1, value2, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andPhysicalIndexNumberNotBetween(String value1, String value2) {
addCriterion("physical_index_number not between", value1, value2, "physicalIndexNumber");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
return (Criteria) this;
......@@ -1655,76 +1530,6 @@ public class TaxDocumentExample {
return (Criteria) this;
}
public Criteria andFileOriginalNameIsNull() {
addCriterion("file_original_name is null");
return (Criteria) this;
}
public Criteria andFileOriginalNameIsNotNull() {
addCriterion("file_original_name is not null");
return (Criteria) this;
}
public Criteria andFileOriginalNameEqualTo(String value) {
addCriterion("file_original_name =", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameNotEqualTo(String value) {
addCriterion("file_original_name <>", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameGreaterThan(String value) {
addCriterion("file_original_name >", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameGreaterThanOrEqualTo(String value) {
addCriterion("file_original_name >=", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameLessThan(String value) {
addCriterion("file_original_name <", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameLessThanOrEqualTo(String value) {
addCriterion("file_original_name <=", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameLike(String value) {
addCriterion("file_original_name like", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameNotLike(String value) {
addCriterion("file_original_name not like", value, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameIn(List<String> values) {
addCriterion("file_original_name in", values, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameNotIn(List<String> values) {
addCriterion("file_original_name not in", values, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameBetween(String value1, String value2) {
addCriterion("file_original_name between", value1, value2, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFileOriginalNameNotBetween(String value1, String value2) {
addCriterion("file_original_name not between", value1, value2, "fileOriginalName");
return (Criteria) this;
}
public Criteria andFilePositionUrlIsNull() {
addCriterion("file_position_url is null");
return (Criteria) this;
......@@ -1854,206 +1659,6 @@ public class TaxDocumentExample {
addCriterion("year_redundancy not between", value1, value2, "yearRedundancy");
return (Criteria) this;
}
public Criteria andAuditStatusIsNull() {
addCriterion("audit_status is null");
return (Criteria) this;
}
public Criteria andAuditStatusIsNotNull() {
addCriterion("audit_status is not null");
return (Criteria) this;
}
public Criteria andAuditStatusEqualTo(Integer value) {
addCriterion("audit_status =", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotEqualTo(Integer value) {
addCriterion("audit_status <>", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusGreaterThan(Integer value) {
addCriterion("audit_status >", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("audit_status >=", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusLessThan(Integer value) {
addCriterion("audit_status <", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusLessThanOrEqualTo(Integer value) {
addCriterion("audit_status <=", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusIn(List<Integer> values) {
addCriterion("audit_status in", values, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotIn(List<Integer> values) {
addCriterion("audit_status not in", values, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusBetween(Integer value1, Integer value2) {
addCriterion("audit_status between", value1, value2, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) {
addCriterion("audit_status not between", value1, value2, "auditStatus");
return (Criteria) this;
}
public Criteria andEnableIsNull() {
addCriterion("enable is null");
return (Criteria) this;
}
public Criteria andEnableIsNotNull() {
addCriterion("enable is not null");
return (Criteria) this;
}
public Criteria andEnableEqualTo(String value) {
addCriterion("enable =", value, "enable");
return (Criteria) this;
}
public Criteria andEnableNotEqualTo(String value) {
addCriterion("enable <>", value, "enable");
return (Criteria) this;
}
public Criteria andEnableGreaterThan(String value) {
addCriterion("enable >", value, "enable");
return (Criteria) this;
}
public Criteria andEnableGreaterThanOrEqualTo(String value) {
addCriterion("enable >=", value, "enable");
return (Criteria) this;
}
public Criteria andEnableLessThan(String value) {
addCriterion("enable <", value, "enable");
return (Criteria) this;
}
public Criteria andEnableLessThanOrEqualTo(String value) {
addCriterion("enable <=", value, "enable");
return (Criteria) this;
}
public Criteria andEnableLike(String value) {
addCriterion("enable like", value, "enable");
return (Criteria) this;
}
public Criteria andEnableNotLike(String value) {
addCriterion("enable not like", value, "enable");
return (Criteria) this;
}
public Criteria andEnableIn(List<String> values) {
addCriterion("enable in", values, "enable");
return (Criteria) this;
}
public Criteria andEnableNotIn(List<String> values) {
addCriterion("enable not in", values, "enable");
return (Criteria) this;
}
public Criteria andEnableBetween(String value1, String value2) {
addCriterion("enable between", value1, value2, "enable");
return (Criteria) this;
}
public Criteria andEnableNotBetween(String value1, String value2) {
addCriterion("enable not between", value1, value2, "enable");
return (Criteria) this;
}
public Criteria andFileUploadIdIsNull() {
addCriterion("file_upload_id is null");
return (Criteria) this;
}
public Criteria andFileUploadIdIsNotNull() {
addCriterion("file_upload_id is not null");
return (Criteria) this;
}
public Criteria andFileUploadIdEqualTo(String value) {
addCriterion("file_upload_id =", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdNotEqualTo(String value) {
addCriterion("file_upload_id <>", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdGreaterThan(String value) {
addCriterion("file_upload_id >", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdGreaterThanOrEqualTo(String value) {
addCriterion("file_upload_id >=", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdLessThan(String value) {
addCriterion("file_upload_id <", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdLessThanOrEqualTo(String value) {
addCriterion("file_upload_id <=", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdLike(String value) {
addCriterion("file_upload_id like", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdNotLike(String value) {
addCriterion("file_upload_id not like", value, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdIn(List<String> values) {
addCriterion("file_upload_id in", values, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdNotIn(List<String> values) {
addCriterion("file_upload_id not in", values, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdBetween(String value1, String value2) {
addCriterion("file_upload_id between", value1, value2, "fileUploadId");
return (Criteria) this;
}
public Criteria andFileUploadIdNotBetween(String value1, String value2) {
addCriterion("file_upload_id not between", value1, value2, "fileUploadId");
return (Criteria) this;
}
}
/**
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 66477505
......@@ -236,6 +236,7 @@
"MessagePushObject": "消息推送对象",
"WorkFlowCode": "流程编号",
"CreatedTime": "创建时间",
"UpdateTime": "更新时间",
"HighPriority": "高级",
"MediumPriority": "中级",
"LowPriority": "低级",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/systemConfiguration.json
View file @ 66477505
......@@ -52,7 +52,7 @@
"DefaultTaxTypeAndReport": "默认纳税类型及报表：",
"DeleteKeyValueConfiguration": "删除关键数据",
"Description": "描述：",
"DescriptionWithOutColon": "描述",
"DescriptionWithOutColon": "说明",
"DirectionDifferent": "借贷方向不一致",
"EnterpriceAccountMapping": "自动对应",
"EtsSubjectNameCol": "对应企业科目",
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 66477505
......@@ -25,8 +25,8 @@ taxDocumentManageModule.controller('taxDocumentListController',
var params = angular.copy($scope.queryFieldModel);
params.fileBeginTime = getQueryDate(params.fileBeginTime,"-");
params.fileEndTTime = getQueryDate(params.fileEndTTime,"-");
params.ownBeginTime = getQueryDate(params.ownBeginTime,"-");
params.ownEndTime = getQueryDate(params.ownEndTime,"-");
// params.ownBeginTime = getQueryDate(params.ownBeginTime,"-");
// params.ownEndTime = getQueryDate(params.ownEndTime,"-");
params.effectiveBeginTime = getQueryDate(params.effectiveBeginTime,"-");
params.effectiveEndTime = getQueryDate(params.effectiveEndTime,"-");
params.uploadBeginTime = getQueryDate(params.uploadBeginTime,"-");
......@@ -60,6 +60,17 @@ taxDocumentManageModule.controller('taxDocumentListController',
dataSource: 'localData',
},
showBorders: true,
paging: {
enable: true,
pageIndex: 1,
pageSize: 100
},
pager: {
showInfo: false,
showNavigationButtons: false,
showPageSizeSelector: false,
visible: false,
},
sorting: {//排序
ascendingText: "Sort Ascending",
clearText: "Clear Sorting",
......@@ -267,15 +278,10 @@ taxDocumentManageModule.controller('taxDocumentListController',
};
$scope.getTableHeight=function(){
var row_height=$("table").find("tr").height();
if(row_height && $scope.pagingOptions.pageSize==20){
if(row_height){
return {
height:(row_height*12)+"px"
}
}else if(row_height && ($scope.pagingOptions.pageSize==50||$scope.pagingOptions.pageSize==100)){
return {
height:(row_height*12+55)+"px"
}
}else{
}
};
};
......@@ -439,51 +445,65 @@ taxDocumentManageModule.controller('taxDocumentListController',
};
var editDocFileRecord = function (fieldModel, type) {
var params = angular.copy(fieldModel);
// params.ownTime = params.ownTime ? params.ownTime : "";
// var splitMark = params.ownTime.indexOf("-") > -1 ? "-" : "/";
// params.ownTime = parseInt(params.ownTime.split(splitMark).join(""));
Object.keys(params).forEach(function(key){
if(params[key] === undefined || params[key] === null) params[key] = "";
});
params.ownTime = $scope.queryOwnTime(params.ownTime, "int");
params.effectiveTime ? params.effectiveTime = $scope.getQueryDate(params.effectiveTime, "/") : delete params.effectiveTime;
params.fileTime ? params.fileTime = $scope.getQueryDate(params.fileTime, "/") : delete params.fileTime;
params.createTime ? params.createTime = $scope.getQueryDate(params.createTime, "/") : delete params.createTime;
params.updateTime ? params.updateTime = $scope.getQueryDate(params.updateTime, "/") : delete params.updateTime;
params.uploadTime ? params.uploadTime = $scope.getQueryDate(params.uploadTime, "/") : delete params.uploadTime;
params.filePositionUrl = encodeURIComponent(params.filePositionUrl);
params.auditStatus = $scope.transformAuditStatusToServer(params.auditStatus);
taxDocumentListService.editRecord(params).then(function (data) {
if (data == true) {
if (type == 'simple') {
SweetAlert.swal({
title: $translate.instant("Edited"),
type: "success",
confirmButtonText: $translate.instant('Confirm'),
closeOnConfirm: true
},
function (isConfirm) {
if (isConfirm) $scope.loadMainData();
});
} else {
if ($scope.multiUploadSuccessItems.length == 0) {
SweetAlert.swal({
title: $translate.instant("Uploaded"),
type: "success",
confirmButtonText: $translate.instant('Confirm'),
closeOnConfirm: true
},
function (isConfirm) {
if (isConfirm) $scope.loadMainData();
});
}
SweetAlert.swal({
title: '提示',
text: $translate.instant("CoverConfirm"),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
var params = angular.copy(fieldModel);
// params.ownTime = params.ownTime ? params.ownTime : "";
// var splitMark = params.ownTime.indexOf("-") > -1 ? "-" : "/";
// params.ownTime = parseInt(params.ownTime.split(splitMark).join(""));
Object.keys(params).forEach(function(key){
if(params[key] === undefined || params[key] === null) params[key] = "";
});
params.ownTime = $scope.queryOwnTime(params.ownTime, "int");
params.effectiveTime ? params.effectiveTime = $scope.getQueryDate(params.effectiveTime, "/") : delete params.effectiveTime;
params.fileTime ? params.fileTime = $scope.getQueryDate(params.fileTime, "/") : delete params.fileTime;
params.createTime ? params.createTime = $scope.getQueryDate(params.createTime, "/") : delete params.createTime;
params.updateTime ? params.updateTime = $scope.getQueryDate(params.updateTime, "/") : delete params.updateTime;
params.uploadTime ? params.uploadTime = $scope.getQueryDate(params.uploadTime, "/") : delete params.uploadTime;
params.filePositionUrl = encodeURIComponent(params.filePositionUrl);
params.auditStatus = $scope.transformAuditStatusToServer(params.auditStatus);
taxDocumentListService.editRecord(params).then(function (data) {
if (data == true) {
if (type == 'simple') {
SweetAlert.swal({
title: $translate.instant("Edited"),
type: "success",
confirmButtonText: $translate.instant('Confirm'),
closeOnConfirm: true
},
function (isConfirm) {
if (isConfirm) $scope.loadMainData();
});
} else {
if ($scope.multiUploadSuccessItems.length == 0) {
SweetAlert.swal({
title: $translate.instant("Uploaded"),
type: "success",
confirmButtonText: $translate.instant('Confirm'),
closeOnConfirm: true
},
function (isConfirm) {
if (isConfirm) $scope.loadMainData();
});
}
}
} else {
SweetAlert.warning($translate.instant('SaveFail'));
}
});
}
} else {
SweetAlert.warning($translate.instant('SaveFail'));
}
});
});
$('#simpleUploadPopDialog').modal('hide');
$('#multiUploadPopDialog').modal('hide');
};
......@@ -709,6 +729,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
$scope.multiUploadErrorItems = [];
$scope.multiUploadSuccessItems = [];
$scope.multiUploader = {};
$scope.FileItem={isSuccess:false};
$scope.abandonFileCache = [];
$scope.uploadResultSuccessList = [];
$scope.activeTab = function (activeIndex) {
......@@ -881,6 +902,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
//data.id===null|| data.id===undefined,代表可以直接上传，否则属于覆盖行为
if (data.id===null|| data.id===undefined) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/add";
_multiUploader.uploadItem(_i);
} else {
//覆盖行为-需上传参数
for (var name in data) {
......@@ -894,11 +916,27 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
}
var cover_fields={};
cover_fields[name] = data[name];
fileItem.formData.push(cover_fields);
_fileItem.formData.push(cover_fields);
}
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
var Cover_Confirm="'"+data.fileName+"' 记录已经存在，是否进行覆盖？";
SweetAlert.swal({
title: '提示',
text: $translate.instant(Cover_Confirm),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
_multiUploader.uploadItem(_i);
}
})
}
_multiUploader.uploadItem(_i);
});
})(i, fileItem, editFieldModel, taxDocumentListService, $scope.multiUploader);
......@@ -913,7 +951,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
if($scope.multiUploadErrorItems.length
|| $scope.uploadResultSuccessList.length)
$("#uploadResultPop").modal("show");
$scope.FileItem.isSuccess=true;//文件上传成功标识
$('#busy-indicator-container').hide();
$scope.loadMainData();
......@@ -930,7 +968,11 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
$scope.multiUploadErrorItems[0].iShow = true;
}
$('#uploadResultPop').modal('hide');
$("#multiUploadPopDialog").modal("show");
if($scope.FileItem.isSuccess==false){
$("#multiUploadPopDialog").modal("show");
}else{
$scope.FileItem.isSuccess=false;
}
};
$scope.closeUploadReview = function () {
......@@ -1056,6 +1098,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
//data.id===null|| data.id===undefined,代表可以直接上传，否则属于覆盖行为
if (data.id===null|| data.id===undefined) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/add";
_multiUploader.uploadItem(_i);
} else {
//覆盖行为-需上传参数
for (var name in data) {
......@@ -1069,11 +1112,29 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
}
var cover_fields={};
cover_fields[name] = data[name];
fileItem.formData.push(cover_fields);
_fileItem.formData.push(cover_fields);
}
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
var Cover_Confirm="'"+data.fileName+"' 记录已经存在，是否进行覆盖？";
SweetAlert.swal({
title: '提示',
text: $translate.instant(Cover_Confirm),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
_multiUploader.uploadItem(_i);
}
})
}
_multiUploader.uploadItem(_i);
});
})(i, fileItem, editFieldModel, taxDocumentListService, $scope.multiUploader);
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 66477505
......@@ -418,12 +418,12 @@
<!--ng-model="queryFieldModel.Duration"/>-->
<input type='text' placeholder="From"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.ownBeginTime"
data-min-view-mode="0"/>
data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
data-min-view-mode="1"/>
<input type='text' placeholder="To"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.ownEndTime"
data-min-view-mode="0"/>
data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime"
data-min-view-mode="1"/>
<!--<input type="text" class="form-control radius3" id="period-picker2"/>-->
</div>
......@@ -1407,8 +1407,8 @@
<span>{{item.fileName}}</span>
</li>
</ul>
<p ng-if="multiUploadErrorItems.length">{{multiUploadErrorItems.length}}{{'UploadFailCount'|translate}}</p>
<ul>
<p class="text-danger" ng-if="multiUploadErrorItems.length">{{multiUploadErrorItems.length}}{{'UploadFailCount'|translate}}</p>
<ul class="text-danger">
<li ng-repeat="item in multiUploadErrorItems">
<span>{{item.fileName}}</span>
</li>
......
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