diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java index c0b234e9..40643487 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java @@ -140,8 +140,8 @@ public class GoodsApplicationService { spu.setId(spuId); spu.setName(inventory.getInvSku()); spu.setShelf(1); - spu.setOrderFlag(Integer.parseInt(inventory.getInvOrderStatus())); - spu.setCostFlag(Integer.parseInt(inventory.getInvCostStatus())); +// spu.setOrderFlag(Integer.parseInt(inventory.getInvOrderStatus())); +// spu.setCostFlag(Integer.parseInt(inventory.getInvCostStatus())); spu = setCategoryInfo(inventory,spu); goodsSpuService.updateById(spu); } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 7b8ee5c5..d3df9286 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -24,6 +24,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.task.SysTask; +import org.jetbrains.annotations.NotNull; import java.util.*; import java.util.stream.Collectors; @@ -165,9 +166,22 @@ public interface SeeYonOperationService extends SeeYonBaseService{ default R> pageAffairV2(String targetId,String targetCode){ - return null; + boolean existFormId = checkSyFormIdIsNotNull(targetId); + if (!existFormId){ + return R.ok(new ArrayList<>()); + } + String templateCode = getTemplateCode(); + R> syResult = getRequestService().commonListAffairsV2(targetId,targetCode,null,templateCode); + List ctpAffairs = syResult.getData(); + if(ctpAffairs.size()>0){ + List result = getCtpAffairVos(ctpAffairs); + return R.ok(result); + } + return R.ok(new ArrayList<>()); } + + /** * 审批列表(用于详情页) * @param targetId @@ -182,42 +196,53 @@ public interface SeeYonOperationService extends SeeYonBaseService{ R> syResult = getRequestService().commonListAffairs(targetId,null,templateCode); List ctpAffairs = syResult.getData(); if(ctpAffairs.size()>0){ - DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); - SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class); - List affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream() - .map(CtpAffair::getAffairId).collect(Collectors.toList())); - List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); - List userList = getSysUserService().listByOaMemberIds(oaUserIds); - SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class); - List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - List postUserList = postUserService.listByUserIds(userIds); - Map> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); - List result = new ArrayList<>(); - for (CtpAffair ctpAffair : ctpAffairs) { - CtpAffairVo ctpAffairVo = new CtpAffairVo(); - ctpAffairVo.setAffairInfo(ctpAffair); - for (SysUser user : userList) { - if(ctpAffair.getMemberId().equals(user.getSyUserId())){ - ctpAffairVo.setUserInfo(user.toSysUserVo()); - List postUsers = postMap.get(user.getId()); - ctpAffairVo.setUserPostList(postUsers); - } + List result = getCtpAffairVos(ctpAffairs); + return R.ok(result); + } + return R.ok(new ArrayList<>()); + } + + /** + * 通用的审批列表封装 + * @param ctpAffairs + * @return + */ + @NotNull + default List getCtpAffairVos(List ctpAffairs) { + DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); + SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class); + List affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream() + .map(CtpAffair::getAffairId).collect(Collectors.toList())); + List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); + List userList = getSysUserService().listByOaMemberIds(oaUserIds); + SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class); + List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + List postUserList = postUserService.listByUserIds(userIds); + Map> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); + List result = new ArrayList<>(); + for (CtpAffair ctpAffair : ctpAffairs) { + CtpAffairVo ctpAffairVo = new CtpAffairVo(); + ctpAffairVo.setAffairInfo(ctpAffair); + for (SysUser user : userList) { + if(ctpAffair.getMemberId().equals(user.getSyUserId())){ + ctpAffairVo.setUserInfo(user.toSysUserVo()); + List postUsers = postMap.get(user.getId()); + ctpAffairVo.setUserPostList(postUsers); } - for (DataAffairCommit affairCommit : affairCommits) { - if(affairCommit.getId().equals(ctpAffair.getAffairId())){ - ctpAffairVo.setCommitInfo(affairCommit); - if(affairCommit.getAttachIds()!=null&&affairCommit.getAttachIds().length>0){ - ctpAffairVo.setAttachments( - sysAttachMapper.selectBatchIds( - Arrays.asList(affairCommit.getAttachIds()))); - } + } + for (DataAffairCommit affairCommit : affairCommits) { + if(affairCommit.getId().equals(ctpAffair.getAffairId())){ + ctpAffairVo.setCommitInfo(affairCommit); + if(affairCommit.getAttachIds()!=null&&affairCommit.getAttachIds().length>0){ + ctpAffairVo.setAttachments( + sysAttachMapper.selectBatchIds( + Arrays.asList(affairCommit.getAttachIds()))); } } - result.add(ctpAffairVo); } - return R.ok(result); + result.add(ctpAffairVo); } - return R.ok(new ArrayList<>()); + return result; } /** diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index 77dbf6ad..708fd8b1 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -94,8 +94,8 @@ public class SysDeleteLogServiceImpl extends ServiceImpl> ListBudgetAffairs(String batchId){ - return budgetBatchOperationService.pageAffair(batchId); + TbsBudgetBatch budgetBatch = tbsBudgetBatchService.getById(batchId); + return budgetBatchOperationService.pageAffairV2(batchId,budgetBatch.getBatchCode()); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java index 18734105..72fa5471 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java @@ -68,7 +68,8 @@ public class TbsBudgetCheckController { */ @GetMapping("/ListAffairs") public R> ListBudgetAffairs(String budgetId){ - return tbsBudgetApplyOperationService.pageAffair(budgetId); + TbsBudget tbsBudget = tbsBudgetService.getById(budgetId); + return tbsBudgetApplyOperationService.pageAffairV2(budgetId,tbsBudget.getBudgetNumber()); } @@ -79,7 +80,8 @@ public class TbsBudgetCheckController { */ @GetMapping("/ListChangeAffairs") public R> pageAffair(String changeId){ - return tbsBudgetChangeOperationService.pageAffair(changeId); + TbsBudgetChange budgetChange = tbsBudgetChangeService.getById(changeId); + return tbsBudgetChangeOperationService.pageAffairV2(changeId,budgetChange.getChangeCode()); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java index 9f73ff37..b91dbcd6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java @@ -102,7 +102,8 @@ public class TbsCostApplyCheckController { */ @GetMapping("/ListAffairs") public R> pageAffair(String costApplyId){ - return tbsCostApplyOperationServiceImpl.pageAffair(costApplyId); + //已重构该方法 + return tbsCostApplyOperationServiceImpl.pageAffairV2(costApplyId,null); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java index dca72225..5100f817 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java @@ -16,6 +16,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostTodo; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.bo.TbsSubmitToDoBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; +import com.qs.serve.modules.tbs.mapper.TbsCostTodoMapper; import com.qs.serve.modules.tbs.service.TbsCostApplyService; import com.qs.serve.modules.tbs.service.TbsCostTodoService; import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl; @@ -39,6 +40,7 @@ import java.util.List; @RequestMapping("tbs/costTodo") public class TbsCostTodoCheckController { + private final TbsCostTodoMapper tbsCostTodoMapper; private TbsCostTodoOperationServiceImpl costTodoOperationService; /** @@ -59,7 +61,8 @@ public class TbsCostTodoCheckController { */ @GetMapping("/ListAffairs") public R> pageAffair(String targetId){ - return costTodoOperationService.pageAffair(targetId); + TbsCostTodo costTodo = tbsCostTodoMapper.selectById(targetId); + return costTodoOperationService.pageAffairV2(targetId,costTodo.getTodoCode()); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index a172630a..70e7c02f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -190,7 +190,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService } @Override - public R> pageAffair(String targetId) { + public R> pageAffairV2(String targetId,String targetCode) { boolean existFormId = checkSyFormIdIsNotNull(targetId); if (!existFormId){ return R.ok(new ArrayList<>()); @@ -200,7 +200,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){ templateCode = TbsSeeYonConst.CostApplyContractConf.Code(); } - R> syResult = getRequestService().commonListAffairs(targetId,null,templateCode); + R> syResult = getRequestService().commonListAffairsV2(targetId,costApply.getCode(),null,templateCode); List ctpAffairs = syResult.getData(); if(ctpAffairs.size()>0){ DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 766393d3..ae8e5cad 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -1040,6 +1040,9 @@ public class PortalOfCostApplication { @Transactional(rollbackFor = Exception.class) public void createByContractCheck(ProcessCreateContractCheckBo createBo){ TbsCostApply costApply = costApplyService.getByCode(createBo.getCostCode()); + if(!costApply.getChargeState().equals(2)){ + Assert.throwEx("状态不支持调用"); + } TbsActivity activity = activityService.listByCostApplyId(costApply.getId()).get(0); List subjectList = activitySubjectService.listByActivityId(activity.getId()); BmsSupplier supplier = supplierService.getById(costApply.getSupplierId()); @@ -1187,6 +1190,9 @@ public class PortalOfCostApplication { paymentItemService.save(paymentItem); verificationSubjectService.save(verificationSubject); } + if(subjectSurplus.compareTo(BigDecimal.ZERO)>0){ + Assert.throwEx("余额不足"); + } //判断金额是否用完，用完直接更新状态 //根据ActivitySubject更新活动金额 List subjectNewList = activitySubjectService.listByActivityId(activity.getId()); diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 3efc9e8c..2c39e326 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -249,7 +249,8 @@ public class TzcPolicyController { */ @GetMapping("/ListAffairs") public R> pageMemberAffair(String policyId){ - return tzcPolicyOperationService.pageAffair(policyId); + TzcPolicy policy = tzcPolicyService.getById(policyId); + return tzcPolicyOperationService.pageAffairV2(policyId,policy.getPolicyCode()); // TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId); // if(tzcPolicy.getSyFormId()==null){ // return R.ok(); diff --git a/src/main/java/com/qs/serve/task/GoodsTask.java b/src/main/java/com/qs/serve/task/GoodsTask.java index 842869d0..ad283cab 100644 --- a/src/main/java/com/qs/serve/task/GoodsTask.java +++ b/src/main/java/com/qs/serve/task/GoodsTask.java @@ -31,7 +31,7 @@ public class GoodsTask { /** * 每两个小时同步一次 */ - @Scheduled(cron="0 0/2 0 * * ?") + //@Scheduled(cron="0 0/2 0 * * ?") public void syncStandGoods(){ AuthContextUtils.setTenant("001"); goodsApplicationService.syncStandGoods(false); @@ -40,7 +40,7 @@ public class GoodsTask { /** * 同步价格 */ - @Scheduled(cron="0 0 1 * * ?") + //@Scheduled(cron="0 0 1 * * ?") public void syncInvPrice(){ AuthContextUtils.setTenant("001"); goodsApplicationService.syncSkuPrice();