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 8bd6a59..53a9cab 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,6 +1,8 @@ package com.hotent.chkpower.controller; +import com.hotent.chkpower.vo.WDailyFundsVo; +import com.hotent.uc.model.ShiftUser; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -15,6 +17,8 @@ import com.hotent.base.controller.BaseController; import com.hotent.chkpower.model.WDailyFunds; import com.hotent.chkpower.manager.WDailyFundsManager; +import java.util.List; + /** * 每日资金 前端控制器 * @@ -45,6 +49,11 @@ public class WDailyFundsController extends BaseController save(@ApiParam(name="WDailyFunds",value="每日资金对象", required = true)@RequestBody WDailyFunds wDailyFunds) throws Exception{ @@ -53,4 +62,12 @@ public class WDailyFundsController extends BaseControllerok().message(msg); } + @PostMapping(value="/updateInsp") + public CommonResult updateInsp(@RequestBody WDailyFundsVo wDailyFundsList) throws Exception{ + baseService.updateInsp(wDailyFundsList); + + return CommonResult.ok().message("成功"); + } + + } 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 b1ae2a4..e441ddf 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 @@ -3,6 +3,7 @@ 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 java.time.LocalDateTime; import java.util.HashMap; @@ -36,4 +37,6 @@ public interface WDailyFundsManager extends BaseManager { void editWDailyFunds(List> wCurrentList, LocalDateTime date); + void updateInsp( WDailyFundsVo wDailyFundsList); + } 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 10bf520..7c62016 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 @@ -7,6 +7,7 @@ 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.vo.WDailyFundsVo; import com.hotent.runtime.script.ScriptImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +46,7 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl> wCurrentList, LocalDateTime fDate) { if (wCurrentList == null || wCurrentList.size() == 0) {return;} @@ -87,6 +89,22 @@ public class WDailyFundsManagerImpl extends BaseManagerImpl wDailyFunds = wDailyFundsList.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::getFInspTime, LocalDateTime.now()) + .set(WDailyFunds::getFInspNotes, wDailyFundsList.getfInspNotes()) + .eq(WDailyFunds::getId, wDailyFund.getId()) + ); + } + } + private void verifyInitWDailyFunds(LocalDateTime fDate) { Integer count = baseMapper.selectWDailyFundsCount(fDate); if (count == null || count == 0) { 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 new file mode 100644 index 0000000..521ad38 --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/vo/WDailyFundsVo.java @@ -0,0 +1,38 @@ +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