diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java index c947035..5bd790c 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WDailyFundsController.java @@ -1,8 +1,7 @@ package com.hotent.chkpower.controller; -import com.hotent.chkpower.vo.WDailyFundsVo; -import com.hotent.uc.model.ShiftUser; +import com.hotent.chkpower.dto.WDailyFundsInspDto; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,8 +16,6 @@ import com.hotent.base.controller.BaseController; import com.hotent.chkpower.model.WDailyFunds; import com.hotent.chkpower.manager.WDailyFundsManager; -import java.util.List; - /** * 每日资金 前端控制器 * @@ -63,8 +60,8 @@ public class WDailyFundsController extends BaseController updateInsp(@RequestBody WDailyFundsVo wDailyFundsList) throws Exception{ - baseService.updateInsp(wDailyFundsList); + public CommonResult updateInsp(@RequestBody WDailyFundsInspDto wDailyFundsInspDto) throws Exception{ + baseService.updateInsp(wDailyFundsInspDto); return CommonResult.ok().message("成功"); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dto/WDailyFundsInspDto.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dto/WDailyFundsInspDto.java new file mode 100644 index 0000000..31562e3 --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dto/WDailyFundsInspDto.java @@ -0,0 +1,37 @@ +package com.hotent.chkpower.dto; + +import com.hotent.chkpower.model.WDailyFunds; + +import java.util.ArrayList; +import java.util.List; + +public class WDailyFundsInspDto { + private List wDailyFundsList =new ArrayList(); + private String fInspStatusName; + private String fInspNotes; + + + public List getwDailyFundsList() { + return wDailyFundsList; + } + + public void setwDailyFundsList(List wDailyFundsList) { + this.wDailyFundsList = wDailyFundsList; + } + + public String getfInspStatusName() { + return fInspStatusName; + } + + public void setfInspStatusName(String fInspStatusName) { + this.fInspStatusName = fInspStatusName; + } + + public String getfInspNotes() { + return fInspNotes; + } + + public void setfInspNotes(String fInspNotes) { + this.fInspNotes = fInspNotes; + } +} diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java index e441ddf..28d2065 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WDailyFundsManager.java @@ -1,14 +1,12 @@ package com.hotent.chkpower.manager; -import com.hotent.chkpower.model.WCurrent; import com.hotent.chkpower.model.WDailyFunds; import com.hotent.base.manager.BaseManager; -import com.hotent.chkpower.vo.WDailyFundsVo; +import com.hotent.chkpower.dto.WDailyFundsInspDto; import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 每日资金 服务类 @@ -37,6 +35,6 @@ public interface WDailyFundsManager extends BaseManager { void editWDailyFunds(List> wCurrentList, LocalDateTime date); - void updateInsp( WDailyFundsVo wDailyFundsList); + void updateInsp(WDailyFundsInspDto wDailyFundsInspDto); } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java index 97c048c..049070b 100644 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WDailyFundsManagerImpl.java @@ -2,18 +2,15 @@ package com.hotent.chkpower.manager.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hotent.chkpower.dao.WCurrentReportDao; import com.hotent.chkpower.dao.WFinanceDao; import com.hotent.chkpower.manager.WCurrentReportManager; import com.hotent.chkpower.manager.WFinanceManager; -import com.hotent.chkpower.model.WCurrent; -import com.hotent.chkpower.model.WCurrentReport; import com.hotent.chkpower.model.WDailyFunds; import com.hotent.chkpower.dao.WDailyFundsDao; import com.hotent.chkpower.manager.WDailyFundsManager; import com.hotent.base.manager.impl.BaseManagerImpl; import com.hotent.chkpower.model.WFinance; -import com.hotent.chkpower.vo.WDailyFundsVo; +import com.hotent.chkpower.dto.WDailyFundsInspDto; import com.hotent.runtime.script.ScriptImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,16 +99,16 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl wDailyFunds = wDailyFundsList.getwDailyFundsList(); + public void updateInsp(WDailyFundsInspDto wDailyFundsInspDto) { + List wDailyFunds = wDailyFundsInspDto.getwDailyFundsList(); if (wDailyFunds == null || wDailyFunds.size() == 0) {return;} for (WDailyFunds wDailyFund : wDailyFunds) { baseMapper.update(null,Wrappers.lambdaUpdate() .set(WDailyFunds::getFUpdateBy, scriptImpl.getCurrentUserName()) .set(WDailyFunds::getFUpdateId, scriptImpl.getCurrentUserId()) - .set(WDailyFunds::getFInspStatusName, wDailyFundsList.getfInspStatusName()) + .set(WDailyFunds::getFInspStatusName, wDailyFundsInspDto.getfInspStatusName()) .set(WDailyFunds::getFInspTime, LocalDateTime.now()) - .set(WDailyFunds::getFInspNotes, wDailyFundsList.getfInspNotes()) + .set(WDailyFunds::getFInspNotes, wDailyFundsInspDto.getfInspNotes()) .eq(WDailyFunds::getId, wDailyFund.getId()) ); @@ -119,23 +116,13 @@ public class WDailyFundsManagerImpl extends BaseManagerImpllambdaUpdate() -// .set(WFinance::getFUpdateBy, scriptImpl.getCurrentUserName()) -// .set(WFinance::getFUpdateId, scriptImpl.getCurrentUserId()) -// .set(WFinance::getFInspStatusName, wDailyFundsList.getfInspStatusName()) -// .set(WFinance::getFInspTime, LocalDateTime.now()) -// .set(WFinance::getFInspNotes, wDailyFundsList.getfInspNotes()) -// .apply("DATE(F_date) = DATE(?)", wDailyFund.getFDate().toLocalDate()) -// .eq(WFinance::getFOrgId, wDailyFund.getFOrgId())); - - wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFundsList.getfInspStatusName(),wDailyFundsList.getfInspNotes()); + wCurrentReportManager.updateInsp(wDailyFund.getFDate(),wDailyFund.getFOrgId(),wDailyFundsInspDto.getfInspStatusName(),wDailyFundsInspDto.getfInspNotes()); } } diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/vo/WDailyFundsVo.java b/backend/chkpower/src/main/java/com/hotent/chkpower/vo/WDailyFundsVo.java deleted file mode 100644 index 521ad38..0000000 --- a/backend/chkpower/src/main/java/com/hotent/chkpower/vo/WDailyFundsVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hotent.chkpower.vo; - -import com.hotent.chkpower.model.WDailyFunds; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -public class WDailyFundsVo { - private List wDailyFundsList =new ArrayList(); - private String fInspStatusName; - private String fInspNotes; - - - public List getwDailyFundsList() { - return wDailyFundsList; - } - - public void setwDailyFundsList(List wDailyFundsList) { - this.wDailyFundsList = wDailyFundsList; - } - - public String getfInspStatusName() { - return fInspStatusName; - } - - public void setfInspStatusName(String fInspStatusName) { - this.fInspStatusName = fInspStatusName; - } - - public String getfInspNotes() { - return fInspNotes; - } - - public void setfInspNotes(String fInspNotes) { - this.fInspNotes = fInspNotes; - } -} -- libgit2 0.21.2