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

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

@@ -119,6 +119,7 @@ public class CellCommentController {
     @RequestMapping("addLog")
     public OperationResultDto addLog(@RequestBody List<OperationLogEntryLog> operationLogEntryLogs) {
         for (OperationLogEntryLog operationLogEntryLog : operationLogEntryLogs) {
+            operationLogEntryLog.setMyId(distributedIdService.nextId());
             operationLogEntryLogMapper.insert(operationLogEntryLog);
         }
         OperationResultDto<Object> objectOperationResultDto = new OperationResultDto<>();

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

@@ -183,10 +183,7 @@ public class FormulaAgent {
     public static String _buildSql(String getField, String tableName, String filter, String filterValue, Integer period, FormulaContext formulaContext, Integer year, boolean bool, boolean getSql) throws Exception {
         String sql = "";
         //统一判断年度
-        Calendar cal = Calendar.getInstance();
-        int currentYear = cal.get(Calendar.YEAR);
-        year  =  currentYear + year;
-
+        year  = formulaContext.getYear() + year;
         if(getSql){
             tableName = tableName.toLowerCase();
             sql = "select  *  from " + tableName + " where 1=1  and " + filter + filterValue;

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

@@ -132,7 +132,7 @@
 
         //确定
         $scope.makeSure = function () {
-            $scope.relObj.checkRadio = $scope.checkRadio;
+            $scope.relObj.checkRadio = $scope.check;
             $('#entryListModal').modal('hide');
         }
 

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

@@ -28,17 +28,17 @@
             </div>
             <div class="row backColor" style="margin-right: 0px;">
                <div class="col-sm-3 ">
-                   <input type="radio" name ="checkRadio" ng-model = "checkRadio" ng-value="entry.JFFSETotal" > <h4 translate="JFFSETotal"></h4>:{{entry.JFFSETotal}}
+                   <input type="radio" name ="checkRadio" ng-model = "check.checkRadio1" ng-value="entry.JFFSETotal" > <h4 translate="JFFSETotal"></h4>:{{entry.JFFSETotal}}
                </div>
                 <div class="col-sm-3 ">
-                    <span><input type="radio"   name ="checkRadio" ng-model = "checkRadio" ng-value="entry.DFFSETotal" > <h4 translate="DFFSETotal"></h4>:{{entry.DFFSETotal}}</span>
+                    <span><input type="radio"   name ="checkRadio" ng-model = "check.checkRadio2" ng-value="entry.DFFSETotal" > <h4 translate="DFFSETotal"></h4>:{{entry.DFFSETotal}}</span>
                 </div>
 
                 <div class="col-sm-3 ">
-                    <input type="radio" name ="checkRadio"  ng-model = "checkRadio" ng-value="entry.QMYETotalFirst" > <h4 translate="QMYETotalFirst"></h4>:{{entry.QMYETotalFirst}}
+                    <input type="radio" name ="checkRadio"  ng-model = "check.checkRadio3" ng-value="entry.QMYETotalFirst" > <h4 translate="QMYETotalFirst"></h4>:{{entry.QMYETotalFirst}}
                 </div>
                 <div class="col-sm-3 ">
-                    <input type="radio"   name ="checkRadio" ng-model = "checkRadio" ng-value="entry.QMYETotalend" > <h4 translate="QMYETotalend"></h4>:{{entry.QMYETotalend}}
+                    <input type="radio"   name ="checkRadio" ng-model = "check.checkRadio4" ng-value="entry.QMYETotalend" > <h4 translate="QMYETotalend"></h4>:{{entry.QMYETotalend}}
                 </div>
             </div>
             <div class="row">

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

@@ -1538,10 +1538,12 @@
         //监听穿透返回值（调整后金额）
         $scope.$watch('relObj.checkRadio', function (n, o) {
             if ($scope.detail.entryIndex != undefined) {
-                $scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustBack = n;
+                $scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustAccount = n;
                 calculateSum(n);
             }
         });
+        var
+
 
         //重新计算合计值
         var calculateSum = function (n) {