opt: 重构退回，添加拼接v2版本

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.setOrderFlag(Integer.parseInt(inventory.getInvOrderStatus()));
-                spu.setCostFlag(Integer.parseInt(inventory.getInvCostStatus()));
+//                spu.setCostFlag(Integer.parseInt(inventory.getInvCostStatus()));
                 spu = setCategoryInfo(inventory,spu);
                 goodsSpuService.updateById(spu);
             }

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<List<CtpAffairVo>> pageAffairV2(String targetId,String targetCode){
-        return null;
+        boolean existFormId = checkSyFormIdIsNotNull(targetId);
+        if (!existFormId){
+            return R.ok(new ArrayList<>());
+        }
+        String templateCode = getTemplateCode();
+        R<List<CtpAffair>> syResult = getRequestService().commonListAffairsV2(targetId,targetCode,null,templateCode);
+        List<CtpAffair> ctpAffairs = syResult.getData();
+        if(ctpAffairs.size()>0){
+            List<CtpAffairVo> result = getCtpAffairVos(ctpAffairs);
+            return R.ok(result);
+        }
+        return R.ok(new ArrayList<>());
     }
 
+
+
     /**
      * 审批列表(用于详情页)
      * @param targetId
@@ -182,42 +196,53 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         R<List<CtpAffair>> syResult = getRequestService().commonListAffairs(targetId,null,templateCode);
         List<CtpAffair> ctpAffairs = syResult.getData();
         if(ctpAffairs.size()>0){
-            DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
+            List<CtpAffairVo> result = getCtpAffairVos(ctpAffairs);
-            SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class);
+            return R.ok(result);
-            List<DataAffairCommit> affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream()
+        }
-                    .map(CtpAffair::getAffairId).collect(Collectors.toList()));
+        return R.ok(new ArrayList<>());
-            List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
+    }
-            List<SysUser> userList = getSysUserService().listByOaMemberIds(oaUserIds);
+
-            SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class);
+    /**
-            List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+     * 通用的审批列表封装
-            List<SysPostUser> postUserList = postUserService.listByUserIds(userIds);
+     * @param ctpAffairs
-            Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId));
+     * @return
-            List<CtpAffairVo> result = new ArrayList<>();
+     */
-            for (CtpAffair ctpAffair : ctpAffairs) {
+    @NotNull
-                CtpAffairVo ctpAffairVo = new CtpAffairVo();
+    default List<CtpAffairVo> getCtpAffairVos(List<CtpAffair> ctpAffairs) {
-                ctpAffairVo.setAffairInfo(ctpAffair);
+        DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
-                for (SysUser user : userList) {
+        SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class);
-                    if(ctpAffair.getMemberId().equals(user.getSyUserId())){
+        List<DataAffairCommit> affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream()
-                        ctpAffairVo.setUserInfo(user.toSysUserVo());
+                .map(CtpAffair::getAffairId).collect(Collectors.toList()));
-                        List<SysPostUser> postUsers = postMap.get(user.getId());
+        List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
-                        ctpAffairVo.setUserPostList(postUsers);
+        List<SysUser> userList = getSysUserService().listByOaMemberIds(oaUserIds);
-                    }
+        SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class);
+        List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+        List<SysPostUser> postUserList = postUserService.listByUserIds(userIds);
+        Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId));
+        List<CtpAffairVo> 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<SysPostUser> postUsers = postMap.get(user.getId());
+                    ctpAffairVo.setUserPostList(postUsers);
                 }
