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

atms-api/src/main/java/pwc/taxtech/atms/common/POIUtil.java

@@ -117,7 +117,7 @@ public class POIUtil {
         return row;
     }
 
-    public static Row createAndCloneRow(Workbook wb ,Sheet sheet, Integer destRowIndex,Row fromRow) {
+    public static Row createAndCloneRow(Workbook wb , Sheet sheet, Integer destRowIndex, Row fromRow) {
         Row toRow = null;
         if (sheet.getRow(destRowIndex) != null) {
             int lastRowNo = sheet.getLastRowNum();
@@ -136,10 +136,6 @@ public class POIUtil {
                                 boolean copyValueFlag) {
         CellStyle newstyle=wb.createCellStyle();
         copyCellStyle(wb,srcCell.getCellStyle(), newstyle);
-        if(srcCell.getColumnIndex()==7){
-            newstyle.setLocked(false);
-        }
-
 //        distCell.setEncoding(srcCell.getEncoding());
         //样式
         distCell.setCellStyle(newstyle);

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

@@ -10,15 +10,16 @@ public class TaxesCalculateReportEnum {
         Column_1(0, "序号"),
         Column_2(1, "收入类型名称"),
         Column_3(2, "税金项目"),
-        Column_4(3, "账载收入-明细"),
-        Column_5(4, "销项开票收入数-专票"),
-        Column_6(5, "销项开票收入数-普票"),
-        Column_7(6, "计税基数(应税收入）"),
-        Column_8(7, "税率"),
-        Column_9(8, "税额(元)"),
-        Column_10(9, "收入类别"),
-        Column_11(10, "计税方式"),
-        Column_12(11, "备注")
+        Column_4(3, "期间"),
+        Column_5(4, "账载收入-明细"),
+        Column_6(5, "销项开票收入数-专票"),
+        Column_7(6, "销项开票收入数-普票"),
+        Column_8(7, "计税基数(应税收入）"),
+        Column_9(8, "税率"),
+        Column_10(9, "税额(元)"),
+        Column_11(10, "收入类别"),
+        Column_12(11, "计税方式"),
+        Column_13(12, "备注")
         ;
         private Integer index;
         private String name;

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

@@ -10,9 +10,12 @@ import pwc.taxtech.atms.dao.CitTbamMapper;
 import pwc.taxtech.atms.dpo.CitTbamDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.entity.CitJournalEntryAdjust;
+import pwc.taxtech.atms.entity.CitTbam;
 import pwc.taxtech.atms.vat.dao.JournalEntryMapper;
+import pwc.taxtech.atms.vat.dao.PeriodFormulaBlockMapper;
 import pwc.taxtech.atms.vat.entity.CellComment;
 import pwc.taxtech.atms.vat.entity.PeriodCellComment;
+import pwc.taxtech.atms.vat.entity.PeriodFormulaBlock;
 import pwc.taxtech.atms.vat.service.impl.CellCommentServiceImpl;
 
 import java.util.List;
@@ -63,4 +66,19 @@ public class CellCommentController {
         operationResultDto.setResultMsg("success");
         return  operationResultDto;
     }
+
+    @Autowired
+    private PeriodFormulaBlockMapper periodFormulaBlockMapper;
+    //更新调整后金额
+    @RequestMapping("updateAdjust")
+    public OperationResultDto updateAdjust(@RequestBody CitTbam[] citTbams){
+        OperationResultDto operationResultDto = new OperationResultDto();
+        CitTbam citTbam = new CitTbam();
+        for(CitTbam citTbam1 : citTbams){
+            citTbam.setId(citTbam1.getId());
+            citTbamMapper.updateByPrimaryKey(citTbam);
+        }
+        operationResultDto.setResultMsg("success");
+        return operationResultDto;
+    }
 }

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

@@ -162,6 +162,19 @@ public class MenuServiceImpl {
             menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75049");
             menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad29");
             menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad30");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74046");
+            menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad30");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74050");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74051");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d740510");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74052");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74053");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74054");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74055");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74056");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74057");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74058");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74059");
         }
         //        List<MenuDto> menus = getMenus(moduleId).stream().filter(x -> permissionNames.contains(x.getName())).collect(Collectors.toList());
         return menuIds;

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

