diff --git a/src/main/java/com/qs/serve/common/model/dto/PageVo.java b/src/main/java/com/qs/serve/common/model/dto/PageVo.java index c068305b..c06af136 100644 --- a/src/main/java/com/qs/serve/common/model/dto/PageVo.java +++ b/src/main/java/com/qs/serve/common/model/dto/PageVo.java @@ -43,4 +43,14 @@ public class PageVo{ this.totalPage = total%pageSize==0?total/pageSize:(total/pageSize+1); } + public static PageVo initNewList(PageVo oldVo,List list){ + PageVo newVo = new PageVo<>(); + newVo.setPageNum(oldVo.getPageNum()); + newVo.setPageSize(oldVo.getPageSize()); + newVo.setTotal(oldVo.getTotal()); + newVo.setTotalPage(oldVo.getTotalPage()); + newVo.setList(list); + return newVo; + } + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java index 21b9355f..13050dc5 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java +++ b/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; + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index 166a1a69..7faf7cfa 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/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> pageMemberAffair(CtpAffairQo ctpAffairQo) { String title = "用户审批流程"; R result = postBase(TbsSeeYonConst.API_PAGE_AFFAIR,ctpAffairQo,title); - + if(result.getStatus()==200){ + PageVo pageVo = JsonUtil.jsonToPojo(result.getData(),PageVo.class); + List 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 resultVo = PageVo.initNewList(pageVo,affairList); + return R.ok(resultVo); + } return null; } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 191c8afd..c402f7a1 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/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()); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 0140dba0..23b657d4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/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> 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 costApplyIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList()); List costApplyList = tbsCostApplyService.listByIds(costApplyIds); - for (TbsCostApply costApply : costApplyList) { - for (CtpAffair ctpAffair : ctpAffairs) { + List result = new ArrayList<>(); + 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 costApplyPageVo = new PageVo<>(); - costApplyPageVo.setPageNum(pageVo.getPageNum()); - costApplyPageVo.setPageSize(pageVo.getPageSize()); - costApplyPageVo.setTotal(pageVo.getTotal()); - costApplyPageVo.setTotalPage(pageVo.getTotalPage()); - costApplyPageVo.setList(costApplyList); + PageVo costApplyPageVo = PageVo.initNewList(pageVo,result); return R.ok(costApplyPageVo); } return R.byEmptyList(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java new file mode 100644 index 00000000..7a07e1f4 --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 677224b8..2d734d32 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -130,6 +130,7 @@ public class TbsBudgetApplicationService { List topTheadHeaders = new ArrayList<>(); Map> 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){ 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 f1c79ab1..9ba50928 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 @@ -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