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/controller/CitImportExcelController.java

@@ -57,10 +57,10 @@ public class CitImportExcelController {
             opeResultDto = citImportExcelService.citImportExcel(file, orgList, file.getOriginalFilename(), periodDate, importType, importFileType);
             return opeResultDto;
         }catch (Exception e){
-            logger.error("资产导入失败，错误信息如下：");
+            logger.error("文件导入失败，错误信息如下：");
             e.printStackTrace();
             opeResultDto.setResult(false);
-            opeResultDto.setResultMsg("资产导入失败");
+            opeResultDto.setResultMsg("文件导入失败");
             return opeResultDto;
         }
     }

atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportController.java

@@ -9,10 +9,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.constant.enums.EnumServiceType;
 import pwc.taxtech.atms.dpo.ReportDto;
-import pwc.taxtech.atms.dto.ApiResultDto;
-import pwc.taxtech.atms.dto.CitAssetsListDto;
-import pwc.taxtech.atms.dto.CitJournalAdjustDto;
-import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.*;
 import pwc.taxtech.atms.dto.vatdto.ManualDataSourceDto;
 import pwc.taxtech.atms.dto.vatdto.PeriodJobDto;
 import pwc.taxtech.atms.dto.vatdto.ReportDataDto;
@@ -69,6 +66,28 @@ public class CitReportController {
         return ResponseEntity.ok(citReportService.generateCitData(projectId, EnumServiceType.CIT, mergeManual,0,null, generator));
     }
 
+    /**
+     * 生成CIT总分机构分配表
+     * @param projectId
+     * @return
+     */
+    @RequestMapping(value = "generateDistributionTable/{projectId}", method = RequestMethod.POST,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ApiResultDto generateDistributionTable(@PathVariable String projectId) {
+        ApiResultDto apiResultDto = new ApiResultDto();
+        try{
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("生成成功");
+            apiResultDto.setData(citReportService.generateTotalBranchOrgDisTable(projectId));
+            return apiResultDto;
+        }catch(Exception e){
+            e.printStackTrace();
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("生成失败");
+            return apiResultDto;
+        }
+    }
+
     /**
      * 获取当前卡片所拥有的模板
      * @param projectId
@@ -123,7 +142,7 @@ public class CitReportController {
 
 
     /**
-     * 日记账合并版导出
+     * 固定资产及EAM Mapping导出
      * @param paras
      * @param response
      */
@@ -137,6 +156,36 @@ public class CitReportController {
         }
 
     }
