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 2ac1bbba..9f72df48 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 @@ -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 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(); } /** diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java index 376771a9..f2135b47 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java @@ -170,7 +170,9 @@ public class SeeYonRequestServiceImpl implements SeeYonRequestService { @Override public R addNode(CtpAddNodeDTO addNodeDTO) { String title = "【校验OA节点状态】"; - return seeYonRequestBaseService.postBase(TbsSeeYonConst.API_ADD_NODE,addNodeDTO,title); + R result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_ADD_NODE,addNodeDTO,title); + log.warn("{}{}",title,JsonUtil.objectToJson(result)); + return result; } @Override diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index ace20504..c389a1bd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -74,7 +74,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityPayCondition::getCostApplyId,id); List payConditions = tbsActivityPayConditionMapper.selectList(lqw); @@ -293,13 +293,17 @@ public class TbsCostApplyServiceImpl extends ServiceImpl activityList = tbsActivityMapper.selectList(actLqw); for (TbsActivity activity : activityList) { - if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release) - &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){ - return; + if(activity.getActivityState().equals(TbsActivityState.STATE_4_Release)){ + continue; } + 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); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java index 32a527e7..4002a273 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java @@ -89,8 +89,8 @@ public class VtbFundFlowServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(TbsActivityPayCondition::getCostApplyId,costApply.getId());