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

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java

@@ -2532,6 +2532,7 @@ public class OrganizationServiceImpl extends BaseService{
                     } else {
                         activeRule.setTemplateGroupId(vatSetting.getTemplateGroupId());
                         activeRule.setTaxPayerType(newTaxPayerType);
+                        taxPayerReportRuleMapper.updateByPrimaryKeySelective(activeRule);
                     }
                 } else { // If currently no rule and new rule should be added
                     Date now = new Date();

atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java

@@ -376,7 +376,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
                     }
                 }
                 wtemp.write(bos);
-                String tmpPath = httpFileService.uploadTemplate(newName, file);
+                //上传didi服务器文件
+                FileUpload fileUpload = didiFileUploadService.uploadFile(file,file.getOriginalFilename(), FileUploadEnum.BizSource.REPORT_TEMPLATE_UPLOAD.name());
+//                String tmpPath = httpFileService.uploadTemplate(newName, file);
                 String[] arr = sheetName.split("_");
                 String name = arr.length >= 2 ? arr[1] : arr[0];
                 Template template = new Template();
@@ -387,7 +389,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 template.setIsSystemType(false);
                 template.setName(name);
                 template.setOrderIndex(i + length);
-                template.setPath(tmpPath);
+                template.setPath(fileUpload.getUid());
                 template.setReportType(StringUtils.isBlank(reportType) ? null : Integer.valueOf(reportType));
                 template.setTemplateGroupId(templateGroupId);
                 filePathList.add(template);

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

@@ -927,6 +927,7 @@
     "SwitchToCITProject": "Display Business Account Data",
     "SwitchToSTANDARDProject": "Please Organize The Data First Then View The General Ledger In a Standard Account.",
     "SelectReportTemplate": "Select Report",
+    "SelectReportTemplateType": "Select Report Type",
     "TBDataNum": "Trial Balance Amount:",
     "TableName": "Table Name",
     "TaskDescription": "Task Description",

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

@@ -935,6 +935,7 @@
     "SwitchToCITProject": "现在显示企业科目的数据",
     "SwitchToSTANDARDProject": "以标准科目方式查看总账，请先进行数据整理",
     "SelectReportTemplate": "选择报表",
+    "SelectReportTemplateType": "报表类型",
     "TBDataNum": "试算平衡表总数:",
     "TableName": "表名",
     "TaskDescription": "事项描述",

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

@@ -202,6 +202,7 @@
     "SelectOneAccountToMap": "请选择至少一个企业科目进行对应！",
     "SelectReport": "报表：",
     "SelectReportTemplate": "选择报表",
+    "SelectReportTemplateType": "报表类型",
     "SelectTemplateGroup": "报表模板：",
     "Special": "专用发票",
     "SpecialInvoice": "专票",

atms-web/src/main/webapp/app/admin/systemConfiguration/declarationFormConfiguration/declaration-form-configuration.ctrl.js

@@ -1971,8 +1971,8 @@ ng-show="hasEditPermission && ToggleSaveAs && editModel.hasModel"/>');
                                     || $scope.curServiceTypeId === enums.serviceType.Others) {
                                     serviceTypeId = $scope.curServiceTypeId;
                                 }
-
                                 $scope.templateModel = {
+                                    reportTypeList:$scope.detailReportTypeList,
                                     templateGroupID: $scope.curTemplateGroup.id,
                                     serviceTypeID: serviceTypeId,
                                     payTaxType: serviceTypeId === enums.serviceType.CIT || serviceTypeId === enums.serviceType.Others ? '' : $scope.payTaxType.value,

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.ctrl.js

@@ -49,13 +49,23 @@ controller('editTemplateModalController', ['$scope', '$log', '$translate', '$loc
 
         var thisDataService = {
             newModel: function() {
+
                 var editModel = {};
+                $scope.searchOptions = {
+                    reportTypeOptions: {
+                        displayExpr: 'name',
+                        valueExpr: 'value',
+                        bindingOptions: {
+                            value: 'editModel.reportType'
+                        },
+                        dataSource: $scope.templateModel.reportTypeList.dataSource._array
+                    }
+                };
                 editModel.sheetSelectDxID = thisConstant.sheetSelectDxID;
                 editModel.templateGroupID = $scope.templateModel.templateGroupID;
                 editModel.addExists = true;
                 editModel.findSheetDxDropID = thisConstant.findSheetDxDropID;
                 editModel.reportType = $scope.templateModel.reportType;
-
                 return editModel;
             },
 

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.html

@@ -37,6 +37,15 @@
                         <div id={{::editModel.findSheetDxDropID}}></div>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="telCode" class="col-sm-3 control-label">{{'SelectReportTemplateType' | translate}}: </label>
+                    <div class="col-sm-9">
+                        <div class="tab-content-select reportType col-md-2"
+                             dx-select-box="searchOptions.reportTypeOptions">
+
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group" ng-show="!editModel.addExists">
                     <div class="col-sm-9 normal-label checkbox">
                         <label>

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.less

@@ -96,3 +96,27 @@
 .search-box {
     margin: 6px -10px -10px -10px;
 }
+.form-group {
+
+    .tab-content-select {
+        margin-right: 10px;
+        outline: none;
+        display: inline-block;
+
+        &.industry {
+            width: 100px;
+        }
+
+        &.reportType {
+            width: 120px;
+        }
+
+        &.selectTemplateGroup {
+            width: 150px;
+        }
+
+        &.selectReport {
+            width: 150px;
+        }
+    }
+}
\ No newline at end of file