Browse Source

fix: 重构退回,添加拼接v2版本

v1.0
Yen 1 year ago
parent
commit
02c9e560a3
  1. 4
      src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
  2. 12
      src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java
  3. 5
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
  4. 6
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
  5. 5
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
  6. 4
      src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

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

@ -418,7 +418,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
* @return * @return
*/ */
default Object compensateBacked(String targetId){ default Object compensateBacked(String targetId){
return null; return this.doBacked(new TbsAffairCommitBo(targetId));
} }
/** /**
@ -436,7 +436,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
* @return * @return
*/ */
default Object compensateRefuse(String targetId){ default Object compensateRefuse(String targetId){
return null; return this.doRefuse(new TbsAffairCommitBo(targetId));
} }
/** /**

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

@ -50,6 +50,18 @@ public class TbsBudgetCheckController {
return R.ok(); return R.ok();
} }
@PostMapping("runApplyCompensate/{id}")
public R<?> runCompensate(@PathVariable("id") Long id){
tbsBudgetApplyOperationService.runCompensate(id+"");
return R.ok();
}
@PostMapping("runChangeCompensate/{id}")
public R<?> runChangeCompensate(@PathVariable("id") Long id){
tbsBudgetChangeOperationService.runCompensate(id+"");
return R.ok();
}
/** /**
* 提交更新申请 * 提交更新申请
* @param param * @param param

5
src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java

@ -16,6 +16,11 @@ import java.util.List;
@Data @Data
public class TbsAffairCommitBo { public class TbsAffairCommitBo {
public TbsAffairCommitBo(){}
public TbsAffairCommitBo(String targetId){
this.targetId = targetId;
}
/** /**
* 旧版的费用申请id核销id截止2023/5/23 * 旧版的费用申请id核销id截止2023/5/23
*/ */

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

@ -113,4 +113,10 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
return TbsSeeYonConst.BudgetApplyConf.Code(); return TbsSeeYonConst.BudgetApplyConf.Code();
} }
@Override
public Object compensateBacked(String targetId) {
TbsAffairCommitBo commitBo = new TbsAffairCommitBo();
commitBo.setTargetId(targetId);
return doBacked(commitBo);
}
} }

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

@ -179,4 +179,9 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi
return TbsSeeYonConst.BudgetChangeConf.Code(); return TbsSeeYonConst.BudgetChangeConf.Code();
} }
@Override
public Object compensateBacked(String targetId) {
this.doBacked(new TbsAffairCommitBo(targetId));
return null;
}
} }

4
src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@ -345,6 +345,10 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
Assert.throwEx(flowIdResult.getMsg()); Assert.throwEx(flowIdResult.getMsg());
} }
String flowId = flowIdResult.getData(); String flowId = flowIdResult.getData();
//这里错误时会抛出json数据
if(flowId!=null&&flowId.length()>60){
Assert.throwEx("远程调用异常:"+flowId);
}
String formId = null; String formId = null;
R<String> formIdResult = seeYonService.getFormId(TbsSeeYonConst.PolicyConf.Code(),policyId); R<String> formIdResult = seeYonService.getFormId(TbsSeeYonConst.PolicyConf.Code(),policyId);
if(formIdResult.getStatus()==200){ if(formIdResult.getStatus()==200){

Loading…
Cancel
Save