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/util/CommonUtil.java

@@ -35,4 +35,8 @@ public class CommonUtil {
         }
         return flag;
     }
+
+    public static BigDecimal  BigDecimal2Fix(BigDecimal bigDecimal){
+        return bigDecimal.setScale(2, BigDecimal.ROUND_DOWN);
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/common/util/StringUtil.java

@@ -88,4 +88,7 @@ public class StringUtil {
         //ARE_YOU_DOU_BI_YELLOWCONG
         System.out.println(camel2Underline(camel));
     }*/
+
+
+
 }

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

@@ -286,9 +286,9 @@ public class CitImportExcelServiceImpl extends BaseService {
             }
             citJournal.setAttribute3(CitCommonUtil.getValue(rowData.getCell(38)).toString());
             citJournal.setAttribute4(CitCommonUtil.getValue(rowData.getCell(39)).toString());
-            citJournal.setAttribute5(CitCommonUtil.getValue(rowData.getCell(40)).toString());
-            citJournal.setAttribute6(CitCommonUtil.getValue(rowData.getCell(41)).toString());
-            citJournal.setAttribute7(CitCommonUtil.getValue(rowData.getCell(42)).toString());
+            citJournal.setAttribute5(CitCommonUtil.getValue(rowData.getCell(40)).toString().replace(".0",""));
+            citJournal.setAttribute6(CitCommonUtil.getValue(rowData.getCell(41)).toString().replace(".0",""));
+            citJournal.setAttribute7(CitCommonUtil.getValue(rowData.getCell(42)).toString().replace(".0",""));
             citJournal.setAttribute8(CitCommonUtil.getValue(rowData.getCell(43)).toString());
             citJournal.setAttribute9(CitCommonUtil.getValue(rowData.getCell(44)).toString());
             citJournal.setAttribute10(CitCommonUtil.getValue(rowData.getCell(45)).toString());

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

@@ -418,7 +418,7 @@
         attribute16,
         created_by, created_date, late_updated_by,
         late_updated_date, create_time, update_time,is_select
-        from cit_journal_entry_adjust where period like #{record.period}
+        from cit_journal_entry_adjust where period like CONCAT('%' ,#{record.period},'%')
         <if test="orgList != null and orgList.size > 0">
             AND organization_id in
             <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
@@ -450,7 +450,7 @@
         accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
         attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
         attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
-        from journal_entry where tms_period like #{record.period}
+        from journal_entry where tms_period like CONCAT('%' ,#{record.period},'%')
         <if test="orgList != null and orgList.size > 0">
             AND organization_id in
             <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">

atms-web/src/main/webapp/Scripts/app.js

@@ -363,7 +363,9 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
                 systemId: '2500',
                 //当前用户ID
                 userId: loginContext.localName,
-                textStyle: 'rgba(0,0,0,0.15)',
+                textStyle: 'rgba(0,0,0,0.05)',
+                imgHeightDis: 230,
+                imgWidthDis: 230,
                 containerEl: document.querySelector('body')
             });
     

atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js

@@ -1121,7 +1121,7 @@
             });
         };
 
-        var loadCellData = function (period, orgId) {
+        var loadCellData = function (period) {
             //period = Number(period);
             if ($scope.templateId !== undefined) {
                 //todo: according to templateId and period get reportId
@@ -2841,10 +2841,8 @@
                 }
                 var _date = tempYear.toString() + tempMonth;
                 _date = Number(_date);
-                if ($scope.relation.orgId != null) {
-                    $scope.relation.period = _date;
-                    loadCellData(_date, $scope.relation.orgId);//默认当前月
-                }
+                $scope.relation.period = _date;
+                loadCellData(_date, $scope.relation.orgId);//默认当前月
             }
         };
 
@@ -3089,7 +3087,7 @@
                     $scope.relation.lockCell($scope.spread);
                     //关闭弹出层
                     $('#busy-indicator-container').hide();
-                    spreadTODb();
+
                 }, function (e) {
                     alert(e.errorMessage);
                     if (e.errorCode === 2/*noPassword*/ || e.errorCode === 3 /*invalidPassword*/) {
@@ -3144,7 +3142,7 @@
                 sheet.setValue(42, 2, $scope._ebitResult.sixAddtax);
                 sheet.setValue(43, 2, $scope._ebitResult.klzcjsz);
             }
-
+            setTimeout(function(){spreadTODb();}, 1000)
         }
 
         $scope.singleExport = function () {