-                for (DataAffairCommit affairCommit : affairCommits) {
+            }
-                    if(affairCommit.getId().equals(ctpAffair.getAffairId())){
+            for (DataAffairCommit affairCommit : affairCommits) {
-                        ctpAffairVo.setCommitInfo(affairCommit);
+                if(affairCommit.getId().equals(ctpAffair.getAffairId())){
-                        if(affairCommit.getAttachIds()!=null&&affairCommit.getAttachIds().length>0){
+                    ctpAffairVo.setCommitInfo(affairCommit);
-                            ctpAffairVo.setAttachments(
+                    if(affairCommit.getAttachIds()!=null&&affairCommit.getAttachIds().length>0){
-                                    sysAttachMapper.selectBatchIds(
+                        ctpAffairVo.setAttachments(
-                                            Arrays.asList(affairCommit.getAttachIds())));
+                                sysAttachMapper.selectBatchIds(
-                        }
+                                        Arrays.asList(affairCommit.getAttachIds())));
                     }
                 }
-                result.add(ctpAffairVo);
             }
-            return R.ok(result);
+            result.add(ctpAffairVo);
         }
-        return R.ok(new ArrayList<>());
+        return result;
     }
 
     /**

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -94,8 +94,8 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         tbsCostApplyRemoveMapper.tbs_budget_cost_item_split(costApplyId);
         tbsCostApplyRemoveMapper.vtb_fund_flow(costApplyId);
         //tbsCostApplyRemoveMapper.bir_activity_center_goods(costApplyId);
-        //tbsCostApplyRemoveMapper.bir_base_activity(costApplyId);
+        tbsCostApplyRemoveMapper.bir_base_activity(costApplyId);
-        //tbsCostApplyRemoveMapper.bir_payment_item(costApplyId);
+        tbsCostApplyRemoveMapper.bir_payment_item(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_subject(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_yard_item(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_yard_center_item(costApplyId);

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

@@ -113,7 +113,8 @@ public class TbsBudgetBatchController {
      */
     @GetMapping("/ListAffairs")
     public R<List<CtpAffairVo>> ListBudgetAffairs(String batchId){
-        return budgetBatchOperationService.pageAffair(batchId);
+        TbsBudgetBatch budgetBatch = tbsBudgetBatchService.getById(batchId);
+        return budgetBatchOperationService.pageAffairV2(batchId,budgetBatch.getBatchCode());
     }
 
 

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

@@ -68,7 +68,8 @@ public class TbsBudgetCheckController {
      */
     @GetMapping("/ListAffairs")
     public R<List<CtpAffairVo>> 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<List<CtpAffairVo>> pageAffair(String changeId){
-        return tbsBudgetChangeOperationService.pageAffair(changeId);
+        TbsBudgetChange budgetChange = tbsBudgetChangeService.getById(changeId);
+        return tbsBudgetChangeOperationService.pageAffairV2(changeId,budgetChange.getChangeCode());
     }
 
     /**

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

@@ -102,7 +102,8 @@ public class TbsCostApplyCheckController {
      */
     @GetMapping("/ListAffairs")
     public R<List<CtpAffairVo>> pageAffair(String costApplyId){
-        return tbsCostApplyOperationServiceImpl.pageAffair(costApplyId);
+        //已重构该方法
+        return tbsCostApplyOperationServiceImpl.pageAffairV2(costApplyId,null);
     }
 
     /**

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<List<CtpAffairVo>> pageAffair(String targetId){
-        return costTodoOperationService.pageAffair(targetId);
+        TbsCostTodo costTodo = tbsCostTodoMapper.selectById(targetId);
+        return costTodoOperationService.pageAffairV2(targetId,costTodo.getTodoCode());
     }
 
     /**

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

@@ -190,7 +190,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
     }
 
     @Override
-    public R<List<CtpAffairVo>> pageAffair(String targetId) {
+    public R<List<CtpAffairVo>> 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<List<CtpAffair>> syResult = getRequestService().commonListAffairs(targetId,null,templateCode);
+        R<List<CtpAffair>> syResult = getRequestService().commonListAffairsV2(targetId,costApply.getCode(),null,templateCode);
         List<CtpAffair> ctpAffairs = syResult.getData();
         if(ctpAffairs.size()>0){
             DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);

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<TbsActivitySubject> 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<TbsActivitySubject> subjectNewList = activitySubjectService.listByActivityId(activity.getId());

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -249,7 +249,8 @@ public class TzcPolicyController {
      */
     @GetMapping("/ListAffairs")
     public R<List<CtpAffairVo>> 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();

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