调整审批

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;
+
 }

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());
 

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@@ -121,13 +121,6 @@ public class TbsBudgetController {
     public R<TbsBudgetVo> getById(@PathVariable("id") String id,String changeId){
         TbsBudget budget = tbsBudgetService.getById(id);
         TbsBudgetVo vo = tbsBudgetService.toVoEntity(budget);
-        LambdaQueryWrapper<TbsBudgetChange> changeLqw = new LambdaQueryWrapper<>();
-        List<TbsBudgetChange> changeList = tbsBudgetChangeService.list(changeLqw);
-        for (TbsBudgetChange budgetChange : changeList) {
-            //审批data
-            //条件
-            //金额
-        }
 //        TbsBudgetVo vo2 = tbsBudgetService.getEntityForExcel(budget);
 //        vo.setScheduleItemBudgets(vo2.getScheduleItemBudgets());
         return R.ok(vo);

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java

@@ -62,8 +62,10 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
         data.put("orgId", budgetChange.getId().toString());
         data.put("applyUserCode", sysUser.getCode());
         data.put("applyUserName", sysUser.getName());
+        data.put("empId", sysUser.getSyUserId());
         data.put("targetId", budgetChange.getId()+"");
         data.put("targetCode", budgetChange.getChangeCode());
+        data.put("budgetCode", budgetChange.getBudgetNumber());
         data.put("exsp1", templateCode);
         //添加跳转地址业务
         String baseJumpUrl = JumpToUtil.getJumpUrl(projectProperties.getWebUrl(),templateCode,budgetChange.getId()+"");

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -101,8 +101,10 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         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+"");

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;
 

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;
+
 }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -546,7 +546,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
             Assert.throwEx("当前费用状态不支持");
         }
-
+        VtbVerification orgData = null;
+        if(verificationBo.getOrgVerificationId()!=null){
+            orgData = this.getById(verificationBo.getOrgVerificationId());
+            if(!orgData.getVerificationState().equals(VtbVerificationState.Rollback.getCode())){
+                Assert.throwEx("原来的核销数据非回退状态");
+            }
+        }
         String saleRegionId = supplier.handleSaleRegionId();
         BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
         String saleBizNames = saleRegion!=null?saleRegion.getPathNames():"null_申请时未录入";
@@ -680,6 +686,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         activityParam.setActivityState(TbsActivityState.STATE_1_Checking);
         activityService.updateById(activityParam);
 
+        //更新原来的核销为关闭
+        if(orgData!=null){
+            orgData.setVerificationState(VtbVerificationState.Close.getCode());
+            this.updateById(orgData);
+        }
+
         //判断是否直接跳过审批的申请
         AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification, totalAmount));