+
+    /**
+     * 获取  企业所得税汇总纳税分支机构所得税分配表（A202000）
+     * @param citDistributionDto
+     * @return
+     */
+    @RequestMapping(value = "/getDistributionTables", method = RequestMethod.POST)
+    public @ResponseBody
+    ApiResultDto getCitDistribution(@RequestBody CitDistributionDto citDistributionDto){
+        logger.info("获取 企业所得税汇总纳税分支机构所得税分配表 的数据");
+        ApiResultDto apiResultDto = new ApiResultDto();
+        try{
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("获取成功");
+            apiResultDto.setData(citReportService.getCitDistribution(citDistributionDto));
+            return apiResultDto;
+        }catch(Exception e){
+            e.printStackTrace();
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取失败");
+            return apiResultDto;
+        }
+    }
+
+    /**
+     * 获取单元格相关数据
+     * @param reportId
+     * @param from
+     * @return
+     */
     @RequestMapping(value = "reportData/{reportId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public OperationResultDto<ReportDataDto> getReportData(@PathVariable Long reportId, @RequestHeader String from) {
         OperationResultDto resultDto = new OperationResultDto();
@@ -147,6 +196,12 @@ public class CitReportController {
         return reportService.getCellData(reportId, from);
     }
 
+    /**
+     * 添加手工数据源
+     * @param data
+     * @param from
+     * @return
+     */
     @RequestMapping(value = "addCellManualData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseEntity addCellManualDataSource(@RequestBody ManualDataSourceDto data, @RequestHeader String from) {
         String projectId = StringUtils.EMPTY;

atms-api/src/main/java/pwc/taxtech/atms/security/dd/DtsTokenService.java

 package pwc.taxtech.atms.security.dd;
+
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,12 +7,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.exception.ServiceException;
 import pwc.taxtech.atms.service.impl.ProjectServiceImpl;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
-//import org.apache.tomcat.util.codec.binary.Base64;
 import javax.crypto.Cipher;
-
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
@@ -20,6 +17,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+
 /**
  * @Auther: Gary J Li
  * @Date: 20/03/2019 20:41
@@ -47,11 +45,9 @@ public class DtsTokenService {
      * @throws
      */
     public String encryptInput(){
-        BASE64Encoder base64 = new BASE64Encoder();
-        BASE64Decoder base64Decoder = new BASE64Decoder();
         byte[] encodeData;
         try {
-            byte[] publicKey = base64Decoder.decodeBuffer(pubKey);
+            byte[] publicKey = Base64.decodeBase64(pubKey);
             String nonce = generateNonce();
             String sDate = generateDate();
             long rNum = generateRandomNumber();
@@ -59,12 +55,12 @@ public class DtsTokenService {
             byte[] data1 = inputStr1.getBytes();
             logger.debug("原文：" + inputStr1);
             encodeData = encryptByPublicKey(data1, publicKey);
-            logger.debug("公钥加密后：" + base64.encode(encodeData));
+            logger.debug("公钥加密后：" + Base64.encodeBase64String(encodeData));
         } catch (Exception ex) {
             throw new ServiceException("cus" + ex);
         }
 
-        return base64.encode(encodeData);
+        return Base64.encodeBase64String(encodeData);
     }
 
 

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

@@ -1881,11 +1881,12 @@ public class DataImportService extends BaseService {
         String effectiveDateTo = param.getEffectiveDateTo();
         List<Future> resList = Lists.newArrayList();
         List<Integer> dataTypes = param.getDataTypes();
+        String operator = authUserHelper.getCurrentAuditor().get();
         dataTypes.forEach(type -> {
             orgs.forEach(o -> {
                 try {
                     Callable callEbs = new CallEbsThread(type, o,ebsCallUrl,dataImportLogMapper,authUserHelper,
-                            idService,dtsTokenService,period, effectiveDateFrom, effectiveDateTo);
+                            idService,dtsTokenService,period, effectiveDateFrom, effectiveDateTo, operator);
                     executorService.submit(callEbs);
 //                    resList.add(future);
                 } catch (RejectedExecutionException rje) {
@@ -2004,10 +2005,11 @@ public class DataImportService extends BaseService {
         private String effectiveDateFrom;
 
         private String effectiveDateTo;
+        private String operator;
 
         CallEbsThread(int type, Organization org, String ebsCallUrl, DataImportLogMapper dataImportLogMapper,
                       AuthUserHelper authUserHelper, DistributedIdService idService, DtsTokenService dtsTokenService,
-                      String period,String effectiveDateFrom, String effectiveDateTo) {
+                      String period,String effectiveDateFrom, String effectiveDateTo, String operator) {
             this.type = type;
             this.org = org;
             this.period = period;
@@ -2018,6 +2020,7 @@ public class DataImportService extends BaseService {
             this.dataImportLogMapper = dataImportLogMapper;
             this.effectiveDateFrom = effectiveDateFrom;
             this.effectiveDateTo = effectiveDateTo;
+            this.operator = operator;
         }
 
         @Override
@@ -2038,7 +2041,7 @@ public class DataImportService extends BaseService {
             log.setType(EnumImportType.ExtractFinancialData.getCode());
             log.setFileType(EnumEbsExtractType.getNameByCode(type));
             log.setPeriodStatus("EBS抽取");
-            log.setOperator(authUserHelper.getCurrentAuditor().get());
+            log.setOperator(operator);
             try {
                 if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
                     log.setId(idService.nextId());

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

@@ -111,8 +111,9 @@ public class RSUMIF extends FunctionBase implements FreeRefFunction {
     public FormulaDataSourceType selectShow(String tableName) {
         if ("CIT_TBAM".equals(tableName)) {
             return FormulaDataSourceType.CIT_TBAM;
+        }else{
+            return  FormulaDataSourceType.Other;
         }
-        return null;
     }
 
     public static String getSql (){

atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java

@@ -2,7 +2,6 @@ package pwc.taxtech.atms.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;
 import org.junit.Test;
@@ -12,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import pwc.taxtech.atms.CommonIT;
 import pwc.taxtech.atms.common.AuthUserHelper;
-import pwc.taxtech.atms.common.schedule.OrgSyncJob;
 import pwc.taxtech.atms.common.util.BaseThreadFactory;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.common.util.HttpUtil;
@@ -30,8 +28,6 @@ import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.exception.ServiceException;
 import pwc.taxtech.atms.security.dd.DtsTokenService;
 import pwc.taxtech.atms.service.EbsApiService;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
@@ -712,11 +708,9 @@ public class EbsApiServiceImplTest extends CommonIT {
 
 
     public String encryptInput(){
-        BASE64Encoder base64 = new BASE64Encoder();
-        BASE64Decoder base64Decoder = new BASE64Decoder();
         byte[] encodeData;
         try {
-            byte[] publicKey = base64Decoder.decodeBuffer("MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==");
+            byte[] publicKey = org.apache.commons.codec.binary.Base64.decodeBase64("MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==");
             String nonce = generateNonce();
             String sDate = generateDate();
             long rNum = generateRandomNumber();
@@ -724,12 +718,11 @@ public class EbsApiServiceImplTest extends CommonIT {
             byte[] data1 = inputStr1.getBytes();
             logger.debug("原文：" + inputStr1);
             encodeData = encryptByPublicKey(data1, publicKey);
-            logger.debug("公钥加密后：" + base64.encode(encodeData));
         } catch (Exception ex) {
             throw new ServiceException("cus" + ex);
         }
 
-        return base64.encode(encodeData);
+        return org.apache.commons.codec.binary.Base64.encodeBase64String(encodeData);
     }
 
 
@@ -737,7 +730,7 @@ public class EbsApiServiceImplTest extends CommonIT {
     private String generateNonce() throws Exception {
         String dateTimeString = Long.toString(System.currentTimeMillis());
         byte[] nonceByte = dateTimeString.getBytes();
-        return Base64.encodeBase64String(nonceByte);
+        return Base64.getEncoder().encodeToString(nonceByte);
     }
 
     private String generateDate() throws Exception {

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitDistributionMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.CitDistribution;
+import pwc.taxtech.atms.entity.CitDistributionExample;
+
+@Mapper
+public interface CitDistributionMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    long countByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int insert(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    List<CitDistribution> selectByExampleWithRowbounds(CitDistributionExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    List<CitDistribution> selectByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    CitDistribution selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CitDistribution record, @Param("example") CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CitDistribution record, @Param("example") CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CitDistribution record);
+}
\ No newline at end of file

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

@@ -76,6 +76,10 @@
                     <when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
                     <otherwise>CURRENT_TIMESTAMP,</otherwise>
                 </choose>
+                <choose>
+                    <when test="item.dataType != null">#{item.dataType,jdbcType=VARCHAR},</when>
+                    <otherwise>'',</otherwise>
+                </choose>
             </trim>
         </foreach>
         ;

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -1010,6 +1010,23 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                 sticky: true
             });
 
+            $stateProvider.state({
+                name: 'cit.reductionData.distributionTable',
+                url: '/distributionTable',
+                views: {
+                    '@cit.reductionData': {
+                        controller: ['$scope', '$stateParams', 'appTranslation',
+                            function ($scope, $stateParams, appTranslation) {
+                                appTranslation.load([appTranslation.cit]);
+                            }],
+                        template: '<cit-distribution-table></cit-distribution-table>',
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
+                deepStateRedirect: true,
+                sticky: true
+            });
+
             $stateProvider.state({
                 name: 'cit.reductionData.inputInvoice',
                 url: '/inputInvoice',

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

@@ -1140,5 +1140,13 @@
     "AssetEamMapping": "Asset Eam Mapping",
     "DisposalProfitAndLoss": "Disposal Profit And Loss",
     "TaxNetValue": "Tax Net Value",
-    "DisposalTaxBenefit": "Disposal Tax Benefit"
+    "DisposalTaxBenefit": "Disposal Tax Benefit",
+    "DistributionTable" : "Distribution Table",
+    "OrgName": "Organization Name",
+    "BusinessIncome": "Business Income",
+    "EmployeeRemuneration": "Employee Remuneration",
+    "TotalAssets": "Total Assets",
+    "DistributionRatio": "Distribution Ratio",
+    "DistributionAmount": "Distribution Amount",
+    "Subtotal": "Total"
 }
\ No newline at end of file

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

@@ -1194,7 +1194,14 @@
     "TaxNetValue": "资产的税务净值",
     "DisposalTaxBenefit": "处置的税收损益",
     "BackAdjustAmount" : "调整后金额",
-    "OperateDate" : "操作日期"
+    "OperateDate" : "操作日期",
+    "DistributionTable" : "总分机构分配表",
+    "OrgName": "机构名称",
+    "BusinessIncome": "营业收入",
+    "EmployeeRemuneration": "职工薪酬",
+    "TotalAssets": "资产总额",
+    "DistributionRatio": "分配比例",
+    "DistributionAmount": "分配税额"
 
 
 

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

@@ -343,6 +343,18 @@ citModule.controller('citLayoutController', ['$scope', '$rootScope', '$location'
                             permission: constant.citPermission.dataManage.assetEamMapping,
                             url: '#/cit/reductionData/assetEamMapping'
                         });
+                    }else if (data[constant.citPermission.dataManage.distributionTable]) {
+                        $scope.menus.push({
+                            name: 'reductionData', state: 'reductionData', num: 3,
+                            permission: constant.citPermission.dataManage.dataManageCode, url: '#/cit/reductionData'
+                        });
+                        subMenus.push({
+                            name: 'reductionData.distributionTable',
+                            state: 'reductionData.distributionTable',
+                            num: 3,
+                            permission: constant.citPermission.dataManage.distributionTable,
+                            url: '#/cit/reductionData/distributionTable'
+                        });
                     }
 
                     if (data[constant.citPermission.reportView.bsplCode]

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

@@ -2,10 +2,10 @@
     <div class="nav-wrapper">
         <div class="nav-header">{{'AssetList' | translate}}</div>
         <div class="nav-tab">
-            <span ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
-            <span class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span><span
-                ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span><span
-                ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
+            <span style="width: auto" class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
             <!--税会差异的选择-->
             <!--<div class="option" style="display: inline-block">-->
                 <!--<span>{{'TaxAccountDifference' | translate}}</span>-->

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less

@@ -415,7 +415,7 @@
     min-width: 370px;
 
     .arrow {
-        left: 5% !important;
+        left: 0px;
     }
 }
 
@@ -423,9 +423,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js

@@ -86,6 +86,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
                 name: 'assetEamMapping', permission: constant.citPermission.dataManage.assetEamMapping,
                 text: $translate.instant('AssetEamMapping'), icon: 'fa fa-map'
             },
+            {
+                name: 'distributionTable', permission: constant.citPermission.dataManage.distributionTable,
+                text: $translate.instant('DistributionTable'), icon: 'fa fa-map'
+            },
             ];
         }
         else {

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -302,14 +302,14 @@
                     { name: $translate.instant('DocumentDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>' },
                     { name: $translate.instant('JournalSource'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>' },
                     { name: $translate.instant('JournalCategory'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>' },
-                    { name: $translate.instant('JournalName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.name}}</span></div>' },
+                    { name: $translate.instant('JournalName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' },
                     { name: $translate.instant('DocumentNo'),  width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>' },
-                    { name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>' },
+                    { name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span></div>' },
                     { name: $translate.instant('MainBodyCode'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgCode}}</span></div>' },
                     { name: $translate.instant('MainBodyDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}</span></div>' },
                     // { name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' },
                     { name: $translate.instant('AccountCode'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectCode}}</span></div>' },
-                    { name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectName}}</span></div>' },
+                    { name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.subjectName}}">{{row.entity.subjectName}}</span></div>' },
                     // { name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' },
                     // { name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
                     // { name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' },

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js

@@ -39,15 +39,8 @@
                 pageInfo: {},
                 periodStart: '',
                 periodEnd: '',
-                // orgId: '',
-                // segment3: null,
-                // segment3Name: null,
-                // segment5: null,
-                // segment5Name: null,
-                // segment6: null,
-                // segment6Name: null,
-                // description: null,
-                // containsAdjustmentRecord: null
+                accountCode: '',
+                accountDescription: '',
                 projectId: vatSessionService.project.id
             };
         };
@@ -157,35 +150,20 @@
             //     $scope.queryParams.periodEnd = $scope.queryParams.periodStart;
             // }
 
-            //设置需要去掉的查询条件的值为空
-            // if (!PWC.isNullOrEmpty(removeData)) {
-            //     var removeItem = removeData.split("|");
-            //     removeItem.forEach(function (v) {
-            //         $scope.queryParams[v] = null;
-            //
-            //         if ($scope.queryParams.segment3 === null) {
-            //             $scope.queryParams.segment3 = '';
-            //         }
-            //         if ($scope.queryParams.segment3Name === null) {
-            //             $scope.queryParams.segment3Name = '';
-            //         }
-            //         if ($scope.queryParams.segment5 === null) {
-            //             $scope.queryParams.segment5Name = '';
-            //         }
-            //         if ($scope.queryParams.segment6 === null) {
-            //             $scope.queryParams.segment6 = '';
-            //         }
-            //         if ($scope.queryParams.segment6Name === null) {
-            //             $scope.queryParams.segment6Name = '';
-            //         }
-            //         if ($scope.queryParams.description === null) {
-            //             $scope.queryParams.description = '';
-            //         }
-            //         if ($scope.queryParams.invoiceType === null) {
-            //             $scope.InvoiceType.selected = undefined;
-            //         }
-            //     });
-            // }
+            设置需要去掉的查询条件的值为空
+            if (!PWC.isNullOrEmpty(removeData)) {
+                var removeItem = removeData.split("|");
+                removeItem.forEach(function (v) {
+                    $scope.queryParams[v] = null;
+
+                    if ($scope.queryParams.accountCode === null) {
+                        $scope.queryParams.accountCode = '';
+                    }
+                    if ($scope.queryParams.accountDescription === null) {
+                        $scope.queryParams.accountDescription = '';
+                    }
+                });
+            }
 
             loadJournalEntryDataFromDB(1);
             if ($scope.criteriaList.length > 6) {
@@ -310,7 +288,7 @@
                 enableHorizontalScrollbar : 1,
                 columnDefs: [
                     { name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
-                    { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
+                    { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.accountDescription}}">{{row.entity.accountDescription}}<span></div>' },
                     { name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
                     { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
                     { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html

@@ -8,8 +8,9 @@
                 data-templateurl="/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
-        <span translate="TrialBalanceGeneVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <span translate="TrialBalanceGeneVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none;" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js

@@ -42,15 +42,9 @@
                 pageInfo: {},
                 periodStart: '',
                 periodEnd: '',
-                // orgId: '',
-                // segment3: null,
-                // segment3Name: null,
-                // segment5: null,
-                // segment5Name: null,
-                // segment6: null,
-                // segment6Name: null,
-                // description: null,
-                // containsAdjustmentRecord: null
+                accountCode: '',
+                accountDescription: '',
+                attribute : '',
                 projectId: vatSessionService.project.id
             };
         };
@@ -160,35 +154,23 @@
             //     $scope.queryParams.periodEnd = $scope.queryParams.periodStart;
             // }
 
-            //设置需要去掉的查询条件的值为空
-            // if (!PWC.isNullOrEmpty(removeData)) {
-            //     var removeItem = removeData.split("|");
-            //     removeItem.forEach(function (v) {
-            //         $scope.queryParams[v] = null;
-            //
-            //         if ($scope.queryParams.segment3 === null) {
-            //             $scope.queryParams.segment3 = '';
-            //         }
-            //         if ($scope.queryParams.segment3Name === null) {
-            //             $scope.queryParams.segment3Name = '';
-            //         }
-            //         if ($scope.queryParams.segment5 === null) {
-            //             $scope.queryParams.segment5Name = '';
-            //         }
-            //         if ($scope.queryParams.segment6 === null) {
-            //             $scope.queryParams.segment6 = '';
-            //         }
-            //         if ($scope.queryParams.segment6Name === null) {
-            //             $scope.queryParams.segment6Name = '';
-            //         }
-            //         if ($scope.queryParams.description === null) {
-            //             $scope.queryParams.description = '';
-            //         }
-            //         if ($scope.queryParams.invoiceType === null) {
-            //             $scope.InvoiceType.selected = undefined;
-            //         }
-            //     });
-            // }
+            设置需要去掉的查询条件的值为空
+            if (!PWC.isNullOrEmpty(removeData)) {
+                var removeItem = removeData.split("|");
+                removeItem.forEach(function (v) {
+                    $scope.queryParams[v] = null;
+
+                    if ($scope.queryParams.accountCode === null) {
+                        $scope.queryParams.accountCode = '';
+                    }
+                    if ($scope.queryParams.accountDescription === null) {
+                        $scope.queryParams.accountDescription = '';
+                    }
+                    if ($scope.queryParams.attribute === null) {
+                        $scope.queryParams.attribute = '';
+                    }
+                });
+            }
 
             loadJournalEntryDataFromDB(1);
             if ($scope.criteriaList.length > 6) {
@@ -314,7 +296,7 @@
                 columnDefs: [
                     { name: $translate.instant('Attribute'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute}}<span></div>' },
                     { name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
-                    { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
+                    { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.accountDescription}}">{{row.entity.accountDescription}}<span></div>' },
                     { name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
                     { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
                     { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html

@@ -8,8 +8,9 @@
                 data-templateurl="/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
-        <span translate="TrialBalanceMappingVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <span translate="TrialBalanceMappingVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html

@@ -3,7 +3,7 @@
         <span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
         <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
-        <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
+        <span ng-click="downloadJE()" style="float:right"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 
     <!--<div style="margin-bottom: 8px;margin-left: 30px">-->

atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html

+<div class="cit-distribution-table" id="mainPreviewDiv">
+    <div class="nav-wrapper">
+        <div class="nav-header">{{'DistributionTable' | translate}}</div>
+        <div class="nav-tab">
+            <span style="width: auto" ng-click="startCalculateData()">{{'startCaculateData' | translate}}</span>
+            <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
+        </div>
+    </div>
+    <!--<div class="top-area-wrapper" style="margin-top: 10px">-->
+        <!--<span translate="DistributionTable" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;-->
+        <!--<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>-->
+        <!--<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />-->
+        <!--<span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>-->
+    <!--</div>-->
+
+    <!--<div style="margin-bottom: 8px;margin-left: 30px">-->
+    <!--{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;-->
+    <!--{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;-->
+    <!--{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>-->
+    <!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
+    <!--</div>-->
+
+    <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
+        <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:
+        <span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+        <span ng-if="criteriaList.length>6"><br /></span>
+        <span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
+        <span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+    </div>
+
+    <div id="mainAreaDiv" class="main-area">
+        <div class="inputInvoiceGrid" ui-grid="gridOptions">
+            <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
+        </div>
+        <div class="pagination-container">
+            <span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.js

+citModule.directive('citDistributionTable', ['$log',
+    function ($log) {
+        $log.debug('citDistributionTable.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/reduction/cit-distribution-table/cit-distribution-table.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citDistributionTableController',
+            link: function ($scope, element) {
+
+            }
+        };
+    }
+]);
+
+
+

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -651,6 +651,7 @@ constant.citPermission = {
         dataManageCode: '03.003',
         accountMappingCode: '03.003.001',
         assetEamMapping: '03.003.002',
+        distributionTable: '03.003.003',
         accountMapping: {
             queryCode: '03.003.001.001',
             importCode: '03.003.001.002'

atms-web/src/main/webapp/app/common/webservices/citReport.svc.js

@@ -225,7 +225,18 @@
             initExportAEMData: function (citAssetsListDto) {
                 return $http.post('/citReport/exportAEMData', citAssetsListDto, apiConfig.create({ responseType: 'arraybuffer' }));
             },
-
+            /**
+             获取所得税分配表的数据
+             */
+            getDistributionTables : function(citAssetsListDto){
+                return $http.post('/citReport/getDistributionTables', citAssetsListDto, apiConfig.create());
+            },
+            /**
+             生成所得税分配表的
+             */
+            generateDistributionTable : function(projectId){
+                return $http.post('/citReport/generateDistributionTable/' + projectId, apiConfig.create());
+            },
         };
 
     }]);
\ No newline at end of file

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -188,6 +188,16 @@
                     allowHeaderFiltering: false,
                     width: '20%',
                     caption: $translate.instant('Status')
+                }, {
+                        dataField: "operator",
+                        allowHeaderFiltering: false,
+                        width: '10%',
+                        caption: $translate.instant('LogOperationUser')
+                    }, {
+                        dataField: "operateTime",
+                        allowHeaderFiltering: false,
+                        width: '10%',
+                        caption: $translate.instant('LogOperationTime')
                     }
                 ],
                 onContentReady: function (e) {

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -872,7 +872,7 @@
         var goRightPath = function (project) {
             // TODO: CIT 权限
             if (project.serviceTypeID === enums.serviceType.CIT) {
-                $state.go('cit.importData.balanceSheet');
+                $state.go('cit.importData.assetList');
             }
             else {
             var menuList = [