Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

xxfp\去掉导出按钮

See merge request root/atms!169

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

@@ -119,7 +119,7 @@ public class FunctionBase {
         dataSource.setId(dataSourceId);
         dataSource.setType(FormulaDataSourceType.Report.getCode());
         dataSource.setName("ReportDataSource");
-        dataSource.setAmount(val);
+        dataSource.setAmount(val.setScale(0, BigDecimal.ROUND_HALF_DOWN));
         dataSource.setDescription("描述");
         dataSource.setCreateBy("Admin");
         dataSource.setUpdateBy("Admin");

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

@@ -140,6 +140,9 @@ public class XXFP extends FunctionBase implements FreeRefFunction {
     }
 
     private int getPeriodFromDate(String dateStr){
+        if(StringUtils.isBlank(dateStr)){
+            return -1;
+        }
         Date date = DateUtils.strToDate(dateStr);
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);

atms-api/src/main/resources/applicationContext.xml

@@ -43,7 +43,7 @@
   <bean id="sqlSessionFactory2" class="org.mybatis.spring.SqlSessionFactoryBean">
     <property name="dataSource" ref="datasource2"/>
     <property name="configLocation" value="classpath:sqlMapConfig.xml"/>
-    <property name="mapperLocations" value="classpath*:pwc/taxtech/atms/invoice/*Mapper.xml"/>
+    <property name="mapperLocations" value="classpath*:pwc/taxtech/atms/**/*Mapper.xml"/>
   </bean>
 
   <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">

atms-web/src/main/webapp/app/admin/basicData/masterData/businessUnit/business-unit.html

@@ -8,7 +8,6 @@
                         permission-code="{{$root.adminPermission.basicData.businessUnit.editCode}}">
                     <i class=" material-icons">add_circle_outline</i> <span translate="BusinessUnitAddNew"></span>
                 </button>              
-                <export-button style="float: right; margin-right: 15px; margin-top: 9px;"><export-button>
 </div>
 
             <div class="list-container">

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.html

@@ -35,10 +35,7 @@
                 </div>
             </div>
 
-            <div class="align-right" style="margin-top:5px;">
-                <!--<button class="btn btn-export" type="button" ng-click="" translate="Export"></button>-->
-                <!--<export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>-->
-            </div>
+
             <div class="right-operate ">
                  
                 <!-- board展示 -->

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -45,11 +45,6 @@
 
                             <button type="button" id="organizationIsActiveBtn" ng-if="hasEditPermission" class="btn" ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]" ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i ng-show="selectCompany.isActive" class="material-icons stop">block</i>{{selectCompany.isActiveStr}}</button>
 
-                            <span class="align-right">
-                                <!--<button class="btn btn-export" type="button" ng-click="" translate="Export"></button>-->
-                                <export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>
-                            </span>
-
                             <span class="right-operate ">
                                 <!-- board展示 -->
                                 <a class="display-user" href="#/organizationViewInfrastructure/organizationBusinessUnitView" title="{{'ShowAsCard' | translate}}"><i class="fa fa-th" aria-hidden="true"></i></a>