预算费用占用

src/main/java/com/qs/serve/common/model/dto/PageVo.java

@@ -43,4 +43,14 @@ public class PageVo<T>{
         this.totalPage = total%pageSize==0?total/pageSize:(total/pageSize+1);
     }
 
+    public static <TYPE,R_TYPE> PageVo<R_TYPE> initNewList(PageVo<TYPE> oldVo,List<R_TYPE> list){
+        PageVo<R_TYPE> newVo = new PageVo<>();
+        newVo.setPageNum(oldVo.getPageNum());
+        newVo.setPageSize(oldVo.getPageSize());
+        newVo.setTotal(oldVo.getTotal());
+        newVo.setTotalPage(oldVo.getTotalPage());
+        newVo.setList(list);
+        return newVo;
+    }
+
 }

src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author YenHex
  * @since 2022/11/22
@@ -12,10 +14,12 @@ import lombok.Data;
 @Data
 public class CtpAffair {
 
+    /** 审批节点id */
     private String affairId;
 
     private String memberId;
 
+    /** 1.代发；2已发；3待办；4已办；5取消；6回退；7取回；8竞争执行；15中止 */
     private Integer state;
 
     private String templateId;
@@ -24,4 +28,10 @@ public class CtpAffair {
 
     private String costApplyId;
 
+    /** 评论内容 */
+    private String comment;
+
+    /** 评论时间 */
+    private Date commentTime;
+
 }

src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java

@@ -14,9 +14,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author YenHex
@@ -58,7 +58,19 @@ public class SeeYonServiceImpl implements SeeYonService {
     public R<PageVo<CtpAffair>> pageMemberAffair(CtpAffairQo ctpAffairQo) {
         String title = "用户审批流程";
         R<String> result = postBase(TbsSeeYonConst.API_PAGE_AFFAIR,ctpAffairQo,title);
-
+        if(result.getStatus()==200){
+            PageVo<?> pageVo = JsonUtil.jsonToPojo(result.getData(),PageVo.class);
+            List<CtpAffair> affairList = new ArrayList<>();
+            if(CollectionUtil.isNotEmpty(pageVo.getList())){
+                for (Object o : pageVo.getList()) {
+                    String json = JsonUtil.objectToJson(o);
+                    CtpAffair obj = JsonUtil.jsonToPojo(json,CtpAffair.class);
+                    affairList.add(obj);
+                }
+            }
+            PageVo<CtpAffair> resultVo = PageVo.initNewList(pageVo,affairList);
+            return R.ok(resultVo);
+        }
         return null;
     }
 

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -260,6 +260,12 @@ public class SysUserController {
         if(param.getMobile()!=null){
             param.setAccount(param.getMobile());
         }
+        if(param.getSyUserId()==null){
+            param.setSyUserId("");
+        }
+        if(param.getSyAccount()==null){
+            param.setSyAccount("");
+        }
         boolean result = sysUserService.save(param);
         if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
             sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
@@ -284,6 +290,12 @@ public class SysUserController {
         if(param.getLoginEnable()!=null){
             param.setServingState(param.getLoginEnable()==1?1:0);
         }
+        if(param.getSyUserId()==null){
+            param.setSyUserId("");
+        }
+        if(param.getSyAccount()==null){
+            param.setSyAccount("");
+        }
         param.setSuperFlag(null);
         param.setPassword(null);
         param.setUpdateTime(LocalDateTime.now());

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

@@ -26,6 +26,7 @@ import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
 import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
+import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
 import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo;
 import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo;
 import com.qs.serve.modules.tbs.service.*;
@@ -197,7 +198,7 @@ public class TbsCostApplyController {
      */
     @GetMapping("/pageMemberAffair")
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
-    public R<?> pageMemberAffair(Integer state,Integer pageNum,Integer pageSize){
+    public R<PageVo<CtpAffairVo>> pageMemberAffair(Integer state,Integer pageNum,Integer pageSize){
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
             return R.error("当前账号未绑定致远用户信息");
@@ -214,20 +215,19 @@ public class TbsCostApplyController {
         if(ctpAffairs.size()>0){
             List<String> costApplyIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList());
             List<TbsCostApply> costApplyList = tbsCostApplyService.listByIds(costApplyIds);
-            for (TbsCostApply costApply : costApplyList) {
+            List<CtpAffairVo> result = new ArrayList<>();
-                for (CtpAffair ctpAffair : ctpAffairs) {
+            for (CtpAffair ctpAffair : ctpAffairs) {
+                CtpAffairVo ctpAffairVo = new CtpAffairVo();
+                for (TbsCostApply costApply : costApplyList) {
                     if(costApply.getId().toString().equals(ctpAffair.getCostApplyId())){
-                        costApply.setAffairId(ctpAffair.getAffairId());
+                        ctpAffairVo.setCostApply(costApply);
                         break;
                     }
                 }
+                ctpAffairVo.setAffairInfo(ctpAffair);
+                result.add(ctpAffairVo);
             }
-            PageVo<TbsCostApply> costApplyPageVo = new PageVo<>();
+            PageVo<CtpAffairVo> costApplyPageVo = PageVo.initNewList(pageVo,result);
-            costApplyPageVo.setPageNum(pageVo.getPageNum());
-            costApplyPageVo.setPageSize(pageVo.getPageSize());
-            costApplyPageVo.setTotal(pageVo.getTotal());
-            costApplyPageVo.setTotalPage(pageVo.getTotalPage());
-            costApplyPageVo.setList(costApplyList);
             return R.ok(costApplyPageVo);
         }
         return R.byEmptyList();

src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java

@@ -0,0 +1,24 @@
+package com.qs.serve.modules.tbs.entity.vo;
+
+import com.qs.serve.modules.seeyon.entity.CtpAffair;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2022/12/7
+ */
+@Data
+public class CtpAffairVo {
+
+    /**
+     * 审批信息
+     */
+    private CtpAffair affairInfo;
+
+    /**
+     * 费用申请信息
+     */
+    private TbsCostApply costApply;
+
+}

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -130,6 +130,7 @@ public class TbsBudgetApplicationService {
         List<TbsBudgetTableVo.TopTheadHeader> topTheadHeaders = new ArrayList<>();
         Map<Long,List<TbsBudgetCostItem>> tmpMap = allBudgetItem.stream().collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId));
         for (Long scheduleItemBudgetId : tmpMap.keySet()) {
+            if(scheduleItemBudgetId.equals(0L)){continue;}
             TbsBudgetCostItem itemBudget = tmpMap.get(scheduleItemBudgetId).get(0);
             String budgetCode = null;
             for (TbsBudget budget : budgetList) {
@@ -291,6 +292,10 @@ public class TbsBudgetApplicationService {
                     Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]预算不足");
                 }
             }
+            activityCostItem.setBudgetId(0L);
+            activityCostItem.setScheduleId(0L);
+            activityCostItem.setScheduleItemId(0L);
+            activityCostItem.setScheduleItemBudgetId(0L);
             actMatchList.add(activityCostItem);
         }else {
             if(throwEx){

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

@@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
@@ -10,6 +11,7 @@ import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
@@ -65,6 +67,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     public void release(Long activityId) {
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         TbsActivity activity = activityService.getById(activityId);
+        TbsCostApply costApply = costApplyService.getById(activity.getCostApplyId());
+        if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
+            Assert.throwEx("状态不支持释放活动费用");
+        }
         BigDecimal releaseAmount = validActivity(activity,false);
         TbsActivity param = new TbsActivity();
         param.setId(activityId);
@@ -79,7 +85,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         VtbFundFlow fundFlow = new VtbFundFlow();
         fundFlow.setFundType(VtbFundFlowType.Release);
         fundFlow.setVerificationId(0L);
-        fundFlow.setCenterGoodsCode(activity.getActivityCode()+"_0");
+        fundFlow.setCenterGoodsCode(activity.getActivityCode()+"_00");
         fundFlow.setCostApplyId(activity.getCostApplyId());
         fundFlow.setActivityId(activity.getId());
         fundFlow.setUsedAmount(releaseAmount);