Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-cost-system
Commits
51283d7f
Commit
51283d7f
authored
Sep 15, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
不知道改了什么
parent
dede7794
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
91 additions
and
4 deletions
+91
-4
CostApiServiceImpl.java
...blt/other/other_cost/service/impl/CostApiServiceImpl.java
+5
-4
application-inner-api.yml
cost-core/src/main/resources/application-inner-api.yml
+86
-0
No files found.
cost-core/src/main/java/com/blt/other/other_cost/service/impl/CostApiServiceImpl.java
View file @
51283d7f
...
@@ -172,12 +172,13 @@ public class CostApiServiceImpl implements CostApiService {
...
@@ -172,12 +172,13 @@ public class CostApiServiceImpl implements CostApiService {
companyValueList
.
add
(
60
);
companyValueList
.
add
(
60
);
companyValueList
.
add
(
61
);
companyValueList
.
add
(
61
);
companyValueList
.
add
(
66
);
companyValueList
.
add
(
66
);
companyValueList
.
add
(
72
);
companyValueList
.
add
(
67
);
companyValueList
.
add
(
58
);
companyValueList
.
add
(
54
);
}
}
}
}
// companyValueList.add(72);
// companyValueList.add(67);
// companyValueList.add(58);
// companyValueList.add(54);
List
<
ManageCostDto
>
manageCostDtoList
=
costDao
.
selectManageCost
(
startDate
,
DateTimeUtil
.
addDays
(
endDate
,
1
),
feeSuperType
,
feeSubType
,
companyValueList
,
companyName
,
departmentName
,
createUserId
,
payUserId
);
List
<
ManageCostDto
>
manageCostDtoList
=
costDao
.
selectManageCost
(
startDate
,
DateTimeUtil
.
addDays
(
endDate
,
1
),
feeSuperType
,
feeSubType
,
companyValueList
,
companyName
,
departmentName
,
createUserId
,
payUserId
);
if
(
manageCostDtoList
!=
null
&&
!
manageCostDtoList
.
isEmpty
())
{
if
(
manageCostDtoList
!=
null
&&
!
manageCostDtoList
.
isEmpty
())
{
for
(
ManageCostDto
manageCostDto
:
manageCostDtoList
)
{
for
(
ManageCostDto
manageCostDto
:
manageCostDtoList
)
{
...
...
cost-core/src/main/resources/application-inner-api.yml
0 → 100644
View file @
51283d7f
spring
:
datasource
:
druid
:
driver-class-name
:
com.mysql.jdbc.Driver
url
:
jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username
:
root
password
:
"
#7kfnymAM$Y9-Ntf"
filters
:
stat
initial-size
:
1
min-idle
:
1
max-active
:
20
max-wait
:
60000
time-between-eviction-runs-millis
:
60000
min-evictable-idle-time-millis
:
300000
validation-query
:
SELECT 'x'
test-while-idle
:
true
test-on-borrow
:
false
test-on-return
:
false
pool-prepared-statements
:
false
max-pool-prepared-statement-per-connection-size
:
20
thymeleaf
:
prefix
:
classpath:/templates/
suffix
:
.html
cache
:
false
resources
:
static-locations
:
classpath:/resources/, classpath:/static/
mybatis
:
mapper-locations
:
classpath:mapper/*.xml
type-aliases-package
:
com.blt.other.other_database.model
configuration
:
map-underscore-to-camel-case
:
true
pagehelper
:
helper-dialect
:
mysql
reasonable
:
true
support-methods-arguments
:
true
params
:
count=countSql
logging
:
file
:
other/log/other.log
url
:
my
:
baseServerUrl
:
http://api.fee.bailuntec.com
purchaseApplyCallbackUrlPost
:
${url.my.baseServerUrl}/purchase/other/purchasing/list/detail/ApplyCallbackUrl
purchaseCashierCallbackUrlPost
:
${url.my.baseServerUrl}/purchase/other/purchasing/list/detail/CashierCallbackUrl
costApplyCallbackUrlPost
:
${url.my.baseServerUrl}/purchase/other/cost/check/ApplyCallbackUrl
costCashierCallbackUrlPost
:
${url.my.baseServerUrl}/purchase/other/cost/check/CashierCallbackUrl
lendCostApplyCallBackUrlPost
:
${url.my.baseServerUrl}/purchase/other/cost/check/lend/ApplyCallbackUrl
lendCostCashierCallbackUrlPost
:
${url.my.baseServerUrl}/purchase/other/cost/check/lend/CashierCallbackUrl
getBuyDetailApi
:
${url.my.baseServerUrl}/purchase/other/purchasing/buy/detail
getCostDetailApi
:
${url.my.baseServerUrl}/purchase/other/cost/finansys/detail
api
:
baseServerUrl
:
http://oa.bailuntec.com
baseFinansysUrl
:
http://cw.bailuntec.com
buyUserApi
:
${url.api.baseServerUrl}/Api/User/GetUser
logingUserApi
:
${url.api.baseServerUrl}/Login/GetUserByBLUserAcct
GetDeparmentListApi
:
${url.api.baseServerUrl}/api/User/GetDeparmentList
postCompanyListApi
:
${url.api.baseFinansysUrl}/API/API/GetCompanyMainBody
postApplyApi
:
${url.api.baseFinansysUrl}/API/API/Apply
postCompanyListFinansysApi
:
http://cw.bailuntec.com/API/API/GetBankAccount
getExchangeRateApi
:
${url.api.baseServerUrl}/api/ExchangeRate/GetExchangeRate
getSupplierPageListApi
:
http://supplier.bailuntec.com/Api/GetSupplierPageList
getAllLogisticsFinansysApi
:
http://supplier.bailuntec.com/Api/GetLogisticsSupplier
getAllSubLogisticsFinansysApi
:
http://supplier.bailuntec.com/Api/GetSubLogisticsSupplier
# 获取耗材
getConsumablesApi
:
${url.api.baseFinansysUrl}/Cashier/Cashier/BuyCashierRecordList
getCashierAnnexApi
:
${url.api.baseFinansysUrl}/API/API/GetCashierAnnex
cookie
:
domain
:
fee
:
bailuntec.com
costTypeKind
:
logisticsSubjectCode
:
22222
server
:
port
:
8082
servlet
:
context-path
:
/fee/api
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment