Merge branch 'dev_wzk' into 'dev_mysql'

1、ZC公式数据源问题；2、RSUMIF取CIT利润表数据源问题；3、已开增值税发票记录模板必填高亮问题；4、收入类型配置操作列移到前面，并提示名称唯一改为警告提示；

See merge request root/atms!337

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

@@ -826,6 +826,8 @@ public class CitReportServiceImpl extends BaseService {
         List<ReportDto> reportDtos = result.getData().stream().filter(x -> {
             return x.getId() != null && ids.contains(x.getTemplateId());
         }).collect(Collectors.toList());
+        //按照报表code进行排序
+        reportDtos = reportDtos.stream().sorted(Comparator.comparing(ReportDto::getTemplateCode)).collect(Collectors.toList());
         result.setData(reportDtos);
         return result;
     }

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/RSUMIF.java

@@ -120,8 +120,11 @@ public class RSUMIF extends FunctionBase implements FreeRefFunction {
     public FormulaDataSourceType selectShow(String tableName) {
         if ("CIT_TBAM".equals(tableName)) {
             return FormulaDataSourceType.CIT_TBAM;
+        } else if ("CITLRB".equals(tableName)){
+            return FormulaDataSourceType.Report;
         } else {
             return FormulaDataSourceType.Other;
+
         }
     }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/ZC.java

@@ -65,27 +65,6 @@ public class ZC extends FunctionBase implements FreeRefFunction {
         try {
             CitAssetDetailResultDto assetDetailResultDto =
                     SpringContextUtil.assetsListMapper.getCitAssetDetialResult(assetType, assetDetailType,formulaContext.getProjectId());
-//            for (CitAssetDetailResultDto x : assetDetailResultDtos) {
-//                if(x == null){
-//                    continue;
-//                }
-//                AssetDetailDataSourceDto assetDetailDataSourceDto = new AssetDetailDataSourceDto();
-//                assetDetailDataSourceDto.setResultType(KeyValueConfigResultType.Accounting.getCode());
-//                assetDetailDataSourceDto.setAccountAcquisitionValue(FormulaHelper.roundValue(x.getAssetsList().getAccountAcquisitionValue(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setAccountMonthDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getAccountMonthDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setAccountYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setAccountTotalepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getAccountTotalDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setYearEndValue(FormulaHelper.roundValue(x.getAssetsList().getYearEndValue(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setTaxMonthDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxMonthDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setTaxToCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxToCurrentYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setTaxCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxCurrentYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setTotalDifferenceAmount(FormulaHelper.roundValue(x.getAssetsList().getTotalDifferenceAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setYearDifferenceAmount(FormulaHelper.roundValue(x.getAssetsList().getYearDifferenceAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
-//                assetDetailDataSourceDto.setDataType(dataType);
-//                assetDetailDataSourceDto.setName(Constant.DataSourceName.AssetListDataSource);
-//                assetDetailDataSourceDto.setOperationType(EnumOperationType.Single.getCode());
-//                dataSource.add(assetDetailDataSourceDto);
-//            }
 
             dto.setRowIndex(ec.getRowIndex());
             dto.setColumnIndex(ec.getColumnIndex());
@@ -93,8 +72,6 @@ public class ZC extends FunctionBase implements FreeRefFunction {
             dto.setReportTemplateId(formulaContext.getReportTemplateGroupId().toString());
             dto.setYear(formulaContext.getYear());
             dto.setIsOnlyManualInput(Boolean.FALSE);
-            dto.setReportName(formulaContext.getReportTemplateGroupId().toString());
-            dto.setName(Constant.DataSourceName.AssetListDataSource);
 
 //            dto.setType(FormulaDataSourceType.AssetListSource.getCode());
             if(assetDetailResultDto != null){

atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js

@@ -117,6 +117,27 @@
         $scope.revenueGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
             columns: [
                 {dataField: 'idStr', caption: '', visible: false},
+                {
+                    dataField: '',
+                    caption: $translate.instant('RevenueColEdit'),
+                    fixed: true,
+                    width: '80px',
+                    alignment: 'center',
+                    cellTemplate: function (container, options) {
+                        try {
+                            $('<i class="fa fa-pencil-square-o" style="cursor: pointer"></i>&nbsp;&nbsp;')
+                                .on('click', function () {
+                                    $scope.editConfig(options.data);
+                                }).appendTo(container);
+                            $('<i class="fa fa-trash" style="cursor: pointer;margin-left: 5px;"></i>')
+                                .on('click', function () {
+                                    $scope.delConfig([options.data.idStr]);
+                                }).appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
                 {
                     dataField: 'name',
                     caption: $translate.instant('RevenueColName'),
@@ -196,27 +217,7 @@
                     allowHeaderFiltering: true,
                     width: '120px'
                 },
-                {
-                    dataField: '',
-                    caption: $translate.instant('RevenueColEdit'),
-                    fixed: true,
-                    width: '80px',
-                    alignment: 'center',
-                    cellTemplate: function (container, options) {
-                        try {
-                            $('<i class="fa fa-pencil-square-o" style="cursor: pointer"></i>&nbsp;&nbsp;')
-                                .on('click', function () {
-                                    $scope.editConfig(options.data);
-                                }).appendTo(container);
-                            $('<i class="fa fa-trash" style="cursor: pointer;margin-left: 5px;"></i>')
-                                .on('click', function () {
-                                    $scope.delConfig([options.data.idStr]);
-                                }).appendTo(container);
-                        } catch (e) {
-                            $log.error(e);
-                        }
-                    }
-                },
+
             ],
             bindingOptions: {
                 dataSource: 'pageConfDataSource',
@@ -297,7 +298,7 @@
                     .success(function (res) {
                         if (res && 0 === res.code) {
                             if(res.message === "DuplicateName"){
-                                SweetAlert.success($translate.instant('NameShouldUniqueWarn'));
+                                SweetAlert.warning($translate.instant('NameShouldUniqueWarn'));
                                 return;
                             }
                             SweetAlert.success($translate.instant('RevenueAddSuccess'));
@@ -313,7 +314,7 @@
                     .success(function (res) {
                         if (res && 0 === res.code) {
                             if(res.message === "DuplicateName"){
-                                SweetAlert.success($translate.instant('NameShouldUniqueWarn'));
+                                SweetAlert.warning($translate.instant('NameShouldUniqueWarn'));
                                 return;
                             }
                             SweetAlert.success($translate.instant('RevenueAddSuccess'));