merge 档案管理

atms-api/src/main/java/pwc/taxtech/atms/dto/TaxDocumentDto.java

@@ -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

@@ -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-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json

@@ -236,6 +236,7 @@
     "MessagePushObject": "消息推送对象",
     "WorkFlowCode": "流程编号",
     "CreatedTime": "创建时间",
+    "UpdateTime": "更新时间",
     "HighPriority": "高级",
     "MediumPriority": "中级",
     "LowPriority": "低级",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/systemConfiguration.json

@@ -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.html

@@ -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>