Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
358c4d5a
Commit
358c4d5a
authored
Jul 09, 2024
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复audit bug
parent
8bf1ad97
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
PreparationMoneyController.java
...odule/hygf/biz/controller/PreparationMoneyController.java
+3
-0
PreparationMoneyServiceImpl.java
...le/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
+9
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java
View file @
358c4d5a
...
@@ -341,6 +341,9 @@ public class PreparationMoneyController extends BaseController {
...
@@ -341,6 +341,9 @@ public class PreparationMoneyController extends BaseController {
public
ResponseModel
<
PreparationMoney
>
getFromInfo
(
public
ResponseModel
<
PreparationMoney
>
getFromInfo
(
@RequestParam
(
value
=
"ids"
)
String
ids
){
@RequestParam
(
value
=
"ids"
)
String
ids
){
List
<
String
>
list
=
Arrays
.
asList
(
ids
.
split
(
","
));
List
<
String
>
list
=
Arrays
.
asList
(
ids
.
split
(
","
));
AgencyUserModel
userInfo
=
getUserInfo
();
PreparationMoney
fromInfo
=
preparationMoneyServiceImpl
.
getFromInfo
(
list
);
fromInfo
.
setOrderUser
(
userInfo
.
getRealName
());
return
ResponseHelper
.
buildResponse
(
preparationMoneyServiceImpl
.
getFromInfo
(
list
))
;
return
ResponseHelper
.
buildResponse
(
preparationMoneyServiceImpl
.
getFromInfo
(
list
))
;
}
}
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @
358c4d5a
...
@@ -1071,11 +1071,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
...
@@ -1071,11 +1071,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
//补货审核
//补货审核
public
void
replenishmentAudit
(
Long
sequenceNbr
,
Map
<
String
,
Object
>
kv
)
{
public
void
replenishmentAudit
(
Long
sequenceNbr
,
Map
<
String
,
Object
>
kv
)
{
PreparationMoney
preparationMoney
=
preparationMoneyMapper
.
selectById
(
sequenceNbr
);
PreparationMoney
preparationMoney
=
preparationMoneyMapper
.
selectById
(
sequenceNbr
);
LambdaQueryWrapper
<
DocumentStation
>
stations
=
new
LambdaQueryWrapper
<>();
stations
.
eq
(
DocumentStation:
:
getPreparationMoneyId
,
sequenceNbr
);
List
<
DocumentStation
>
documentStations
=
documentStationMapper
.
selectList
(
stations
);
List
<
Long
>
collect
=
documentStations
.
stream
().
map
(
DocumentStation:
:
getStationId
).
collect
(
Collectors
.
toList
());
LambdaUpdateWrapper
<
PeasantHousehold
>
up
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
PeasantHousehold
>
up
=
new
LambdaUpdateWrapper
<>();
if
(
kv
.
get
(
"approvalStatus"
).
toString
().
equals
(
"0"
)){
if
(
kv
.
get
(
"approvalStatus"
).
toString
().
equals
(
"0"
)){
preparationMoney
.
setOrderStatus
(
DeliveryStateeEnum
.
待补货
.
getName
());
preparationMoney
.
setOrderStatus
(
DeliveryStateeEnum
.
待补货
.
getName
());
up
.
set
(
PeasantHousehold:
:
getPreparationMoneyState
,
DeliveryStateeEnum
.
待补货
.
getName
());
up
.
set
(
PeasantHousehold:
:
getPreparationMoneyState
,
DeliveryStateeEnum
.
待补货
.
getName
());
up
.
set
(
PeasantHousehold:
:
getConstructionState
,
DeliveryStateeEnum
.
待补货
.
getName
());
up
.
set
(
PeasantHousehold:
:
getConstructionState
,
DeliveryStateeEnum
.
待补货
.
getName
());
up
.
in
(
BaseEntity:
:
getSequenceNbr
,
collect
);
peasantHouseholdMapper
.
update
(
null
,
up
);
peasantHouseholdMapper
.
update
(
null
,
up
);
}
else
{
}
else
{
preparationMoney
.
setOrderStatus
(
DeliveryStateeEnum
.
待确认
.
getName
());
preparationMoney
.
setOrderStatus
(
DeliveryStateeEnum
.
待确认
.
getName
());
...
@@ -1198,6 +1205,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
...
@@ -1198,6 +1205,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
stations
.
add
(
documentStation
);
stations
.
add
(
documentStation
);
});
});
preparationMoney
.
setPeasantHouseholdId
(
stations
);
preparationMoney
.
setPeasantHouseholdId
(
stations
);
preparationMoney
.
setOrderTime
(
new
Date
());
return
preparationMoney
;
return
preparationMoney
;
}
}
}
}
\ No newline at end of file
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