Skip to content

T
traffic-front
Commit 07b1cbc1 authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

xxfp\去掉导出按钮

See merge request root/atms!169
parents 7ba95455 d978f2c9
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 74 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FunctionBase.java
View file @ 07b1cbc1
......@@ -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
View file @ 07b1cbc1
......@@ -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
View file @ 07b1cbc1
......@@ -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-dao/src/main/resources/pwc/taxtech/atms/invoice/extends/OutputInvoiceExtendsMapper.xml
View file @ 07b1cbc1
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.invoice.OutputInvoiceMapper">
<resultMap id="OutputVATInvoiceInfoDto" type="pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto">
<id column="InvoiceID" jdbcType="VARCHAR" property="invoiceID"/>
<result column="INVOICE_TYPE" jdbcType="INTEGER" property="invoiceType"/>
<result column="INVOICE_TYPE" jdbcType="INTEGER" property="invoiceType"/>
<result column="INVOICE_TYPE_NAME" jdbcType="VARCHAR" property="invoiceTypeName"/>
<result column="CLASS_CODE" jdbcType="VARCHAR" property="classCode"/>
<result column="INVOICE_NUMBER" jdbcType="VARCHAR" property="invoiceNumber"/>
......@@ -115,65 +113,65 @@
</select>
<resultMap id="outputInvoiceDto" type="pwc.taxtech.atms.vat.dpo.OutputInvoiceDto">
<id property="invoiceID" column="INVOICE_ID"/>
<id property="invoiceID" jdbcType="VARCHAR" column="INVOICE_ID"/>
<association property="invoice" javaType="pwc.taxtech.atms.vat.entity.OutputInvoice">
<id column="INVOICE_ID" property="ID"/>
<id column="FPQQLSH" property="FPQQLSH" />
<result column="FPDM" property="FPDM" />
<result column="FPHM" property="FPHM" />
<result column="KPRQ" property="KPRQ" />
<result column="FPLXDM" property="FPLXDM" />
<result column="EWM" property="EWM" />
<result column="JQBH" property="JQBH" />
<result column="JYM" property="JYM" />
<result column="GFMC" property="GFMC" />
<result column="GFSH" property="GFSH" />
<result column="GFDZDH" property="GFDZDH" />
<result column="GFYHZH" property="GFYHZH" />
<result column="XFSH" property="XFSH" />
<result column="XFMC" property="XFMC" />
<result column="XFDZDH" property="XFDZDH" />
<id column="INVOICEID" jdbcType="VARCHAR" property="ID"/>
<id column="FPQQLSH" jdbcType="VARCHAR" property="FPQQLSH" />
<result column="FPDM" jdbcType="VARCHAR" property="FPDM" />
<result column="FPHM" jdbcType="VARCHAR" property="FPHM" />
<result column="KPRQ" jdbcType="VARCHAR" property="KPRQ" />
<result column="FPLXDM" jdbcType="VARCHAR" property="FPLXDM" />
<result column="EWM" jdbcType="VARCHAR" property="EWM" />
<result column="JQBH" jdbcType="VARCHAR" property="JQBH" />
<result column="JYM" jdbcType="VARCHAR" property="JYM" />
<result column="GFMC" jdbcType="VARCHAR" property="GFMC" />
<result column="GFSH" jdbcType="VARCHAR" property="GFSH" />
<result column="GFDZDH" jdbcType="VARCHAR" property="GFDZDH" />
<result column="GFYHZH" jdbcType="VARCHAR" property="GFYHZH" />
<result column="XFSH" jdbcType="VARCHAR" property="XFSH" />
<result column="XFMC" jdbcType="VARCHAR" property="XFMC" />
<result column="XFDZDH" jdbcType="VARCHAR" property="XFDZDH" />
<result column="XFYHZH" property="XFYHZH" />
<result column="BZ" property="BZ" />
<result column="SKR" property="SKR" />
<result column="FHR" property="FHR" />
<result column="KPR" property="KPR" />
<result column="KDDH" property="KDDH" />
<result column="KDUUID" property="KDUUID" />
<result column="FPLX" property="FPLX" />
<result column="KPZT" property="KPZT" />
<result column="FPZT" property="FPZT" />
<result column="YFPDM" property="YFPDM" />
<result column="YFPHM" property="YFPHM" />
<result column="GFGSBM" property="GFGSBM" />
<result column="XFGSBM" property="XFGSBM" />
<result column="SPBH" property="SPBH" />
<result column="XTLY" property="XTLY" />
<result column="CJSJ" property="CJSJ" />
<result column="INVOICE_HJJE" property="HJJE" />
<result column="HJSE" property="HJSE" />
<result column="JSHJ" property="JSHJ" />
<result column="XXBBH" property="XXBBH" />
<result column="DYZT" property="DYZT" />
<result column="GDJLH" property="GDJLH" />
<result column="INVOICE_ZKJE" property="ZKJE" />
<result column="INVOICE_ZKSE" property="ZKSE" />
<result column="ZKJSHJ" property="ZKJSHJ" />
<result column="SLV" property="SLV" />
<result column="QY" property="QY" />
<result column="JSZT" property="JSZT" />
<result column="KDGS" property="KDGS" />
<result column="SHZT" property="SHZT" />
<result column="THKPSQ" property="THKPSQ" />
<result column="JSFJ" property="JSFJ" />
<result column="SQR" property="SQR" />
<result column="BSCDM" property="BSCDM" />
<result column="BSC" property="BSC" />
<result column="QYDM" property="QYDM" />
<result column="SQBH" property="SQBH" />
<result column="HTBH" property="HTBH" />
<result column="SQRQ" property="SQRQ" />
<result column="YZRQ" property="YZRQ" />
<result column="BZ" jdbcType="VARCHAR" property="BZ" />
<result column="SKR" jdbcType="VARCHAR" property="SKR" />
<result column="FHR" jdbcType="VARCHAR" property="FHR" />
<result column="KPR" jdbcType="VARCHAR" property="KPR" />
<result column="KDDH" jdbcType="VARCHAR" property="KDDH" />
<result column="KDUUID" jdbcType="VARCHAR" property="KDUUID" />
<result column="FPLX" jdbcType="VARCHAR" property="FPLX" />
<result column="KPZT" jdbcType="VARCHAR" property="KPZT" />
<result column="FPZT" jdbcType="VARCHAR" property="FPZT" />
<result column="YFPDM" jdbcType="VARCHAR" property="YFPDM" />
<result column="YFPHM" jdbcType="VARCHAR" property="YFPHM" />
<result column="GFGSBM" jdbcType="VARCHAR" property="GFGSBM" />
<result column="XFGSBM" jdbcType="VARCHAR" property="XFGSBM" />
<result column="SPBH" jdbcType="VARCHAR" property="SPBH" />
<result column="XTLY" jdbcType="VARCHAR" property="XTLY" />
<result column="CJSJ" jdbcType="VARCHAR" property="CJSJ" />
<result column="INVOICE_HJJE" jdbcType="VARCHAR" property="HJJE" />
<result column="HJSE" jdbcType="VARCHAR" property="HJSE" />
<result column="JSHJ" jdbcType="VARCHAR" property="JSHJ" />
<result column="XXBBH" jdbcType="VARCHAR" property="XXBBH" />
<result column="DYZT" jdbcType="VARCHAR" property="DYZT" />
<result column="GDJLH" jdbcType="VARCHAR" property="GDJLH" />
<result column="INVOICE_ZKJE" jdbcType="VARCHAR" property="ZKJE" />
<result column="INVOICE_ZKSE" jdbcType="VARCHAR" property="ZKSE" />
<result column="ZKJSHJ" jdbcType="VARCHAR" property="ZKJSHJ" />
<result column="INVOICE_SLV" jdbcType="VARCHAR" property="SLV" />
<result column="QY" jdbcType="VARCHAR" property="QY" />
<result column="JSZT" jdbcType="VARCHAR" property="JSZT" />
<result column="KDGS" jdbcType="VARCHAR" property="KDGS" />
<result column="SHZT" jdbcType="VARCHAR" property="SHZT" />
<result column="THKPSQ" jdbcType="VARCHAR" property="THKPSQ" />
<result column="JSFJ" jdbcType="VARCHAR" property="JSFJ" />
<result column="SQR" jdbcType="VARCHAR" property="SQR" />
<result column="BSCDM" jdbcType="VARCHAR" property="BSCDM" />
<result column="BSC" jdbcType="VARCHAR" property="BSC" />
<result column="QYDM" jdbcType="VARCHAR" property="QYDM" />
<result column="SQBH" jdbcType="VARCHAR" property="SQBH" />
<result column="HTBH" jdbcType="VARCHAR" property="HTBH" />
<result column="SQRQ" jdbcType="VARCHAR" property="SQRQ" />
<result column="YZRQ" jdbcType="VARCHAR" property="YZRQ" />
</association>
<association property="invoiceDetail" javaType="pwc.taxtech.atms.vat.entity.OutputInvoiceDetail">
<id column="DETAIL_ID" property="ID"/>
......@@ -207,6 +205,7 @@
<select id="getOutputInvoiceWithDetail" resultMap="outputInvoiceDto">
SELECT
INVOICE.ID AS INVOICE_ID,
INVOICE.ID AS INVOICEID,
INVOICE.FPQQLSH,
INVOICE.FPDM,
INVOICE.FPHM,
......@@ -248,7 +247,7 @@
INVOICE.ZKJE AS INVOICE_ZKJE,
INVOICE.ZKSE AS INVOICE_ZKSE,
INVOICE.ZKJSHJ,
INVOICE.SLV,
INVOICE.SLV AS INVOICE_SLV,
INVOICE.QY,
INVOICE.JSZT,
INVOICE.KDGS,
......@@ -298,11 +297,13 @@
INVOICE.FPHM
</select>
<resultMap id="outputInvoiceDataSourceDto" type="pwc.taxtech.atms.vat.dpo.OutputInvoiceDataSourceDto">
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="AMOUNT" jdbcType="VARCHAR" property="amount"/>
<result column="RESULT_TYPE" jdbcType="VARCHAR" property="resultType"/>
<result column="TAX_RATE" jdbcType="VARCHAR" property="taxRate"/>
<result column="TAX_AMOUNT" jdbcType="VARCHAR" property="taxAmount"/>
<result column="BUYER_NAME" jdbcType="VARCHAR" property="buyerName"/>
<result column="INVOICE_CODE" jdbcType="VARCHAR" property="invoiceCode"/>
<result column="INVOICE_NUMBER" jdbcType="VARCHAR" property="invoiceNumber"/>
......@@ -312,7 +313,7 @@
<select id="selectOutputInvoiceAndItem" resultMap="outputInvoiceDataSourceDto">
SELECT
OVII.INVOICE_ID AS ID,
OI.ID AS id,
OVII.JE AS AMOUNT,
1 AS RESULT_TYPE,
OVII.SE AS TAX_AMOUNT,
......@@ -323,7 +324,7 @@
OI.KPRQ AS INVOICE_DATE,
OI.FPLXDM AS INVOICE_TYPE
FROM
OUTPUT_INVOICE_ITEM OVII
OUTPUT_INVOICE_DETAIL OVII
JOIN
OUTPUT_INVOICE OI
ON
......
atms-web/src/main/webapp/app/admin/basicData/masterData/businessUnit/business-unit.html
View file @ 07b1cbc1
......@@ -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
View file @ 07b1cbc1
......@@ -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
View file @ 07b1cbc1
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment