核销兼容协议类，业务状态修复

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

@@ -18,6 +18,7 @@ import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 /**
@@ -98,10 +99,10 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         addNodeDTO.setUserSyId(sysUser.getSyUserId());
         addNodeDTO.setTemplateCode(getTemplateCode());
         R<String> result = getRequestService().addNode(addNodeDTO);
-        if(result.getData()!=null&&result.getData().contains("OK")){
+        if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){
             return R.ok();
         }
-        return R.error(result.getMsg());
+        return R.error();
     }
 
     /**

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

@@ -170,7 +170,9 @@ public class SeeYonRequestServiceImpl implements SeeYonRequestService {
     @Override
     public R<String> addNode(CtpAddNodeDTO addNodeDTO) {
         String title = "【校验OA节点状态】";
-        return seeYonRequestBaseService.postBase(TbsSeeYonConst.API_ADD_NODE,addNodeDTO,title);
+        R<String> result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_ADD_NODE,addNodeDTO,title);
+        log.warn("{}{}",title,JsonUtil.objectToJson(result));
+        return result;
     }
 
     @Override

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

@@ -74,7 +74,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 Assert.throwEx("当前模板已停用");
             }
         }
-        if(tbsCostApply.getContractFlag().equals(1)){
+        if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){
             LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsActivityPayCondition::getCostApplyId,id);
             List<TbsActivityPayCondition> payConditions = tbsActivityPayConditionMapper.selectList(lqw);
@@ -293,13 +293,17 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
             List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
             for (TbsActivity activity : activityList) {
-                if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release)
+                if(activity.getActivityState().equals(TbsActivityState.STATE_4_Release)){
-                        &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
+                        continue;
-                    return;
                 }
+                if(activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
+                    continue;
+                }
+                return;
             }
         }
         TbsCostApply costApply = new TbsCostApply();
+        costApply.setId(costApplyId);
         costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
         this.updateById(costApply);
     }

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

@@ -89,8 +89,8 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
             activity.setFinishedTime(LocalDateTime.now());
         }else {
             //判断是否协议类
-            TbsCostApply costApply = costApplyMapper.selectById(activity.getCostApplyId());
+            TbsCostApply costApply = costApplyMapper.selectById(orgActivity.getCostApplyId());
-            if(costApply.getContractFlag().equals(1)){
+            if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
                 activity.setActivityState(TbsActivityState.STATE_1_Finished);
             }else {
                 activity.setActivityState(TbsActivityState.STATE_0_Todo);

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

@@ -100,7 +100,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
             Assert.throwEx("状态不支持释放活动费用");
         }
-        BigDecimal releaseAmount = validActivity(costApply.getContractFlag().equals(1),activity,false,false);
+        BigDecimal releaseAmount = validActivity(costApply.getContractFlag()!=null
+                &&costApply.getContractFlag().equals(1),activity,false,false);
         TbsActivity param = new TbsActivity();
         param.setId(activityId);
         param.setActivityState(TbsActivityState.STATE_4_Release);
@@ -163,7 +164,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         payCondition.setFinishedFlag(1);
         activityPayConditionService.update(payCondition,updLqw);
         //如果为最后的活动，更变费用申请状态
-        costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag().equals(1));
+        costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1));
     }
 
     @Override
@@ -219,7 +220,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(payWay==null){
             Assert.throwEx("请选择支付方式");
         }
-        boolean cotractFlag = costApply.getContractFlag().equals(1);
+        boolean cotractFlag = costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1);
         if(cotractFlag){
             if(verificationBo.getPayConditionId()==null){
                 Assert.throwEx("请选择支付条件");
@@ -579,7 +580,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(costApply.getTotalActivityAmount().compareTo(totalCostApplyUsed)<=0){
             //金额是否用完
             updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
-        }else if (costApply.getContractFlag().equals(1)){
+        }else if (costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
             //协议类
             LambdaQueryWrapper<TbsActivityPayCondition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(TbsActivityPayCondition::getCostApplyId,costApply.getId());