Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java

@@ -52,19 +52,19 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
     private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType, Integer amountType, OperationEvaluationContext ec) {
 
         String queryDate = formulaContext.getYear() + (formulaContext.getPeriod() < 10 ? ("0" + formulaContext.getPeriod()) : (formulaContext.getPeriod() + ""));
-        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
-        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
-                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate);
-        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
-        if (CollectionUtils.isEmpty(typeMappingList)) {
-            return 0.0;
-        }
-        List<String> revenueTypes = typeMappingList.stream()
-                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
+//        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
+//        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
+//                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
+//                .andEndDateGreaterThanOrEqualTo(queryDate);
+//        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
+//        if (CollectionUtils.isEmpty(typeMappingList)) {
+//            return 0.0;
+//        }
+//        List<String> revenueTypes = typeMappingList.stream()
+//                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
         RevenueConfigExample configExample = new RevenueConfigExample();
         configExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId()).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate).andNameIn(revenueTypes);
+                .andEndDateGreaterThanOrEqualTo(queryDate).andNameEqualTo(revenueTypeName);
         List<RevenueConfig> configDatas = SpringContextUtil.revenueConfigMapper.selectByExample(configExample);
         if (CollectionUtils.isEmpty(configDatas)) {
             return 0.0;

atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocumentExample.java

@@ -1916,72 +1916,72 @@ public class TaxDocumentExample {
         }
 
         public Criteria andEnableIsNull() {
-            addCriterion("enable is null");
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
         public Criteria andEnableIsNotNull() {
-            addCriterion("enable is not null");
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
         public Criteria andEnableEqualTo(String value) {
-            addCriterion("enable =", value, "enable");
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotEqualTo(String value) {
-            addCriterion("enable <>", value, "enable");
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThan(String value) {
-            addCriterion("enable >", value, "enable");
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThanOrEqualTo(String value) {
-            addCriterion("enable >=", value, "enable");
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThan(String value) {
-            addCriterion("enable <", value, "enable");
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThanOrEqualTo(String value) {
-            addCriterion("enable <=", value, "enable");
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLike(String value) {
-            addCriterion("enable like", value, "enable");
+            addCriterion("`enable` like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotLike(String value) {
-            addCriterion("enable not like", value, "enable");
+            addCriterion("`enable` not like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableIn(List<String> values) {
-            addCriterion("enable in", values, "enable");
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotIn(List<String> values) {
-            addCriterion("enable not in", values, "enable");
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableBetween(String value1, String value2) {
-            addCriterion("enable between", value1, value2, "enable");
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotBetween(String value1, String value2) {
-            addCriterion("enable not between", value1, value2, "enable");
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.java

@@ -129,4 +129,6 @@ public interface InvoiceRecordMapper extends MyVatMapper {
 
     List<String> queryBillTypeGroupBy(@Param("projectId") String projectId,
                                       @Param("period") Integer period);
+
+    int clearRevenueCof(@Param("clearRevenue") boolean clearRevenue, @Param("clearModifyRevenue") boolean clearModifyRevenue,@Param("example") InvoiceRecordExample example);
 }
\ No newline at end of file

atms-web/src/main/java/pwc/taxtech/atms/orangeheap/controller/OrangeHeapController.java

+package pwc.taxtech.atms.orangeheap.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/OrangeHeap/tableau")
+public class OrangeHeapController {
+}

atms-web/src/main/java/pwc/taxtech/atms/orangeheap/service/OrangeHeapService.java

+package pwc.taxtech.atms.orangeheap.service;
+
+public class OrangeHeapService {
+}

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -813,6 +813,7 @@
     "dateFormat4YearMonthDayCh": "yyyy-mm-dd",
     "RecordSize": "Record Size",
     "ExtractFile": "Extract File",
+    "ExtractTaskId": "任务ID",
     "TaxPayerIdNum": "纳税人识别号",
 
     "ExtractDistribution": "Extract Distribution",

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

@@ -857,6 +857,7 @@
 
     "RecordSize": "记录条数",
     "ExtractFile": "抽取类型",
+    "ExtractTaskId": "任务ID",
     "TaxPayerIdNum": "纳税人识别号",
     "ExtractDistribution": "抽取分发",
     "Log":"日志",

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/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -136,9 +136,8 @@
                 showBorders: true,
                 columns: [{
                     dataField: "id",
-                    visible: false,
                     allowHeaderFiltering: false,
-                    caption: $translate.instant('id')
+                    caption: $translate.instant('ExtractTaskId')
                 }, {
                     dataField: "taxpayerIdNum",
                     width: '15%',
@@ -195,7 +194,10 @@
                         dataField: "operateTime",
                         allowHeaderFiltering: false,
                         width: '10%',
-                        caption: $translate.instant('LogOperationTime')
+                        caption: $translate.instant('LogOperationTime'),
+                        calculateCellValue: function(data) {
+                            return new Date(data).formatDateTime('yyyy-MM-dd hh:mm:ss');
+                        }
                     }
                 ],
                 onContentReady: function (e) {

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>