diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java index 23c49310..88ccde4c 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/TodoVO.java @@ -24,4 +24,7 @@ public class TodoVO { /** 时间 */ private LocalDateTime time; + /** 信息 */ + private Object targetInfo; + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java index bf9f3e81..1e67dccf 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java @@ -46,7 +46,8 @@ public class CommonCheckServiceImpl implements CommonCheckService { todo.setTargetId(obj.getId()+""); todo.setTargetCode(obj.getCode()); todo.setTitle(obj.getChargeTheme()); - todo.setTime(obj.getCreateTime()); + todo.setTime(obj.getSubmitTime()); + todo.setTargetInfo(obj); return todo; }).collect(Collectors.toList()); //政策 @@ -60,7 +61,8 @@ public class CommonCheckServiceImpl implements CommonCheckService { todo.setTargetId(obj.getId()+""); todo.setTargetCode(obj.getPolicyCode()); todo.setTitle(obj.getTitle()); - todo.setTime(obj.getCreateTime()); + todo.setTime(obj.getSubmitTime()); + todo.setTargetInfo(obj); return todo; }).collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 2053fe5c..1facc00c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -121,13 +121,6 @@ public class TbsBudgetController { public R getById(@PathVariable("id") String id,String changeId){ TbsBudget budget = tbsBudgetService.getById(id); TbsBudgetVo vo = tbsBudgetService.toVoEntity(budget); - LambdaQueryWrapper changeLqw = new LambdaQueryWrapper<>(); - List changeList = tbsBudgetChangeService.list(changeLqw); - for (TbsBudgetChange budgetChange : changeList) { - //审批data - //条件 - //金额 - } // TbsBudgetVo vo2 = tbsBudgetService.getEntityForExcel(budget); // vo.setScheduleItemBudgets(vo2.getScheduleItemBudgets()); return R.ok(vo); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java index b9d85d16..64795e04 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java @@ -62,8 +62,10 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl data.put("orgId", tbsBudget.getId().toString()); data.put("applyUserCode", sysUser.getCode()); data.put("applyUserName", sysUser.getName()); + data.put("empId", sysUser.getSyUserId()); data.put("targetId", tbsBudget.getId()+""); data.put("targetCode", tbsBudget.getBudgetNumber()); + data.put("budgetCode", tbsBudget.getBudgetNumber()); data.put("exsp1",templateCode); //添加跳转地址业务 String baseJumpUrl = JumpToUtil.getJumpUrl(projectProperties.getWebUrl(),templateCode,id+""); diff --git a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java index 4f58d712..991604c9 100644 --- a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java +++ b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java @@ -11,12 +11,13 @@ import lombok.Getter; @AllArgsConstructor public enum VtbVerificationState { - //状态:0=审批中;1=完成;2-中止;3-回滚;4-作废 + //状态:0=审批中;1=完成;2-中止;3-回滚;4-作废;5-关闭 Commiting(0), Finished(1), Stop(2), Rollback(3), - Cancel(4); + Cancel(4), + Close(5); private Integer code; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java index 4aaf8442..bd8c38fc 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java @@ -54,5 +54,8 @@ public class VtbVerificationBo implements Serializable { /** 支付方式 */ private Long payWayId; + /** 原来的审批id */ + private Long orgVerificationId; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 2f66a669..d27215d7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -546,7 +546,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl