修复异常

src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java

@@ -32,16 +32,16 @@ public enum BudgetLogOptFlag {
     /** 6-费用申请调减(费用申请，预算调减) */
     State_6(6,false),
 
-    /** 7-销售区域迁移调增 */
+    /** 已取消 7-销售区域迁移调增 */
     State_7(7,false),
 
-    /** 8-销售区域迁移调减 */
+    /** 已取消 8-销售区域迁移调减 */
     State_8(8,false),
 
-    /** 9-行政区域迁移调增 */
+    /** 已取消 9-行政区域迁移调增 */
     State_9(9,false),
 
-    /** 10-行政区域迁移调减 */
+    /** 已取消 10-行政区域迁移调减 */
     State_10(10,false),
 
     /** 11-政策申请 */

src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java

@@ -6,6 +6,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
@@ -72,5 +73,42 @@ public class PayPaymentMyController {
         return R.byEmptyList();
     }
 
+    /**
+     * 下属客户费用列表
+     * @return
+     */
+    @GetMapping("underlingSupplierPage")
+    public R<PageVo<PaySupplierVo>> getUnderlingSupplierPage(BmsSupplierSo paramSo){
+        BmsSupplier param = CopierUtil.copy(paramSo,new BmsSupplier());
+        List<String> childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
+        param.setSelectUserIds(childIds);
+        param.setSelectUserIdsFlag(true);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        if(CollectionUtil.isNotEmpty(pageVo.getList())){
+            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList());
+            return R.ok(PageVo.initNewList(pageVo,supplierVoList));
+        }
+        return R.byEmptyList();
+    }
+
+    /**
+     * 我的和下属的客户费用列表
+     * @return
+     */
+    @GetMapping("underlingAndMineSupplierPage")
+    public R<PageVo<PaySupplierVo>> underlingAndMineSupplierPage(BmsSupplierSo paramSo){
+        BmsSupplier param = CopierUtil.copy(paramSo,new BmsSupplier());
+        List<String> childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
+        childIds.add(AuthContextUtils.getSysUserId());
+        param.setSelectUserIds(childIds);
+        param.setSelectUserIdsFlag(true);
+        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        if(CollectionUtil.isNotEmpty(pageVo.getList())){
+            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList());
+            return R.ok(PageVo.initNewList(pageVo,supplierVoList));
+        }
+        return R.byEmptyList();
+    }
+
 }
 

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -106,7 +106,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){
             return R.ok();
         }
-        return R.error();
+        return R.error(result.getMsg());
     }
 
     /**

src/main/java/com/qs/serve/modules/tbs/common/TbsActivityState.java

@@ -7,12 +7,13 @@ package com.qs.serve.modules.tbs.common;
 public interface TbsActivityState {
 
     /**
-     * 活动状态：0-待核销；1-审批中；2-完成；3-冻结；4-已释放费用
+     * 活动状态：0-待核销；1-审批中；2-完成；3-冻结；4-已释放费用;5-关闭
      */
     Integer STATE_0_Todo = 0;
     Integer STATE_1_Checking = 1;
     Integer STATE_1_Finished = 2;
     Integer STATE_1_Baning = 3;
     Integer STATE_4_Release = 4;
+    Integer STATE_5_Close = 5;
 
 }

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

@@ -207,8 +207,11 @@ public class TbsActivityTemplateController {
      * @return
      */
     @GetMapping("/listMyTemplate")
-    public R<PageVo<TbsActivityTemplate>> listMyTemplate(String templateName){
+    public R<PageVo<TbsActivityTemplate>> listMyTemplate(String templateName,Integer contractFlag){
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = buildMyTempQueryWrapper(templateName);
+        if(contractFlag!=null){
+            tmpLqw.eq(TbsActivityTemplate::getContractFlag,contractFlag);
+        }
         PageUtil.startPage();
         List<TbsActivityTemplate> templates = tbsActivityTemplateService.list(tmpLqw);
         return R.byPageHelperList(templates);

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -35,7 +35,7 @@ public class TbsActivity implements Serializable {
     /** 编码 */
     private String activityCode;
 
-    /** 活动状态：0-待核销；1-审批中；2-完成；3-冻结;4-已释放 */
+    /** 活动状态：0-待核销；1-审批中；2-完成；3-冻结;4-已释放；5-已关闭(费用申请拒绝后关闭) */
     private Integer activityState;
 
     /** 费用申请id */

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

@@ -10,6 +10,7 @@ import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
@@ -150,6 +151,12 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
             budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag));
         }
         tbsBudgetLogService.saveBatch(oldLogList);
+        //关闭活动
+        LambdaQueryWrapper<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
+        activityLqw.eq(TbsActivity::getCostApplyId,costApplyId);
+        TbsActivity activityParam = new TbsActivity();
+        activityParam.setActivityState(TbsActivityState.STATE_5_Close);
+        tbsActivityMapper.update(activityParam,activityLqw);
         return null;
     }
 

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

@@ -6,6 +6,7 @@ import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.JsonUtil;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.entity.*;
+import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
@@ -36,6 +37,7 @@ import java.util.stream.Collectors;
 public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFundFlow> implements VtbFundFlowService {
 
     private final TbsCostApplyMapper costApplyMapper;
+    private final TbsActivityPayConditionMapper activityPayConditionMapper;
     private final TbsActivityService activityService;
     private final TbsActivitySubjectService activitySubjectService;
     private final TbsActivityCenterService activityCenterService;
@@ -90,16 +92,19 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
             activity.setFinishedTime(LocalDateTime.now());
         }else {
             //判断是否协议类
+            activity.setActivityState(TbsActivityState.STATE_0_Todo);
             TbsCostApply costApply = costApplyMapper.selectById(orgActivity.getCostApplyId());
-            log.debug("flushActivityAmount.costApply==>{}",costApply);
             if(costApply!=null){
                 if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
-                    activity.setActivityState(TbsActivityState.STATE_1_Finished);
-                }else {
-                    activity.setActivityState(TbsActivityState.STATE_0_Todo);
+                    //判断是否满足所有协议
+                    LambdaQueryWrapper<TbsActivityPayCondition> conLqw = new LambdaQueryWrapper<>();
+                    conLqw.eq(TbsActivityPayCondition::getActivityId,activity.getId());
+                    conLqw.eq(TbsActivityPayCondition::getFinishedFlag,0);
+                    long count = activityPayConditionMapper.selectCount(conLqw);
+                    if(count<1){
+                        activity.setActivityState(TbsActivityState.STATE_1_Finished);
+                    }
                 }
-            }else {
-                activity.setActivityState(TbsActivityState.STATE_0_Todo);
             }
         }
         activityService.updateById(activity);