diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java index 26c43a0b..ee1f45c3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.tbs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -9,6 +10,11 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam; +import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; +import com.qs.serve.modules.tbs.entity.bo.TbsBudgetBatchBo; +import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; +import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,18 +38,19 @@ import java.util.List; public class TbsBudgetBatchController { private TbsBudgetBatchService tbsBudgetBatchService; + private TbsBudgetBatchOperationServiceImpl budgetBatchOperationService; + /** - * 列表 + * 提交审批-预算批量申请 * @param param * @return */ - //@GetMapping("/list") - //@PreAuthorize("hasRole('tbs:budgetBatch:query')") - public R> getList(TbsBudgetBatch param){ - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); - List list = tbsBudgetBatchService.list(lqw); - return R.ok(list); + @PostMapping("/commit") + @SysLog(module = SystemModule.Budget, title = "批量申请", biz = BizType.INSERT) + public R commit(@RequestBody @Valid TbsBudgetBatchBo param){ + Object result = tbsBudgetBatchService.commit(param); + return R.ok(result); } /** @@ -51,8 +58,7 @@ public class TbsBudgetBatchController { * @param param * @return */ - //@GetMapping("/page") - //@PreAuthorize("hasRole('tbs:budgetBatch:query')") + @GetMapping("/page") public R> getPage(TbsBudgetBatch param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); @@ -75,16 +81,46 @@ public class TbsBudgetBatchController { /** - * 新增 - * @param param - * @return - */ - @PostMapping("/commit") - @SysLog(module = SystemModule.Budget, title = "批量申请", biz = BizType.INSERT) - public R commit(@RequestBody @Valid TbsBudgetBatch param){ - TbsBudgetBatch entity = CopierUtil.copy(param,new TbsBudgetBatch()); - boolean result = tbsBudgetBatchService.save(entity); - return R.isTrue(result); + * 审批结果-预算批量申请 + * @param batchId + * @return + */ + @GetMapping("/ListAffairs") + public R> ListBudgetAffairs(String batchId){ + return budgetBatchOperationService.pageAffair(batchId); + } + + + /** + * 提交审批节点-预算批量申请 + * @return + */ + @LimitSubmit + @PostMapping("/commitAffair") + @SysLog(module = SystemModule.Budget, title = "预算申请", biz = BizType.OTHER) + public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ + return budgetBatchOperationService.commitAffair(affairCommit); + } + + /** + * 加签-预算批量申请 + * @param param + * @return + */ + @LimitSubmit + @PostMapping("/addNode") + @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.OTHER) + public R addNode(@RequestBody CtpAddNodeParam param){ + return budgetBatchOperationService.addNode(param); + } + + /** + * 个人未完成审批统计-预算批量申请 + * @return + */ + @PostMapping("/getUnfinished") + public R getUnfinished(){ + return budgetBatchOperationService.getUnfinished(); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java index d68962dc..46895427 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java @@ -45,6 +45,9 @@ public class TbsBudgetBatch implements Serializable { @NotNull(message = "状态不能为空") private Integer batchState; + /** 预算类型 0->修改;1->新增 */ + private Integer batchType; + /** 致远表单id */ @Length(max = 255,message = "致远表单id长度不能超过255字") private String syFormId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBatchBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBatchBo.java index 60e49514..7f614571 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBatchBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBatchBo.java @@ -16,6 +16,7 @@ public class TbsBudgetBatchBo { List budgetList; + @Data public static class BudgetMain{ /** 更新时必填 */ @@ -34,16 +35,27 @@ public class TbsBudgetBatchBo { @NotNull private String centerName; + /** 品牌名称 */ private String bandNames; + /** 类目名称 */ private String categoryNames; + /** 系列名称 */ private String seriesNames; + /** + * 周期金额 + */ + List scheduleAmount; + } + @Data public static class BudgetAmount{ + + } }