diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 528d346da9..506f4037ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -53,10 +53,12 @@ public class FinPaymentapplyDetailsVo implements Vo { private String sid; @ApiModelProperty(value = "创建人sid") private String createBySid; - @ApiModelProperty("申请编号") - private String billNo; + @ApiModelProperty("业务编号") + private String busSid; @ApiModelProperty("申请人姓名") private String name; + @ApiModelProperty(value = "申请日期") + private String createTime; @ApiModelProperty("款项类别,数据字典") private String costTypeKey; @ApiModelProperty("款项类别") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index 86b855e70f..f02a8efb60 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -73,11 +73,14 @@ public class FinPaymentapplyDto implements Dto { private String receiveCompany; @ApiModelProperty(value = "收款单位sid") private String receiveCompanySid; - @ApiModelProperty("收款银行?") + @ApiModelProperty("收款银行") private String receiveBank; @ApiModelProperty("收款银行账号") private String receiveBankAccount; @ApiModelProperty(value = "备注") private String remarks; + @ApiModelProperty(value = "业务关联:编号") + private String busSid; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java index d6bddad03a..55a3db16e3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java @@ -56,7 +56,7 @@ public class FinPaymentapplyQuery implements Query { @ApiModelProperty("款项名称,数据字典") private String costTitleKey; @ApiModelProperty("收款单位名称") - private String receiveCompany; + private String receiveCompanySid; @ApiModelProperty(value = "用户sid") private String userSid; @ApiModelProperty(value = "申请开始时间") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java index 9b0ad56620..8b0b93f634 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java @@ -53,8 +53,8 @@ public class FinPaymentapplyVo implements Vo { private String sid; @ApiModelProperty(value = "状态") private String nodeState; - @ApiModelProperty("申请编号") - private String billNo; + @ApiModelProperty("业务编号") + private String busSid; @ApiModelProperty("款项类别") private String costTypeValue; @ApiModelProperty("款项名称") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index df01182bf7..b8b5e0926a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -49,8 +49,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.UserQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -61,10 +63,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -95,6 +94,8 @@ public class FinCostapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCostapplyQuery query = pq.getParams(); @@ -259,6 +260,28 @@ public class FinCostapplyService extends MybatisBaseService sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); + if (!sysPostVoResultBean.getSuccess()) { + return rb.setMsg(sysPostVoResultBean.getMsg()); + } + String roleSid = sysPostVoResultBean.getData(); + //根据组织架构、角色两个参数取相关符合条件的用户信息 + UserQuery userQuery = new UserQuery(); + userQuery.setRoleSid(roleSid); + userQuery.setOrgSidPath(orgSidPath); + List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); + sysUserVos.removeAll(Collections.singleton(null)); + if (sysUserVos.isEmpty()) { + return rb.setMsg("下一环节没有用户"); + } + StringBuilder nextNodeUserSids = new StringBuilder(); + for (SysUserVo su : sysUserVos) { + nextNodeUserSids.append(su.getSid()).append(","); + } + //符合条件的用户的sid,拼接的字符串 + String nextNodeUserSids_ = nextNodeUserSids.toString(); + bv.setNextNodeUserSids(nextNodeUserSids_); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv); if (!voResultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index b70e28ef85..a438c87ba3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -6,7 +6,7 @@ select fp.sid, fp.createBySid, - fp.billNo, + fp.busSid, fp.costTypeKey, fp.costTypeValue, fp.costTitleKey, @@ -69,7 +69,9 @@ fp.taskId, fp.procInstId, fp.receiveCompanySid, - fp.remarks + fp.remarks, + fp.name, + DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime from fin_paymentapply fp where fp.sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 0ef6c5a110..e2e1e5861e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -49,8 +49,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.UserQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -60,10 +62,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -94,6 +93,8 @@ public class FinPaymentapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); @@ -113,8 +114,8 @@ public class FinPaymentapplyService extends MybatisBaseService= date_format('" + pageQuery.getApplyStartDate() + "','%Y-%m-%d')"). @@ -220,6 +221,28 @@ public class FinPaymentapplyService extends MybatisBaseService sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); + if (!sysPostVoResultBean.getSuccess()) { + return rb.setMsg(sysPostVoResultBean.getMsg()); + } + String roleSid = sysPostVoResultBean.getData(); + //根据组织架构、角色两个参数取相关符合条件的用户信息 + UserQuery userQuery = new UserQuery(); + userQuery.setRoleSid(roleSid); + userQuery.setOrgSidPath(orgSidPath); + List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); + sysUserVos.removeAll(Collections.singleton(null)); + if (sysUserVos.isEmpty()) { + return rb.setMsg("下一环节没有用户"); + } + StringBuilder nextNodeUserSids = new StringBuilder(); + for (SysUserVo su : sysUserVos) { + nextNodeUserSids.append(su.getSid()).append(","); + } + //符合条件的用户的sid,拼接的字符串 + String nextNodeUserSids_ = nextNodeUserSids.toString(); + bv.setNextNodeUserSids(nextNodeUserSids_); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv); if (!voResultBean.getSuccess()) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 8f47549513..2e02efd082 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -24,8 +24,8 @@ public enum ProcDefEnum { BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:315150"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:4:300008"), //TODO - FINCOSTAPPLY("费用申请","process_u0pahv0s:1:310004"), - FINPAYAPPLY("付款申请","process_gin2tntb:1:310008") + FINCOSTAPPLY("费用申请","process_u0pahv0s:4:320016"), + FINPAYAPPLY("付款申请","process_gin2tntb:2:320012") ; ProcDefEnum(String proDefName, String proDefId) {