更改

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<BusAdvanc
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
@@ -663,7 +666,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         //流程定义id
 //        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -747,7 +750,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
             return rb.setMsg("orgSidPath 为空！");
         }
         if (bv.getTaskId().equals(busAdvanceGinvoiceapply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<BusDeliveredApp
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         bv.setFormVariables(variables);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
             }

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<BusValcustFiling
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
@@ -372,7 +375,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         //=======================================
         bv.setFormVariables(variables);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -450,7 +453,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busValcustFiling.getOrgSidPath());
         if (bv.getTaskId().equals(busValcustFiling.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<String> selectPost(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据员工sid查询岗位信息")
+    @GetMapping("/selPostByStaffSid/{sid}")
+    ResultBean<List<SysStaffPostVos>> selPostByStaffSid(@PathVariable("sid") String sid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java

@@ -67,4 +67,9 @@ public class SysStaffPostFeignFallback implements SysStaffPostFeign {
     public ResultBean<String> selectPost(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysStaffPostVos>> selPostByStaffSid(String sid) {
+        return null;
+    }
 }

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(门户建设) <br/>
+ * File: SysStaffPostVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo <br/>
+ * Description: 员工岗位关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工岗位关联表 视图数据对象", description = "员工岗位关联表 视图数据对象")
+@Data
+public class SysStaffPostVos implements Vo {
+
+    private String sid;
+    private String name;
+}

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<SysStaffPost> {
     String selectPost(String sid);
 
     List<String> getPost(String staffSid);
+
+    List<SysStaffPostVos> selPostByStaffSid(String sid);
 }

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
     </select>
 
     <select id="selectPost" resultType="java.lang.String">
@@ -57,4 +56,11 @@
                  left join sys_post sp on ssp.postSid = sp.sid
         where ssp.staffSid = #{staffSid}
     </select>
+
+    <select id="selPostByStaffSid" resultType="com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVos">
+        select sp.sid, sp.name
+        from sys_staff_post ssp
+                 left join sys_post sp on ssp.postSid = sp.sid
+        where ssp.staffSid = #{staffSid}
+    </select>
 </mapper>

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<List<SysStaffPostVos>> selPostByStaffSid(String sid) {
+        return sysStaffPostService.selPostByStaffSid(sid);
+    }
 }

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<SysStaffPostMapper,
     public List<String> getPost(String staffSid) {
         return baseMapper.getPost(staffSid);
     }
+
+    public ResultBean<List<SysStaffPostVos>> selPostByStaffSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysStaffPostVos> sysStaffPostVos = baseMapper.selPostByStaffSid(sid);
+        return rb.success().setData(sysStaffPostVos);
+    }
 }

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<LoanBeColle
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanBeCollectionApply.getOrgPath()).getData();
         bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -764,7 +764,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanBeCollectionApply.getOrgPath());
         if (bv.getTaskId().equals(loanBeCollectionApply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<LoanBePadsi
         bv.setModelId(ProcDefEnum.BEPADSINCEREAPPLY.getProDefId());
         bv.setFormVariables(variables);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -954,7 +954,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanBePadsincereApply.getOrgPath());
         if (bv.getTaskId().equals(loanBePadsincereApply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<LoanCaseAppea
 		bv.setModelId(ProcDefEnum.LOANCASEAPPEALAPPLY.getProDefId());
 		bv.setFormVariables(variables);
 		if (r == 1) {
-			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(ufVo));
 			//极光推送
@@ -574,7 +574,7 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
 		bv.setFormVariables(variables);
 		bv.setOrgSidPath(loanCaseAppealApply.getOrgPath());
 		if (bv.getTaskId().equals(loanCaseAppealApply.getTaskId())) {
-			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
 			if (!resultBean.getSuccess()) {
 				return rb.setMsg(resultBean.getMsg());
 			}

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<LoanCaseCloseA
 		bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
 		if (r == 1) {
-			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(ufVo));
 			//极光推送
@@ -459,7 +459,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 		bv.setFormVariables(variables);
 		bv.setOrgSidPath(loanCaseCloseApply.getOrgPath());
 		if (bv.getTaskId().equals(loanCaseCloseApply.getTaskId())) {
-			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
 			if (!resultBean.getSuccess()) {
 				return rb.setMsg(resultBean.getMsg());
 			}

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<LoanCa
 		bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
 		bv.setFormVariables(variables);
 		if (r == 1) {
-			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(ufVo));
 			//极光推送
@@ -444,7 +444,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
 		bv.setFormVariables(variables);
 		bv.setOrgSidPath(loanCaseEntrustLawyerApply.getOrgPath());
 		if (bv.getTaskId().equals(loanCaseEntrustLawyerApply.getTaskId())) {
-			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
 			if (!resultBean.getSuccess()) {
 				return rb.setMsg(resultBean.getMsg());
 			}

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;

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<LoanCaseExec
 		bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
 		bv.setFormVariables(variables);
 		if (r == 1) {
-			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
 			UpdateFlowFieldVo ufVo = voResultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(ufVo));
 			//极光推送
@@ -488,7 +488,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
 		bv.setFormVariables(variables);
 		bv.setOrgSidPath(loanCaseExecuteApply.getOrgPath());
 		if (bv.getTaskId().equals(loanCaseExecuteApply.getTaskId())) {
-			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
 			if (!resultBean.getSuccess()) {
 				return rb.setMsg(resultBean.getMsg());
 			}

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<LoanCreditA
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
@@ -394,7 +397,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
         bv.setFormVariables(variables);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -473,7 +476,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         bv.setOrgSidPath(loanCreditAppealApply.getOrgSidPath());
         bv.setModelId(loanCreditAppealApply.getProcDefId());
         if (bv.getTaskId().equals(loanCreditAppealApply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<LoanRestor
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanRestoreReportApply.getOrgPath()).getData();
         bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -474,7 +474,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanRestoreReportApply.getOrgPath());
         if (bv.getTaskId().equals(loanRestoreReportApply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<LoanVehClea
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanVehClearanceApply.getOrgPath()).getData();
         bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //修改远程控制状态
@@ -589,7 +589,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         bv.setFormVariables(variables);
         bv.setOrgSidPath(loanVehClearanceApply.getOrgPath());
         if (bv.getTaskId().equals(loanVehClearanceApply.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<ScmApplyInboundMa
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private ScmVehicleExamineService scmVehicleExamineService;
@@ -649,7 +652,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String confirmDate = "";
         if (bv.getTaskId().equals(booad.getTaskId())) {
             bv.setOrgSidPath(booad.getOrgSidPath());
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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<ScmSpe
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         bv.setFormVariables(variables);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> 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<ScmSpe
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(scmSpecialrebatedistribute.getTaskId())) {
-            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }

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列表,英文逗号分隔")

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<String> files = new ArrayList<>();

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列表,英文逗号分隔")

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}
     </select>

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<AdExpatria
     private OaFormService oaFormService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffPostFeign sysStaffPostFeign;
 
     public ResultBean<AdExpatriatesHomeApplyVo> getSaveInit(String userSid, String orgPath) {
         ResultBean<AdExpatriatesHomeApplyVo> rb = ResultBean.fireFail();
         AdExpatriatesHomeApplyVo adExpatriatesHomeApplyVo = new AdExpatriatesHomeApplyVo();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         adExpatriatesHomeApplyVo.setCreateBySid(userSid);
+        adExpatriatesHomeApplyVo.setCreateByName(sysUserVo.getName());
+        List<SysStaffPostVos> 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<AdExpatria
         BeanUtil.copyProperties(adExpatriatesHomeApply, adExpatriatesHomeApplyVo);
         adExpatriatesHomeApplyVo.setJobKey(adExpatriatesHomeApply.getPostSid());
         adExpatriatesHomeApplyVo.setJobValue(adExpatriatesHomeApply.getPostName());
-        FormCommon jobObj = FormCommon.of(adExpatriatesHomeApplyVo.getJobKey(), adExpatriatesHomeApplyVo.getJobValue());
-        adExpatriatesHomeApplyVo.setJobObj(jobObj);
         FormCommon relationObj = FormCommon.of(adExpatriatesHomeApplyVo.getRelationKey(), adExpatriatesHomeApplyVo.getRelationValue());
         adExpatriatesHomeApplyVo.setRelationObj(relationObj);
+        FormCommon homeTypeObj = FormCommon.of(adExpatriatesHomeApplyVo.getHomeTypeKey(), adExpatriatesHomeApplyVo.getHomeTypeValue());
+        adExpatriatesHomeApplyVo.setHomeTypeObj(homeTypeObj);
         List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
         adExpatriatesHomeApplyVo.setFiles(files);
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
@@ -97,7 +112,7 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
     public ResultBean<String> saveOrUpdateDto(AdExpatriatesHomeApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        String homeType = dto.getHomeType();
+        String homeTypeKey = dto.getHomeTypeKey();
         List<String> files = dto.getFiles();
         List<String> appes = dto.getAppes();
         if (StringUtils.isBlank(sid)) {
@@ -105,9 +120,9 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
             AdExpatriatesHomeApply entity = new AdExpatriatesHomeApply();
             BeanUtil.copyProperties(dto, entity, "sid");
 
-            if ("1".equals(homeType)){
+            if ("0".equals(homeTypeKey)){
                 dto.setBillNo("ZWRYTQXJSQ");
-            }else if ("2".equals(homeType)){
+            }else if ("1".equals(homeTypeKey)){
                 dto.setBillNo("ZWRYJSTQSQ");
             }
             dto.setSid(entity.getSid());
@@ -118,12 +133,16 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
             }
 
             entity.setFormSid(resultBean.getData());
+            entity.setPostSid(dto.getJobKey());
+            entity.setPostName(dto.getJobValue());
             baseMapper.insert(entity);
             sid = entity.getSid();
         } else {
             // 更新操作
             AdExpatriatesHomeApply entity = fetchBySid(sid);
             BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setPostSid(dto.getJobKey());
+            entity.setPostName(dto.getJobValue());
             baseMapper.updateById(entity);
         }
         // 处理附件

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java

@@ -44,9 +44,9 @@ public class AdExpatriatesHomeApplyVo implements Vo {
       private String orgPath;*/
     private String orgSidPath;
     private String createBySid;
+    private String createByName;
 
     @ApiModelProperty("申请人岗位")
-    private FormCommon jobObj;
     private String jobKey;
     private String jobValue;
     @ApiModelProperty("上次探亲休假探亲地")
@@ -68,7 +68,11 @@ public class AdExpatriatesHomeApplyVo implements Vo {
     @ApiModelProperty("探亲家属人数")
     private String peoNum;
     @ApiModelProperty("探亲类型")
-    private String homeType;
+    private FormCommon homeTypeObj;
+    private String homeTypeKey;
+    private String homeTypeValue;
+    @ApiModelProperty("备注")
+    private String remarks;
 
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();

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<List<SysStaffPostVos>> selPostByStaffSid(@PathVariable("sid") String sid);
+}

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;
+}