Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessageCN.java

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.common.message;
 public class ErrorMessageCN {
 
     public static final String  NoCompanyError = "未映射到主体";
+    public static final String  NoProjectError = "未映射到卡片";
     public static final String  ExistDataPeriodsError = "存在非选择期间数据";
     public static final String  InconsistentPeriod = "单表中期间不一致";
     public static final String  DoNotSelectPeriod = "未选择期间";

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/FormulaDataSourceDetailType.java

@@ -9,7 +9,7 @@ public enum FormulaDataSourceDetailType {
     InputInvoiceDataSourceDto(3, pwc.taxtech.atms.dto.vatdto.InputInvoiceDataSourceDto.class),
     InputInvoiceDetailDataSourceDto(4, pwc.taxtech.atms.dto.vatdto.InputInvoiceDetailDataSourceDto.class),
     OutputInvoiceDataSourceDto(5, pwc.taxtech.atms.dto.vatdto.OutputInvoiceDataSourceDto.class),
-    AssetDetailDataSourceDto(5, pwc.taxtech.atms.dto.vatdto.AssetDetailDataSourceDto.class),
+    AssetDetailDataSourceDto(21, pwc.taxtech.atms.dto.vatdto.AssetDetailDataSourceDto.class),
 
     ReportCellDataSourceDto(6, pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto.class),
     ReportCellTableSUMIFDataSourceDto(7,ReportCellTableSUMIFDataSourceDto.class),

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

@@ -20,6 +20,7 @@ public class  TableRule {
         map.put("RGDRZCFZB", "balance_sheet_manual");
         map.put("RGDRLRB", "profit_loss_statement_manual");
         map.put("RGDRXJLLB", "cash_flow_manual");
+        map.put("HZXXB", "red_letter_info_table");
 
         map.put("ZXZCFZB", "balance_sheet_final");
         map.put("ZXLLB", "profit_loss_statement_final");

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

@@ -164,7 +164,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
         Page page = PageHelper.startPage(citTrialBalanceDto.getPageInfo().getPageIndex(), citTrialBalanceDto.getPageInfo().getPageSize());
         CitTrialBalanceExample citTbExample = new CitTrialBalanceExample();
         CitTrialBalanceExample.Criteria citTbExampleCriteria = citTbExample.createCriteria();
-//        citTbExampleCriteria.andProjectIdEqualTo(citTrialBalanceDto.getProjectId());
+        citTbExampleCriteria.andProjectIdEqualTo(citTrialBalanceDto.getProjectId());
         List<CitTrialBalance> citTbList = citTbMapper.selectByExample(citTbExample);
         List<CitTrialBalanceDto> citTbDtos = Lists.newArrayList();
         citTbList.forEach(tb -> {
@@ -189,7 +189,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
         try {
             CitTrialBalanceExample citTbExample = new CitTrialBalanceExample();
             CitTrialBalanceExample.Criteria citTbExampleCriteria = citTbExample.createCriteria();
-//            citTbExampleCriteria.andProjectIdEqualTo(citTrialBalanceDto.getProjectId());
+            citTbExampleCriteria.andProjectIdEqualTo(citTrialBalanceDto.getProjectId());
             List<CitTrialBalance> citTbList = citTbMapper.selectByExample(citTbExample);
 
             Map<String, String> header = generalTbGeneVerHeader();

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml

@@ -297,6 +297,7 @@
     <select id="sumAmountByCondition" parameterType="map" resultMap="BaseResultMap">
         SELECT
         subject_code as subject_code,
+        max(jfinal.subject_name) as subject_name,
         sum(jfinal.accounted_dr) as accounted_dr,
         sum(jfinal.accounted_cr) as accounted_cr
         from
@@ -304,7 +305,8 @@
         select
         cj.accounted_dr as accounted_dr,
         cj.accounted_cr as accounted_cr ,
-        cj.subject_code as subject_code
+        cj.subject_code as subject_code,
+        cj.subject_name as subject_name
         from
         cit_journal_entry_adjust cj
         where
@@ -321,7 +323,8 @@
         select
         j.accounted_dr as accounted_dr,
         j.accounted_cr as accounted_cr,
-        j.segment3 as subject_code
+        j.segment3 as subject_code,
+        j.segment3_name as subject_name
         from
         journal_entry j
         where
@@ -345,7 +348,7 @@
         org_name, subject_name, accounted_dr, accounted_cr,
         created_by, created_date, late_updated_by,
         late_updated_date, create_time, update_time
-        from cit_journal_entry_adjust  where project_id=''
+        from cit_journal_entry_adjust  where project_id = #{projectId,jdbcType=VARCHAR}
         <if test="orgCode != null">
             and org_code = #{orgCode,jdbcType=VARCHAR}
         </if>
@@ -365,7 +368,7 @@
         journal_source, category, name, voucher_num, description, segment1 as org_code,  segment3 as subject_code,
         segment1_name as org_name, segment3_name as subject_name, accounted_dr, accounted_cr,
         created_by, created_date, late_updated_by, late_updated_date, create_time, update_time
-        from journal_entry    where project_id=''
+        from journal_entry    where project_id = #{projectId,jdbcType=VARCHAR}
         <if test="orgCode != null">
             and segment1 = #{orgCode,jdbcType=VARCHAR}
         </if>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTrialBalanceExtendsMapper.xml

@@ -359,6 +359,7 @@
         cit_draft_account_mapping dam
       on
         tb.account_code=dam.acct_code
+      where tb.project_id = #{projectId,jdbcType=VARCHAR}
 
   </select>
 

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

@@ -25,11 +25,11 @@
 
             var serviceTypeMapping = {
                 VAT: $translate.instant('VAT'),
-                RPT: $translate.instant('RPT'),
+                // RPT: $translate.instant('RPT'),
                 CIT: $translate.instant('CIT'),
-                DTA: $translate.instant('DTA'),
-                CF: $translate.instant('CashFlow'),
-                AssetsManage: $translate.instant('AssetsManage')
+                // DTA: $translate.instant('DTA'),
+                // CF: $translate.instant('CashFlow'),
+                // AssetsManage: $translate.instant('AssetsManage')
             };
 
             // Config if demo, if current service is only demo, will not validate the formula

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

@@ -957,6 +957,7 @@
 
         //批量导出EXCEL
         $scope.export = function () {
+            debugger;
             var grp = _.find($scope.$parent.$parent.groups, function (g) {
                 return g.name == 'TaxReturnType';
             });
@@ -991,15 +992,16 @@
             var reg = /^([A-Z]+[0-9]+){1}$|^([A-Z]+[0-9]+){1}([\+-]{1}[A-Z]+[0-9]+)+$/g;
             var exportReportData = [];
             angular.forEach(reportArray, function (currentVal) {
+                debugger;
                 var node = _.first(_.where(grp.children, {reportId: currentVal}));
                 if (!node) {
                     return;
                 }
                 var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
-                    
+                    debugger;
                     if (reportData && reportData.data && reportData.data.cellData) {
                         _.each(reportData.data.cellData, function (x) {
-                            
+
                             x.value = x.cellValue;
                             if (x.formula && reg.test(x.formula)) {
                                 x.isFormula = true;
@@ -1025,7 +1027,7 @@
                 });
 
                 for (var j = 0; j < exportReportData.length; j++) {
-                    var report = "<vat-report-sheet id='r_" + exportReportData[j].templateId + "' spread='spreads[" + j + "]' report-source = 'exportReportData[" + j + "]' template-id='\"" + exportReportData[j].templateId + "\"' is-export='true' service-type='6'></vat-report-sheet>";
+                    var report = "<cit-report-sheet id='r_" + exportReportData[j].templateId + "' spread='spreads[" + j + "]' report-source = 'exportReportData[" + j + "]' template-id='\"" + exportReportData[j].templateId + "\"' is-export='true' service-type='6'></cit-report-sheet>";
                     var html = $compile(report)($scope);
                     $('.export-container').append(html);
                 }

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

@@ -551,7 +551,7 @@ controller('editTemplategroupModalController', ['$scope', '$log', '$translate',
                         return;
                     }
 
-                    //此处报错（Converting circular structure to JSON），因时间关系采取快捷方案
+                    //此处报错（Converting circular structure to JSON），因时间关系采取快捷方案 update by zhikai.z.wei 20190321
                     var addTemplateGroupModel = {
                         groupType: $scope.editModel.groupType,
                         industryIds: $scope.editModel.industryIDs,

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

@@ -167,7 +167,8 @@
                 },
                 __RequestVerificationToken: token,
                 withCredentials: true
-            }).then(function (resp) {
+            }).then(function (data) {
+                    var resp = data.data;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {
@@ -175,17 +176,11 @@
                         vatOperationLogService.addOperationLog(logDto);
                         SweetAlert.success($translate.instant('ImportSuccess'));
                     } else {
-                        if (resp.message && resp.message.length > 0) {
-                            SweetAlert.warning($translate.instant(resp.message));
-                        } else {
-                            SweetAlert.error($translate.instant('ImportFailed'));
-                        }
                         if (resp.resultMsg && resp.resultMsg.length > 0) {
-                            SweetAlert.warning($translate.instant(resp.resultMsg));
+                            SweetAlert.warning(resp.resultMsg);
                         } else {
                             SweetAlert.error($translate.instant('ImportFailed'));
                         }
-
                         logDto.UpdateState = $translate.instant('ImportFail');
                         vatOperationLogService.addOperationLog(logDto);
                     }

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -167,7 +167,8 @@
                 },
                 __RequestVerificationToken: token,
                 withCredentials: true
-            }).then(function(resp) {
+            }).then(function(data) {
+                    var resp = data.data;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {
@@ -175,8 +176,8 @@
                         vatOperationLogService.addOperationLog(logDto);
                         SweetAlert.success($translate.instant('ImportSuccess'));
                     } else {
-                        if (resp.message && resp.message.length > 0) {
-                            SweetAlert.warning($translate.instant(resp.resultMsg));
+                        if (resp.resultMsg && resp.resultMsg.length > 0) {
+                            SweetAlert.warning(resp.resultMsg);
                         }else{
                             SweetAlert.error($translate.instant('ImportFailed'));
                         }