@@ -190,15 +190,15 @@ public class TaxDocumentServiceImpl {
             taxDocument.setCreatorId(authUserHelper.getCurrentUserId());
             taxDocument.setUploadTime(new Date());
             taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
-            Long id = taxDocumentMapper.insert(taxDocument);
+            int num = taxDocumentMapper.insert(taxDocument);
             //根据公司Id 设置业务线
             String businessLine = organizationService.queryBusinessByCompanyId(taxDocument.getCompanyId());
             if (StringUtils.isNotBlank(businessLine)) {
                 taxDocument.setBusinessLine(businessLine);
             }
-            if (id > 0) {
+            if (num > 0) {
                 OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
-                actionEntity.setId(id.toString());
+                actionEntity.setId(taxDocument.getId().toString());
                 actionEntity.setOperationAction("新增");
                 actionEntity.setUpdateState(taxDocument.toString());
                 boolean result = operationLogTaxDocService.addTaxDocumentList(actionEntity);

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

@@ -258,7 +258,12 @@ public class TemplateGroupServiceImpl extends AbstractService {
                         cellTemplate.setCreateTime(now);
                         cellTemplate.setUpdateTime(now);
                         cellTemplate.setRowIndex(r);
-                        cellTemplate.setRowName(StringUtils.EMPTY);
+                        //税金计算表单独处理
+                        if("VAT020".equals(template.getCode())){
+                            cellTemplate.setRowName(POIUtil.getCellFormulaString(cell));
+                        }else{
+                            cellTemplate.setRowName(StringUtils.EMPTY);
+                        }
                         cellTemplate.setColumnName(StringUtils.EMPTY);
                         cellTemplate.setComment(StringUtils.EMPTY);
                         cellTemplate.setCopyFromId(0L);
@@ -406,6 +411,10 @@ public class TemplateGroupServiceImpl extends AbstractService {
                             continue;//todo cell == null 如何处理
                         }
                         CellTemplate cellTemplate = new CellTemplate();
+                        //税金计算表单独处理
+                        if("VAT020".equals(template.getCode())){
+                            cellTemplate.setRowName(POIUtil.getCellFormulaString(cell));
+                        }
                         cellTemplate.setColumnIndex(c);
                         cellTemplate.setCreateTime(now);
                         cellTemplate.setUpdateTime(now);

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

@@ -8,18 +8,12 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pwc.taxtech.atms.common.util.MyAsserts;
-import pwc.taxtech.atms.constant.DataSourceName;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
 import pwc.taxtech.atms.dpo.CellTemplatePerGroupDto;
-import pwc.taxtech.atms.dto.vatdto.BBParasBo;
-import pwc.taxtech.atms.dto.vatdto.CurrentPeriodBo;
 import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
 import pwc.taxtech.atms.dto.vatdto.WPNAMEParasBo;
-import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.exception.FormulaException;
-import pwc.taxtech.atms.vat.entity.PeriodCellData;
-import pwc.taxtech.atms.vat.entity.PeriodDataSource;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -65,7 +59,7 @@ public class WPNAME extends FunctionBase implements FreeRefFunction {
             MyAsserts.assertNotEmpty(cellTemplateDataList, Exceptions.BB_CELL_TEMP_NULL);
             cellTemplateData = cellTemplateDataList.get(0);
             int index = ec.getWorkbook().getSheetIndex(bo.getReportCode());
-            cellValue = getCellValue(index, ec, formulaContext, agent, cellTemplateData.getRowIndex(), bo.getColumnIndex() - 1,
+            cellValue = getCellValue(index, ec, formulaContext, agent, cellTemplateData.getRowIndex(), "VAT020".equals(bo.getReportCode())?bo.getColumnIndex():(bo.getColumnIndex() - 1),
                         Long.parseLong(cellTemplateData.getCellTemplateId()));
             nullCellDto.extractFromGroup(bo, formulaContext.getPeriod(), formulaContext.getYear(), cellTemplateData);
             nullCellDto.setAmount(cellValue);

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

@@ -41,7 +41,7 @@ public interface TaxDocumentMapper extends MyMapper {
      *
      * @mbg.generated
      */
-    Long insert(TaxDocument record);
+    int insert(TaxDocument record);
 
     /**
      * This method was generated by MyBatis Generator.

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

@@ -33,6 +33,15 @@ public class CitTbam extends BaseEntity implements Serializable {
      * @mbg.generated
      */
     private String organizationId;
+    private Long adjustAccount;
+
+    public Long getAdjustAccount() {
+        return adjustAccount;
+    }
+
+    public void setAdjustAccount(Long adjustAccount) {
+        this.adjustAccount = adjustAccount;
+    }
 
     /**
      * Database Column Remarks:
@@ -623,28 +632,25 @@ public class CitTbam extends BaseEntity implements Serializable {
      */
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", organizationId=").append(organizationId);
-        sb.append(", projectId=").append(projectId);
-        sb.append(", date=").append(date);
-        sb.append(", source=").append(source);
-        sb.append(", period=").append(period);
-        sb.append(", accountPeriod=").append(accountPeriod);
-        sb.append(", attribute=").append(attribute);
-        sb.append(", accountCode=").append(accountCode);
-        sb.append(", accountDescription=").append(accountDescription);
-        sb.append(", debitAmount=").append(debitAmount);
-        sb.append(", creditAmount=").append(creditAmount);
-        sb.append(", beginningBalance=").append(beginningBalance);
-        sb.append(", endingBalance=").append(endingBalance);
-        sb.append(", createBy=").append(createBy);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append("]");
-        return sb.toString();
+        return "CitTbam{" +
+                "id=" + id +
+                ", organizationId='" + organizationId + '\'' +
+                ", adjustAccount=" + adjustAccount +
+                ", projectId='" + projectId + '\'' +
+                ", date=" + date +
+                ", source='" + source + '\'' +
+                ", period=" + period +
+                ", accountPeriod=" + accountPeriod +
+                ", attribute='" + attribute + '\'' +
+                ", accountCode='" + accountCode + '\'' +
+                ", accountDescription='" + accountDescription + '\'' +
+                ", debitAmount=" + debitAmount +
+                ", creditAmount=" + creditAmount +
+                ", beginningBalance=" + beginningBalance +
+                ", endingBalance=" + endingBalance +
+                ", createBy='" + createBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
     }
 }
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import pwc.taxtech.atms.vat.entity.PeriodFormulaBlock;
 import pwc.taxtech.atms.vat.entity.PeriodFormulaBlockExample;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface PeriodFormulaBlockMapper extends MyVatMapper {
@@ -109,4 +110,6 @@ public interface PeriodFormulaBlockMapper extends MyVatMapper {
 
     void updateReportId(@Param("reportId") Long reportId, @Param("cellTemplateConfigIds") List<Long> cellTemplateConfigIds,
                         @Param("period") Integer period, @Param("projectId") String projectId);
+
+    List<PeriodFormulaBlock> selectByWhere(Map<String,Object> map);
 }
\ No newline at end of file

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

@@ -88,13 +88,12 @@
         select
         id as id,
         attribute attribute,
-
         account_code as accountCode,
         account_description accountDescription,
         debit_amount as debitAmount ,
         credit_amount as creditAmount,
         beginning_balance as beginningBalance,
-        ending_balance as endingBalance
+        IFNULL(adjust_account, ending_balance) as endingBalance
         <if test="sql != null and sql != '' ">
             ${sql}
         </if>

atms-web/src/main/webapp/Gruntfile.js

@@ -215,6 +215,7 @@ grunt.initConfig({
         util: {
             src: ["Scripts/underscore.js",
                 "Scripts/arrgh.js",
+                "Scripts/tableau-2.2.2.min.js",
                 "Scripts/jquery.page.js",
                 "Scripts/jquery.floatThead.js",
                 "Scripts/jquery.dataTables.js",

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

@@ -1682,4 +1682,23 @@ var analysisModule = angular.module('app.analysis', ['ui.grid', 'ui.router','ui.
                 sticky: true
             });
 
+            //分析dashboard
+            $stateProvider.state({
+                name: 'unreturnedTax',
+                url: "/analysis/unreturnedTax",
+                dsr: true,
+                views: {
+                    'importContent': {
+                        controller: ['$scope', '$state','appTranslation',
+                            function ($scope, $state, appTranslation) {
+                                $scope.state = $state;
+                                appTranslation.load([appTranslation.appPart]);
+                            }],
+                        template: '<unreturned-tax></unreturned-tax>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.analysis),
+                sticky: true
+            });
+
         }]);
\ No newline at end of file

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

@@ -893,6 +893,17 @@
     "InternationalDataImport":"国际税数据",
     "TBEBITForm":"TB EBIT 表格",
     "ClickEnsureTip": "请点击确定按钮!",
+    "MenuUnreturnedTax": "未返还税金分析",
+    "MenuTaxComparison": "未返还/返还后税金比较",
+    "MenuCostAnalysis": "费用分析",
+    "MenuProfitAndLoss": "利润/亏损分析",
+    "MenuOtherDomesticData": "其他国内数据",
+    "MenuDocSituation": "档案归档情况",
+    "MenuGlobalOverview": "全球概览",
+    "MenuMexicanTax": "墨西哥税务分析",
+    "MenuAustralianTax": "澳洲税务分析",
+    "MenuBrazilianTax": "巴西税务分析",
+    "MenuOtherCountries": "其他国家税务分析",
 
     "true": "是",
     "false": "否",

atms-web/src/main/webapp/app/analysis/dashboard/unreturned-tax/unreturned-tax.ctrl.js

+analysisModule.controller('UnreturnedTaxController', ['$scope','$filter', '$log', '$translate', '$timeout',
+    function ($scope,$filter, $log, $translate, $timeout) {
+        'use strict';
+
+        function init() {
+            var placeholderDiv = document.getElementById('vizContainer');
+            var url = 'http://10.158.230.16:8890/trusted/b4TGi86ySyuKfWyvE8vnww==:Rel9fneoVyJ58IukJ5ve-_k1/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no';
+            var options = {
+                hideTabs: true,
+                width: "90%",
+                height: "500px",
+                onFirstInteractive: function() {
+                    // The viz is now ready and can be safely used.
+                    console.log("Run this code when the viz has finished     loading.");
+                }
+            };
+            $scope.viz = new tableau.Viz(placeholderDiv, url, options);
+        }
+        init();
+
+        (function initialize() {
+
+        })();
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/unreturned-tax/unreturned-tax.html

+<!--<script type='text/javascript' src='http://10.158.230.16:8890/javascripts/api/tableau-2.min.js'></script>-->
+<div class='tableauPlaceholder' style='width: 1920px; height: 848px;'>
+    <!--<object class='tableauViz' width='1920' height='848' style='display:none;'>-->
+        <!--<param name='host_url' value='http%3A%2F%2F10.158.230.16%3A8890%2F'/>-->
+        <!--<param name='embed_code_version' value='3'/>-->
+        <!--<param name='site_root' value=''/>-->
+        <!--<param name='name' value='Didi_Tax_20190307&#47;sheet8'/>-->
+        <!--<param name='tabs' value='no'/>-->
+        <!--<param name='toolbar' value='yes'/>-->
+        <!--<param name='showAppBanner' value='false'/>-->
+        <!--<param name='filter' value='iframeSizedToWindow=true'/>-->
+        <!--<param name="ticket" value="g2-zt7USSSmP7mPfZU2P1Q==:kZimvabueyV0_38cviKedMKz"/>-->
+    <!--</object>-->
+    <div id="vizContainer" style="display: flex; justify-content: center"></div>
+
+</div>
+
+<!--<iframe src="http://10.158.230.16:8890/trusted/JS6C48CESm6veO9zZqFLHw==:0dKT6t0QE0OeVhKYRQ7k471k/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no"-->
+        <!--width="800" height="600"></iframe>-->
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/unreturned-tax/unreturned-tax.js

+analysisModule.directive('unreturnedTax', ['$log',
+    function ($log) {
+        'use strict';
+        return {
+            restrict: 'E',
+            templateUrl: '/app/analysis/dashboard/unreturned-tax/unreturned-tax.html' + '?_=' + Math.random(),
+            scope: {
+                serviceTypeId: "=?",
+                periodId: "=?"
+            },
+            controller: 'UnreturnedTaxController',
+            link: function (scope, element) {
+
+            }
+        };
+         
+    }
+]); 
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/unreturned-tax/unreturned-tax.less

+@import "~/app-resources/less/theme.less";
\ No newline at end of file

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

 citModule.controller('entryListModalController', ['$log', 'apiInterceptor', 'Upload', '$scope', '$q', '$translate', '$uibModal', '$document', '$rootScope', 'SweetAlert', 'enums',
-    'vatReportService', 'loginContext', 'vatSessionService', 'stdAccountService', 'vatCommonService', 'formulaService', 'KeyValueConfigService', 'modelConfigurationService', '$timeout', 'cellCommentService', 'modifiedReportCellService',
+    'vatReportService', 'loginContext', 'vatSessionService', 'stdAccountService', 'vatCommonService', 'formulaService', 'KeyValueConfigService', 'modelConfigurationService', '$timeout', 'cellCommentService', 'modifiedReportCellService','commonWebService',
     function ($log, apiInterceptor, Upload, $scope, $q, $translate, $uibModal, $document, $rootScope, SweetAlert, enums, vatReportService, loginContext,
-              vatSessionService, stdAccountService, vatCommonService, formulaService, KeyValueConfigService, modelConfigurationService, $timeout, cellCommentService, modifiedReportCellService) {
+              vatSessionService, stdAccountService, vatCommonService, formulaService, KeyValueConfigService, modelConfigurationService, $timeout, cellCommentService, modifiedReportCellService,commonWebService) {
 
 
         var entityInit = function () {
@@ -13,7 +13,10 @@
                 QMYETotalend: ""
             }
         }
+
+        $scope.relObj.logs = [];
         entityInit();
+
         $scope.dataGridOptions = {
             bindingOptions: {
                 columns: 'entryListColumns',
@@ -48,7 +51,8 @@
                  $log.debug($scope.selectedItems);*/
                 $scope.doCalcute(selectedItems.selectedRowsData);
                 //更新日志
-                $scope.relObj
+                var _data = selectedItems.selectedRowsData;
+                $scope.relObj.logs = commonWebService._index(_data);
 
             },
             allowColumnResizing: true,
@@ -58,7 +62,6 @@
             showColumnLines: true,
         };
 
-
         //设置数据源表格的列
         var getEntryListColumns = function () {
             var dataGridColumns;
@@ -110,23 +113,21 @@
         $scope.makeSure = function () {
             $scope.relObj.checkRadio = $scope.checkRadio;
             $('#entryListModal').modal('hide');
-
         }
 
         $scope.cancel = function () {
             $('#entryListModal').modal('hide');
-            entityInit();
+            //entityInit();
         }
 
         $scope.hideCellAttachmentModel = function () {
             $('#entryListModal').modal('hide');
-            entityInit();
+            //entityInit();
         }
 
         //
         //配置计算公式进行计算
         $scope.doCalcute = function (data) {
-            debugger;
             var v1 = 0;//借方发生额合计
             var v2 = 0//贷方发生额合计
             var _index = 0;
@@ -135,8 +136,8 @@
                     v1 = parseFloat(item.accountedDr);
                     v2 = parseFloat(item.accountedCr);
                 } else {
-                    v1 += v1 + parseFloat(item.accountedDr);
-                    v2 += v2 + parseFloat(item.accountedCr);
+                    v1 +=  parseFloat(item.accountedDr);
+                    v2 +=  parseFloat(item.accountedCr);
                 }
                 _index++;
             });
@@ -146,10 +147,5 @@
             $scope.entry.QMYETotalend = v1 - v2;
         }
 
-
-        $scope.showLog = function () {
-            alert('查看日志');
-        }
-
     }
 ]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.js

@@ -4,7 +4,8 @@ function ($log) {
         restrict: 'E',
         templateUrl: '/app/cit/report/entryList-modal/entryList-modal.html' + '?_=' + Math.random(),
         scope: {
-            relObj : '='
+            relObj : '=',
+            showLog :'&'
         },
         controller: 'entryListModalController',
         link: function ($scope, $element, $attr) {

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

@@ -6,7 +6,7 @@
         $scope.dataGridOptions = {
             bindingOptions: {
                 columns: 'entryLogColumns',
-                dataSource: 'relObj.entryLogSource'
+                dataSource: 'relObj.logs'
             },
             loadPanel: {
                 enabled: false
@@ -73,7 +73,9 @@
 
         $scope.entryLogColumns = getEntryLogColumns();
 
+       /* $scope.$watch('relObj.logs', function (n,o) {
 
+        });*/
         $scope.hideCellAttachmentModel = function () {
             $('#entryListModal').modal('hide');
         }

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.html

-<div class="modal fade" id="entryListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="entryLogModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog modal-lg" style="width: 1200px;">
         <div class="modal-content">
             <div class="modal-header">

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -228,6 +228,24 @@
             }
             $scope.hidePanel();
             vatCommonService.setProjectStatus(vatSessionService.project.id, vatSessionService.month, status, null, null);
+            if($scope.detail.cellType == enums.formulaDataSourceType.CIT_TBAM){//
+                [$scope.detail.entryIndex].adjustBack
+                var updateAdjustDto = [];
+                $scope.detail.dataGridSourceBind.forEach(function(e, index){
+                    if(e.adjustBack != undefined && e.adjustBack != null){
+                        updateAdjustDto.push({
+                            id : e.id,
+                            adjustAccount :e.adjustBack
+                        });
+                    }
+                });
+                cellCommentService.updateAdjust(updateAdjustDto).success(function (res) {
+                }).error(function (error) {
+                    if(error){
+                        alert("调整金额数据更新失败");
+                    }
+                });
+            }
         };
 
 
@@ -692,6 +710,7 @@
                     + '    ' + evalVal.formatAmount(precition));
             }else if($scope.selectedTabIndex === enums.formulaDataSourceType.CIT_TBAM){
                 evalVal = _.reduce($scope.detail.dataGridSource, function (memo, x) {
+                    debugger;
                     return memo + x.endBalance;
                 }, 0);
                 $("#dataGridFooterSummary").html($translate.instant('Conclusion')
@@ -1524,17 +1543,33 @@
         $scope.$watch('relObj.checkRadio', function (n, o) {
             if($scope.detail.entryIndex != undefined){
                 $scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustBack = n;
+                calculateSum(n);
             }
         });
 
-        var loadAllDataForSum = function(){//加载合计值
+        //重新计算合计值
+        var calculateSum = function(n){
+            var precition = 2;
+            var evalVal = _.reduce($scope.detail.dataGridSourceBind, function (memo, x) {
+                if(x.accountCode == $scope.relObj.account){
+                    memo + n;
+                }else{
+                    return memo + x.endBalance;
+                }
+            }, 0);
+
+            $("#dataGridFooterSummary").html($translate.instant('Conclusion')
+                + '    ' + evalVal.formatAmount(precition));
+        }
 
+        $scope.entryShowLog= function(){//显示日志
+            $('#entryLogModal').modal('show');
         }
 
         //显示分录信息 同时加载数据
         $scope.loadEntryListDataList = function (e) {
             $scope.detail.entryIndex  = e.dataIndex;
-            debugger;
+            
             cellCommentService.loadEntryListDataList(e.data.accountCode).success(function (res) {
                 $scope.relObj.account = e.data.accountCode;
                 if (res.resultMsg == "success") {

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html

@@ -303,7 +303,7 @@
 
     <!--分录弹框-->
     <entry-list-modal id ="entryListId" rel-obj = "relObj" ></entry-list-modal>
-    <entry-Log id ="entryLogId" rel-obj = "relObj" ></entry-Log>
+    <entry-Log id ="entryLogId" rel-obj = "relObj"show-log = "entryShowLog" ></entry-Log>
 
 </div>
 

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

@@ -16,6 +16,9 @@ webservices.factory('cellCommentService', ['$http', 'apiConfig', function ($http
         },
         loadEntryListDataList: function (code) {
             return $http.get('/CellComment/loadEntryListDataList?code=' + code, apiConfig.createVat());
+        },
+        updateAdjust : function (data) {
+            return $http.post('/CellComment/updateAdjust', data, apiConfig.createVat());
         }
     };
 }]);
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-nav/app-nav.html

@@ -20,11 +20,6 @@
                 <span class="nav-icon-color">{{'MenuVAT' | translate}}</span>
             </a>
         </div>
-        <div class="nav-element-left">
-            <a ui-sref="listApproval">
-                <span class="nav-icon-color">{{'MenuListApproval' | translate}}</span>
-            </a>
-        </div>
         <div class="nav-element-left">
             <a ui-sref="overviewCit">
                 <span class="nav-icon-color">{{'MenuCIT' | translate}}</span>
@@ -40,6 +35,11 @@
                 <span class="nav-icon-color">{{'MenuAnalysis' | translate}}</span>
             </a>
         </div>
+        <div class="nav-element-left">
+            <a ui-sref="listApproval">
+                <span class="nav-icon-color">{{'MenuListApproval' | translate}}</span>
+            </a>
+        </div>
         <!--<div class="nav-element-left">-->
             <!--<a ui-sref="summaryDashboard" hover-show="second">-->
                 <!--<span class="nav-icon-color">{{'MenuTaxAnalysisPlatform' | translate}}</span>-->

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js

@@ -67,16 +67,16 @@ taxDocumentManageModule.factory('taxDocumentListService',
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/query4SelectionBox', params);
                 },
                 getCompanyNameOptions:function(params){
-                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/org/query4SelectionBox', params);
+                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/org/getMyOrgList', params);
                 },
                 delFileRecordItems:function(params){
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
                 },
                 getDocumentsAttrAndType:function(params){
-                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/v1/fileTypes/selectList', params);
+                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/selectList', params);
                 },
                 getBusinessList:function(params){
-                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/v1/businessunit/getlist', params);
+                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/businessunit/getlist', params);
                 },
                 downloadAllFile:function(params){
                     var xhr = new XMLHttpRequest();