Skip to content

T
traffic-front
Commit 2167aa96 authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 69d2626e 04dcb133
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 4 deletions
atms-api/pom.xml
View file @ 2167aa96
......@@ -466,6 +466,17 @@
<env>pub</env>
</properties>
</profile>
<profile>
<id>uat</id>
<build>
<filters>
<filter>src/main/resources/conf/conf_profile_uat.properties</filter>
</filters>
</build>
<properties>
<env>uat</env>
</properties>
</profile>
</profiles>
<build>
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ 2167aa96
......@@ -592,7 +592,7 @@ public class ReportGeneratorImpl {
* @param workbook 工作簿
*/
public void addFunctionsAndContext(Workbook workbook, String[] functions, FormulaContext formulaContext, Boolean isValidate) {
FreeRefFunction[] functionImpls = new FreeRefFunction[0];
FreeRefFunction[] functionImpls;
if (!isValidate) {
functionImpls = new FreeRefFunction[]{new SGSR(formulaContext), new FSJZ(formulaContext), new ND(formulaContext),
new BB(formulaContext), new XXFP(formulaContext), new GZSD(formulaContext), new PC(formulaContext)
......
atms-api/src/main/resources/conf/conf_profile_uat.properties 0 → 100644
View file @ 2167aa96
jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc_user=fintax_user_test
jdbc_password=Fintaxuser@123Test
#jdbc_password=111111
jdbc_admin_db=taxadmin2018
jdbc2_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
jdbc2_user=pwc_invoice
jdbc2_password=pwc_invoice
jdbc2_admin_db=pwc_invoice
jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa
mail_jdbc_password=atmsunittestSQL
web.url=http://dts.erp.didichuxing.com:9001
#web.url=*
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
jwt.expireSecond=180000
jwt.refreshSecond=600
#File Server Config
file.server.url=http://dts.erp.didichuxing.com:9001
file.server.upload=/api/v1/upload
#upload
max_file_length=104857600
#Distributed ID Generate
distributed_id_datacenter=10
distributed_id_machine=15
api.url=http://dts.erp.didichuxing.com:8180
# Longi config
longi_api_basic_user=
longi_api_basic_pwd=
longi_api_gl_balance=http://soa.longi-silicon.com:8011/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#log
log.level=INFO
log.debug=false
env_type=pub
file_upload_post_url=http://10.88.128.214:8000/resource/erp_tax_system
file_upload_query_url=http://10.88.128.214:8001/resource/erp_tax_system
#���ϵ�ַget_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
check_ticket=true
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=18000
org_sync_url=http://10.96.238.10/erp-main-data-test-v2/api/companies
org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
ebs_call_url=http://172.20.3.109:8020/ebs-proxy-test/dts
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-web/pom.xml
View file @ 2167aa96
......@@ -169,6 +169,17 @@
<env>pub</env>
</properties>
</profile>
<profile>
<id>uat</id>
<build>
<filters>
<filter>src/main/resources/conf_profile_uat.properties</filter>
</filters>
</build>
<properties>
<env>uat</env>
</properties>
</profile>
</profiles>
<build>
......
atms-web/src/main/resources/conf_profile_uat.properties 0 → 100644
View file @ 2167aa96
api.url=http://dts.erp.didichuxing.com:8180/
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
jwt.expireSecond=180000
jwt.refreshSecond=600
log.level=INFO
#didi-config
check_ticket=true
get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=18000
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatApproveService.js
View file @ 2167aa96
......@@ -5,8 +5,8 @@
return $http.get('url', apiConfig.createVat());
},
startApproveDeploy : function() {
return $http.post('/approval/deploy', apiConfig.createVat());
startApproveDeploy: function() {
return $http.post('/approval/deploy', {}, apiConfig.createVat());
},
commitNewApproval: function (param) {
......
atms-web/src/main/webapp/app/framework/app-approve/app-approve.html
View file @ 2167aa96
......@@ -52,6 +52,7 @@
class="num-style">{{completedNum}}</span>
<span style="padding-right:10px;padding-left:20px;">{{'ApproveDisAgreed' | translate}}</span><span
class="num-style">{{notBeginNum}}</span>
<span style="padding-right:10px;padding-left:20px;display: none"><a ng-click="startApprove()">StartApprovalDeploy </a></span>
</div>
<div class="task-list">
<span class="taskMsg" ng-show="serviceTypeId !=='12'">{{'ApproveTaskList' | translate}}</span>
......@@ -59,7 +60,6 @@
</div>
<div class="new-right-body">
<div class="right-header">
<button style="display: none; " ng-click="startApprove()">start </button>
<div class="overview-picker">
<input type="text" id="overviewDatepicker" class="datepicker vat-subheader" style="width:120px;"
readonly="readonly"/>
......
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