diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 937357f235..eac313ee3f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -58,6 +58,7 @@ import com.yxt.anrui.fin.api.finbillapplication.AppVinListDto; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -126,6 +127,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -747,7 +750,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 7c40c6a223..0c9bc5ad48 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -784,7 +784,7 @@ public class BusDeliveredApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { return rb.setMsg(voResultBean.getMsg()); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index f10bf43949..2a8051416d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -78,6 +78,7 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -131,6 +132,8 @@ public class BusValcustFilingService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -450,7 +453,7 @@ public class BusValcustFilingService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java index 8a1ccc6ed8..5e63e05545 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java @@ -63,4 +63,8 @@ public interface SysStaffPostFeign { @ApiOperation("根据员工sid查询岗位信息") @GetMapping("/selectPost/{sid}") ResultBean selectPost(@PathVariable("sid") String sid); + + @ApiOperation("根据员工sid查询岗位信息") + @GetMapping("/selPostByStaffSid/{sid}") + ResultBean> selPostByStaffSid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java index 1f6c8405fa..23414facc3 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java @@ -24,47 +24,52 @@ import java.util.List; @Component public class SysStaffPostFeignFallback implements SysStaffPostFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysstaffpost/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/listPage无法访问"); + } @Override - public ResultBean> listAll(SysStaffPostQuery query){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysstaffpost/listAll无法访问"); - } + public ResultBean> listAll(SysStaffPostQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/listAll无法访问"); + } - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysstaffpost/list无法访问"); - } + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/list无法访问"); + } - @Override - public ResultBean save(SysStaffPostDto dto){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/save无法访问"); - } - @Override - public ResultBean update(SysStaffPostDto dto,String sid){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/update无法访问"); - } + public ResultBean save(SysStaffPostDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/save无法访问"); + } - @Override - public ResultBean del(String ids){ - return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/del无法访问"); - } + @Override + public ResultBean update(SysStaffPostDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/update无法访问"); + } - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysstaffpost/fetch无法访问"); - } + @Override + public ResultBean del(String ids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/del无法访问"); + } - @Override - public ResultBean selectPost(String sid) { - return null; - } + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/fetch无法访问"); + } + + @Override + public ResultBean selectPost(String sid) { + return null; + } + + @Override + public ResultBean> selPostByStaffSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVos.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVos.java new file mode 100644 index 0000000000..dae770569c --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVos.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostVo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo
+ * Description: 员工岗位关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工岗位关联表 视图数据对象", description = "员工岗位关联表 视图数据对象") +@Data +public class SysStaffPostVos implements Vo { + + private String sid; + private String name; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java index 2c3c7935ea..1d5ee5b7db 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVos; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -61,4 +62,6 @@ public interface SysStaffPostMapper extends BaseMapper { String selectPost(String sid); List getPost(String staffSid); + + List selPostByStaffSid(String sid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml index f1902a8fae..0a44edcc01 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml @@ -39,8 +39,7 @@ from sys_staff_post ssp left join sys_post sp on ssp.postSid = sp.sid - where ssp.staffSid = #{sid} - LIMIT 1 + where ssp.staffSid = #{sid} LIMIT 1 + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostRest.java index 7332439080..126db275e8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.portal.biz.sysstaffpost; -import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto; -import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; -import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostQuery; -import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo; +import com.yxt.anrui.portal.api.sysstaffpost.*; import com.yxt.anrui.portal.api.systemlog.SystemLog; import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.biz.systemlog.SystemLogService; @@ -121,4 +118,9 @@ public class SysStaffPostRest implements SysStaffPostFeign { } return rb.success().setData(s); } + + @Override + public ResultBean> selPostByStaffSid(String sid) { + return sysStaffPostService.selPostByStaffSid(sid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java index 9a5fbc9c70..0bcc60e9bc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostService.java @@ -7,6 +7,7 @@ import com.yxt.anrui.portal.api.sysstaffpost.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -139,4 +140,10 @@ public class SysStaffPostService extends MybatisBaseService getPost(String staffSid) { return baseMapper.getPost(staffSid); } + + public ResultBean> selPostByStaffSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List sysStaffPostVos = baseMapper.selPostByStaffSid(sid); + return rb.success().setData(sysStaffPostVos); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index dab39047a3..5b91f538ee 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -560,7 +560,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -764,7 +764,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index 83087abe52..b9d2c802a1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -773,7 +773,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -954,7 +954,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java index 11f2b9aef1..cbc59b2a52 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java @@ -497,7 +497,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -574,7 +574,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java index 8429248876..e92e91e6db 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java @@ -382,7 +382,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -459,7 +459,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 1ae402d486..204f38dbae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -366,7 +366,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -444,7 +444,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java index 8624f42037..f711cce277 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; + import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApply; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyQuery; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo; @@ -63,88 +64,88 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFei @RequestMapping("v1/loancaseexecuteapply") public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign { - @Autowired - private LoanCaseExecuteApplyService loanCaseExecuteApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanCaseExecuteApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanCaseExecuteApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanCaseExecuteApplyService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private LoanCaseExecuteApplyService loanCaseExecuteApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanCaseExecuteApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanCaseExecuteApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanCaseExecuteApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return loanCaseExecuteApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return loanCaseExecuteApplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean details(String sid, String userSid, String orgPath) { - return loanCaseExecuteApplyService.details(sid,userSid,orgPath); - } - - @Override - public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { - return loanCaseExecuteApplyService.submit(dto); - } - - @Override - public ResultBean complete(LoanCaseExecuteApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId()); - return loanCaseExecuteApplyService.complete(bv); - } - - @Override - public ResultBean> getPreviousNodesForReject(LoanCaseExecuteApplyNodeQuery query) { - return loanCaseExecuteApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean> getNextNodesForSubmit(LoanCaseExecuteApplyNodeQuery query) { - return loanCaseExecuteApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean reject(LoanCaseExecuteApplyTaskQuery query) { - return loanCaseExecuteApplyService.reject(query); - } - - @Override - public ResultBean revokeProcess(LoanCaseExecuteApplyTaskQuery query) { - return loanCaseExecuteApplyService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(LoanCaseExecuteApplyTaskQuery query) { - return loanCaseExecuteApplyService.breakProcess(query); - } - - @Override - public ResultBean delegate(LoanCaseExecuteApplyDelegateQuery query) { - return loanCaseExecuteApplyService.delegate(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyDetailsVo vo = loanCaseExecuteApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean details(String sid, String userSid, String orgPath) { + return loanCaseExecuteApplyService.details(sid, userSid, orgPath); + } + + @Override + public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) { + return loanCaseExecuteApplyService.submit(dto); + } + + @Override + public ResultBean complete(LoanCaseExecuteApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId()); + return loanCaseExecuteApplyService.complete(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(LoanCaseExecuteApplyNodeQuery query) { + return loanCaseExecuteApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(LoanCaseExecuteApplyNodeQuery query) { + return loanCaseExecuteApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean reject(LoanCaseExecuteApplyTaskQuery query) { + return loanCaseExecuteApplyService.reject(query); + } + + @Override + public ResultBean revokeProcess(LoanCaseExecuteApplyTaskQuery query) { + return loanCaseExecuteApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(LoanCaseExecuteApplyTaskQuery query) { + return loanCaseExecuteApplyService.breakProcess(query); + } + + @Override + public ResultBean delegate(LoanCaseExecuteApplyDelegateQuery query) { + return loanCaseExecuteApplyService.delegate(query); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java index 5bd635a0f2..a9eb580a2b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java @@ -411,7 +411,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -488,7 +488,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 775c1502d3..76daa84f9f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -116,6 +117,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -473,7 +476,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index 6c42d508c5..096cb5833e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java @@ -397,7 +397,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -474,7 +474,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java index c6d01933a6..2771dc74c5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java @@ -495,7 +495,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //修改远程控制状态 @@ -589,7 +589,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index d96d989ade..47a0fa58a4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -103,6 +104,8 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index 2f02309c05..56bf1fb088 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -345,7 +345,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); scmSpecialRebateService.updateState(businessSid, 5); @@ -410,7 +410,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java index eadfc6977c..669a61abe6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java @@ -59,7 +59,8 @@ public class AdExpatriatesHomeApply extends BaseEntity { @ApiModelProperty("探亲家属人数") private String peoNum; // 探亲家属人数 @ApiModelProperty("探亲类型") - private String homeType; // 探亲类型 + private String homeTypeKey; + private String homeTypeValue; @ApiModelProperty("基础表单sid") private String formSid; // 基础表单sid @ApiModelProperty("关联审批sid列表,英文逗号分隔") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java index fa7c0e8052..3ef2e850d3 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java @@ -56,7 +56,9 @@ public class AdExpatriatesHomeApplyDetailVo implements Vo { @ApiModelProperty("探亲家属人数") private String peoNum; @ApiModelProperty("探亲类型") - private String homeType; + private String homeTypeValue; + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("图片") private List files = new ArrayList<>(); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java index b1efa12b1c..5d30b07c13 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java @@ -62,7 +62,11 @@ public class AdExpatriatesHomeApplyDto extends OaFormDto { @ApiModelProperty("探亲家属人数") private String peoNum; @ApiModelProperty("探亲类型") - private String homeType; + private FormCommon homeTypeObj; + private String homeTypeKey; + private String homeTypeValue; + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("基础表单sid") private String formSid; @ApiModelProperty("关联审批sid列表,英文逗号分隔") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml index 11b60ea6f6..45676c8a0e 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml @@ -23,7 +23,7 @@ thisEndDate, relationValue, peoNum, - homeType + homeTypeValue from ad_expatriates_home_apply where sid = #{sid} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java index ab37d945ca..8162f854a5 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java @@ -33,6 +33,10 @@ import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.anrui.oa.feign.portal.sysstaffpost.SysStaffPostFeign; +import com.yxt.anrui.oa.feign.portal.sysstaffpost.SysStaffPostVos; +import com.yxt.anrui.oa.feign.sysuser.SysUserFeign; +import com.yxt.anrui.oa.feign.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; @@ -54,11 +58,22 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService getSaveInit(String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); AdExpatriatesHomeApplyVo adExpatriatesHomeApplyVo = new AdExpatriatesHomeApplyVo(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); adExpatriatesHomeApplyVo.setCreateBySid(userSid); + adExpatriatesHomeApplyVo.setCreateByName(sysUserVo.getName()); + List staffPostVos = sysStaffPostFeign.selPostByStaffSid(sysUserVo.getStaffSid()).getData(); + if (staffPostVos.size() > 0){ + adExpatriatesHomeApplyVo.setJobKey(staffPostVos.get(0).getSid()); + adExpatriatesHomeApplyVo.setJobValue(staffPostVos.get(0).getName()); + } adExpatriatesHomeApplyVo.setOrgSidPath(orgPath); return rb.success().setData(adExpatriatesHomeApplyVo); } @@ -82,10 +97,10 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService files = oaAppendixService.selectByLinkSid(sid, "图片"); adExpatriatesHomeApplyVo.setFiles(files); List appes = oaAppendixService.selectByLinkSid(sid, "文件"); @@ -97,7 +112,7 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService saveOrUpdateDto(AdExpatriatesHomeApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); - String homeType = dto.getHomeType(); + String homeTypeKey = dto.getHomeTypeKey(); List files = dto.getFiles(); List appes = dto.getAppes(); if (StringUtils.isBlank(sid)) { @@ -105,9 +120,9 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService files = new ArrayList<>(); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostFeign.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostFeign.java new file mode 100644 index 0000000000..27e564b55c --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostFeign.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.oa.feign.portal.sysstaffpost; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +@Api(tags = "员工岗位关联表") +@FeignClient( + contextId = "anrui-portal-SysStaffPost", + name = "anrui-portal", + path = "v1/sysstaffpost") +public interface SysStaffPostFeign { + + @ApiOperation("根据员工sid查询岗位信息") + @GetMapping("/selPostByStaffSid/{sid}") + ResultBean> selPostByStaffSid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostVos.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostVos.java new file mode 100644 index 0000000000..28368ebe2f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstaffpost/SysStaffPostVos.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.oa.feign.portal.sysstaffpost; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class SysStaffPostVos implements Vo { + + private String sid; + private String name; +}