Commit 20e993b0acc30811adcd316edd5cd2895b81f5b9
1 parent
588ae7c9
Exists in
master
update
Showing
5 changed files
with
50 additions
and
69 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java
1 | package com.hotent.chkpower.controller; | 1 | package com.hotent.chkpower.controller; |
2 | 2 | ||
3 | 3 | ||
4 | -import com.hotent.chkpower.vo.WDailyFundsVo; | ||
5 | -import com.hotent.uc.model.ShiftUser; | 4 | +import com.hotent.chkpower.dto.WDailyFundsInspDto; |
6 | import org.springframework.web.bind.annotation.GetMapping; | 5 | import org.springframework.web.bind.annotation.GetMapping; |
7 | import org.springframework.web.bind.annotation.PostMapping; | 6 | import org.springframework.web.bind.annotation.PostMapping; |
8 | import org.springframework.web.bind.annotation.RequestBody; | 7 | import org.springframework.web.bind.annotation.RequestBody; |
@@ -17,8 +16,6 @@ import com.hotent.base.controller.BaseController; | @@ -17,8 +16,6 @@ import com.hotent.base.controller.BaseController; | ||
17 | import com.hotent.chkpower.model.WDailyFunds; | 16 | import com.hotent.chkpower.model.WDailyFunds; |
18 | import com.hotent.chkpower.manager.WDailyFundsManager; | 17 | import com.hotent.chkpower.manager.WDailyFundsManager; |
19 | 18 | ||
20 | -import java.util.List; | ||
21 | - | ||
22 | /** | 19 | /** |
23 | * 每日资金 前端控制器 | 20 | * 每日资金 前端控制器 |
24 | * | 21 | * |
@@ -63,8 +60,8 @@ public class WDailyFundsController extends BaseController<WDailyFundsManager, WD | @@ -63,8 +60,8 @@ public class WDailyFundsController extends BaseController<WDailyFundsManager, WD | ||
63 | } | 60 | } |
64 | 61 | ||
65 | @PostMapping(value="/updateInsp") | 62 | @PostMapping(value="/updateInsp") |
66 | - public CommonResult<String> updateInsp(@RequestBody WDailyFundsVo wDailyFundsList) throws Exception{ | ||
67 | - baseService.updateInsp(wDailyFundsList); | 63 | + public CommonResult<String> updateInsp(@RequestBody WDailyFundsInspDto wDailyFundsInspDto) throws Exception{ |
64 | + baseService.updateInsp(wDailyFundsInspDto); | ||
68 | return CommonResult.<String>ok().message("成功"); | 65 | return CommonResult.<String>ok().message("成功"); |
69 | } | 66 | } |
70 | 67 |
backend/chkpower/src/main/java/com/hotent/chkpower/dto/WDailyFundsInspDto.java
0 → 100644
@@ -0,0 +1,37 @@ | @@ -0,0 +1,37 @@ | ||
1 | +package com.hotent.chkpower.dto; | ||
2 | + | ||
3 | +import com.hotent.chkpower.model.WDailyFunds; | ||
4 | + | ||
5 | +import java.util.ArrayList; | ||
6 | +import java.util.List; | ||
7 | + | ||
8 | +public class WDailyFundsInspDto { | ||
9 | + private List<WDailyFunds> wDailyFundsList =new ArrayList<WDailyFunds>(); | ||
10 | + private String fInspStatusName; | ||
11 | + private String fInspNotes; | ||
12 | + | ||
13 | + | ||
14 | + public List<WDailyFunds> getwDailyFundsList() { | ||
15 | + return wDailyFundsList; | ||
16 | + } | ||
17 | + | ||
18 | + public void setwDailyFundsList(List<WDailyFunds> wDailyFundsList) { | ||
19 | + this.wDailyFundsList = wDailyFundsList; | ||
20 | + } | ||
21 | + | ||
22 | + public String getfInspStatusName() { | ||
23 | + return fInspStatusName; | ||
24 | + } | ||
25 | + | ||
26 | + public void setfInspStatusName(String fInspStatusName) { | ||
27 | + this.fInspStatusName = fInspStatusName; | ||
28 | + } | ||
29 | + | ||
30 | + public String getfInspNotes() { | ||
31 | + return fInspNotes; | ||
32 | + } | ||
33 | + | ||
34 | + public void setfInspNotes(String fInspNotes) { | ||
35 | + this.fInspNotes = fInspNotes; | ||
36 | + } | ||
37 | +} |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java
1 | package com.hotent.chkpower.manager; | 1 | package com.hotent.chkpower.manager; |
2 | 2 | ||
3 | -import com.hotent.chkpower.model.WCurrent; | ||
4 | import com.hotent.chkpower.model.WDailyFunds; | 3 | import com.hotent.chkpower.model.WDailyFunds; |
5 | import com.hotent.base.manager.BaseManager; | 4 | import com.hotent.base.manager.BaseManager; |
6 | -import com.hotent.chkpower.vo.WDailyFundsVo; | 5 | +import com.hotent.chkpower.dto.WDailyFundsInspDto; |
7 | 6 | ||
8 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
9 | import java.util.HashMap; | 8 | import java.util.HashMap; |
10 | import java.util.List; | 9 | import java.util.List; |
11 | -import java.util.Map; | ||
12 | 10 | ||
13 | /** | 11 | /** |
14 | * 每日资金 服务类 | 12 | * 每日资金 服务类 |
@@ -37,6 +35,6 @@ public interface WDailyFundsManager extends BaseManager<WDailyFunds> { | @@ -37,6 +35,6 @@ public interface WDailyFundsManager extends BaseManager<WDailyFunds> { | ||
37 | void editWDailyFunds(List<HashMap<String,String>> wCurrentList, LocalDateTime date); | 35 | void editWDailyFunds(List<HashMap<String,String>> wCurrentList, LocalDateTime date); |
38 | 36 | ||
39 | 37 | ||
40 | - void updateInsp( WDailyFundsVo wDailyFundsList); | 38 | + void updateInsp(WDailyFundsInspDto wDailyFundsInspDto); |
41 | 39 | ||
42 | } | 40 | } |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java
@@ -2,18 +2,15 @@ package com.hotent.chkpower.manager.impl; | @@ -2,18 +2,15 @@ package com.hotent.chkpower.manager.impl; | ||
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | 3 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | 4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
5 | -import com.hotent.chkpower.dao.WCurrentReportDao; | ||
6 | import com.hotent.chkpower.dao.WFinanceDao; | 5 | import com.hotent.chkpower.dao.WFinanceDao; |
7 | import com.hotent.chkpower.manager.WCurrentReportManager; | 6 | import com.hotent.chkpower.manager.WCurrentReportManager; |
8 | import com.hotent.chkpower.manager.WFinanceManager; | 7 | import com.hotent.chkpower.manager.WFinanceManager; |
9 | -import com.hotent.chkpower.model.WCurrent; | ||
10 | -import com.hotent.chkpower.model.WCurrentReport; | ||
11 | import com.hotent.chkpower.model.WDailyFunds; | 8 | import com.hotent.chkpower.model.WDailyFunds; |
12 | import com.hotent.chkpower.dao.WDailyFundsDao; | 9 | import com.hotent.chkpower.dao.WDailyFundsDao; |
13 | import com.hotent.chkpower.manager.WDailyFundsManager; | 10 | import com.hotent.chkpower.manager.WDailyFundsManager; |
14 | import com.hotent.base.manager.impl.BaseManagerImpl; | 11 | import com.hotent.base.manager.impl.BaseManagerImpl; |
15 | import com.hotent.chkpower.model.WFinance; | 12 | import com.hotent.chkpower.model.WFinance; |
16 | -import com.hotent.chkpower.vo.WDailyFundsVo; | 13 | +import com.hotent.chkpower.dto.WDailyFundsInspDto; |
17 | import com.hotent.runtime.script.ScriptImpl; | 14 | import com.hotent.runtime.script.ScriptImpl; |
18 | import org.springframework.stereotype.Service; | 15 | import org.springframework.stereotype.Service; |
19 | import org.springframework.transaction.annotation.Transactional; | 16 | import org.springframework.transaction.annotation.Transactional; |
@@ -102,16 +99,16 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | @@ -102,16 +99,16 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | ||
102 | } | 99 | } |
103 | 100 | ||
104 | @Override | 101 | @Override |
105 | - public void updateInsp( WDailyFundsVo wDailyFundsList) { | ||
106 | - List<WDailyFunds> wDailyFunds = wDailyFundsList.getwDailyFundsList(); | 102 | + public void updateInsp(WDailyFundsInspDto wDailyFundsInspDto) { |
103 | + List<WDailyFunds> wDailyFunds = wDailyFundsInspDto.getwDailyFundsList(); | ||
107 | if (wDailyFunds == null || wDailyFunds.size() == 0) {return;} | 104 | if (wDailyFunds == null || wDailyFunds.size() == 0) {return;} |
108 | for (WDailyFunds wDailyFund : wDailyFunds) { | 105 | for (WDailyFunds wDailyFund : wDailyFunds) { |
109 | baseMapper.update(null,Wrappers.<WDailyFunds>lambdaUpdate() | 106 | baseMapper.update(null,Wrappers.<WDailyFunds>lambdaUpdate() |
110 | .set(WDailyFunds::getFUpdateBy, scriptImpl.getCurrentUserName()) | 107 | .set(WDailyFunds::getFUpdateBy, scriptImpl.getCurrentUserName()) |
111 | .set(WDailyFunds::getFUpdateId, scriptImpl.getCurrentUserId()) | 108 | .set(WDailyFunds::getFUpdateId, scriptImpl.getCurrentUserId()) |
112 | - .set(WDailyFunds::getFInspStatusName, wDailyFundsList.getfInspStatusName()) | 109 | + .set(WDailyFunds::getFInspStatusName, wDailyFundsInspDto.getfInspStatusName()) |
113 | .set(WDailyFunds::getFInspTime, LocalDateTime.now()) | 110 | .set(WDailyFunds::getFInspTime, LocalDateTime.now()) |
114 | - .set(WDailyFunds::getFInspNotes, wDailyFundsList.getfInspNotes()) | 111 | + .set(WDailyFunds::getFInspNotes, wDailyFundsInspDto.getfInspNotes()) |
115 | .eq(WDailyFunds::getId, wDailyFund.getId()) | 112 | .eq(WDailyFunds::getId, wDailyFund.getId()) |
116 | ); | 113 | ); |
117 | 114 | ||
@@ -119,23 +116,13 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | @@ -119,23 +116,13 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl<WDailyFundsDao, WDai | ||
119 | WFinance wFinance = new WFinance(); | 116 | WFinance wFinance = new WFinance(); |
120 | wFinance.setFUpdateBy(scriptImpl.getCurrentUserName()); | 117 | wFinance.setFUpdateBy(scriptImpl.getCurrentUserName()); |
121 | wFinance.setFUpdateId(scriptImpl.getCurrentUserId()); | 118 | wFinance.setFUpdateId(scriptImpl.getCurrentUserId()); |
122 | - wFinance.setFInspStatusName(wDailyFundsList.getfInspStatusName()); | 119 | + wFinance.setFInspStatusName(wDailyFundsInspDto.getfInspStatusName()); |
123 | wFinance.setFInspTime(LocalDateTime.now()); | 120 | wFinance.setFInspTime(LocalDateTime.now()); |
124 | - wFinance.setFInspNotes(wDailyFundsList.getfInspNotes()); | 121 | + wFinance.setFInspNotes(wDailyFundsInspDto.getfInspNotes()); |
125 | wFinance.setFDate(wDailyFund.getFDate()); | 122 | wFinance.setFDate(wDailyFund.getFDate()); |
126 | wFinance.setFOrgId(wDailyFund.getFOrgId()); | 123 | wFinance.setFOrgId(wDailyFund.getFOrgId()); |
127 | wFinanceDao.updateInsp(wFinance); | 124 | wFinanceDao.updateInsp(wFinance); |
128 | - | ||
129 | -// wFinanceManager.updateInsp(null,Wrappers.<WFinance>lambdaUpdate() | ||
130 | -// .set(WFinance::getFUpdateBy, scriptImpl.getCurrentUserName()) | ||
131 | -// .set(WFinance::getFUpdateId, scriptImpl.getCurrentUserId()) | ||
132 | -// .set(WFinance::getFInspStatusName, wDailyFundsList.getfInspStatusName()) | ||
133 | -// .set(WFinance::getFInspTime, LocalDateTime.now()) | ||
134 | -// .set(WFinance::getFInspNotes, wDailyFundsList.getfInspNotes()) | ||
135 | -// .apply("DATE(F_date) = DATE(?)", wDailyFund.getFDate().toLocalDate()) | ||
136 | -// .eq(WFinance::getFOrgId, wDailyFund.getFOrgId())); | ||
137 | - | ||
138 | - wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFundsList.getfInspStatusName(),wDailyFundsList.getfInspNotes()); | 125 | + wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFundsInspDto.getfInspStatusName(),wDailyFundsInspDto.getfInspNotes()); |
139 | } | 126 | } |
140 | } | 127 | } |
141 | 128 |
backend/chkpower/src/main/java/com/hotent/chkpower/vo/WDailyFundsVo.java
@@ -1,38 +0,0 @@ | @@ -1,38 +0,0 @@ | ||
1 | -package com.hotent.chkpower.vo; | ||
2 | - | ||
3 | -import com.hotent.chkpower.model.WDailyFunds; | ||
4 | -import lombok.Data; | ||
5 | - | ||
6 | -import java.util.ArrayList; | ||
7 | -import java.util.List; | ||
8 | - | ||
9 | -public class WDailyFundsVo { | ||
10 | - private List<WDailyFunds> wDailyFundsList =new ArrayList<WDailyFunds>(); | ||
11 | - private String fInspStatusName; | ||
12 | - private String fInspNotes; | ||
13 | - | ||
14 | - | ||
15 | - public List<WDailyFunds> getwDailyFundsList() { | ||
16 | - return wDailyFundsList; | ||
17 | - } | ||
18 | - | ||
19 | - public void setwDailyFundsList(List<WDailyFunds> wDailyFundsList) { | ||
20 | - this.wDailyFundsList = wDailyFundsList; | ||
21 | - } | ||
22 | - | ||
23 | - public String getfInspStatusName() { | ||
24 | - return fInspStatusName; | ||
25 | - } | ||
26 | - | ||
27 | - public void setfInspStatusName(String fInspStatusName) { | ||
28 | - this.fInspStatusName = fInspStatusName; | ||
29 | - } | ||
30 | - | ||
31 | - public String getfInspNotes() { | ||
32 | - return fInspNotes; | ||
33 | - } | ||
34 | - | ||
35 | - public void setfInspNotes(String fInspNotes) { | ||
36 | - this.fInspNotes = fInspNotes; | ||
37 | - } | ||
38 | -} |