Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
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
王衍超
cloud-fb
Commits
1eb3847a
Commit
1eb3847a
authored
Apr 21, 2022
by
杨清松
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
8c977963
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
ArtificialRechargeServiceImpl.java
...nance/internal/service/ArtificialRechargeServiceImpl.java
+1
-0
SalesPlanServiceImpl.java
...st/dinas/sales/internal/service/SalesPlanServiceImpl.java
+4
-4
SalesPlanController.java
...in/java/com/xyst/dinas/sales/web/SalesPlanController.java
+3
-3
No files found.
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/ArtificialRechargeServiceImpl.java
View file @
1eb3847a
...
...
@@ -57,6 +57,7 @@ public class ArtificialRechargeServiceImpl implements ArtificialRechargeService
warn
.
warn
();
return
ResponseObj
.
success
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ResponseObj
.
error
();
}
...
...
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
View file @
1eb3847a
...
...
@@ -258,10 +258,10 @@ public class SalesPlanServiceImpl implements SalesPlanService {
JSONArray
jsonArray
=
jsonObject
.
getJSONArray
(
"salesPlanDetails"
);
//校验逻辑
if
(!
jsonObject
.
isNull
(
"isCommit"
)
&&
jsonObject
.
getInt
(
"isCommit"
)
==
1
)
{
List
<
Map
<
String
,
Object
>>
submitSalesPlanVerifyList
=
submitSalesPlanVerify
(
salesPlanId
,
jsonArray
);
if
(
submitSalesPlanVerifyList
.
size
()
>
0
)
{
return
submitSalesPlanVerifyList
;
}
//
List<Map<String, Object>> submitSalesPlanVerifyList = submitSalesPlanVerify(salesPlanId, jsonArray);
//
if (submitSalesPlanVerifyList.size() > 0) {
//
return submitSalesPlanVerifyList;
//
}
//改状态
kObject
.
set
(
"approveState"
,
1
);
}
...
...
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java
View file @
1eb3847a
...
...
@@ -137,9 +137,9 @@ public class SalesPlanController {
JSONObject
jsonObject
=
new
JSONObject
(
body
);
try
{
List
<
Map
<
String
,
Object
>>
list
=
salesPlanService
.
modify
(
jsonObject
);
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
return
ResponseObj
.
error
(
"操作失败"
,
list
);
}
//
if(list != null && list.size() > 0) {
//
return ResponseObj.error("操作失败", list);
//
}
return
ResponseObj
.
success
(
"操作成功"
,
null
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
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