|
|
|
@ -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<FinPaymentapplyMa |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private FinPaymentrecordService finPaymentrecordService; |
|
|
|
@Autowired |
|
|
|
private SysStaffPostFeign sysStaffPostFeign; |
|
|
|
|
|
|
|
public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) { |
|
|
|
FinPaymentapplyQuery query = pq.getParams(); |
|
|
|
@ -113,8 +114,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa |
|
|
|
qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey()); |
|
|
|
} |
|
|
|
//收款单位
|
|
|
|
if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) { |
|
|
|
qw.like("fp.receiveCompany", pageQuery.getReceiveCompany()); |
|
|
|
if (StringUtils.isNotBlank(pageQuery.getReceiveCompanySid())) { |
|
|
|
qw.like("fp.receiveCompanySid", pageQuery.getReceiveCompanySid()); |
|
|
|
} |
|
|
|
//申请日期
|
|
|
|
qw.apply(StringUtils.isNotBlank(pageQuery.getApplyStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getApplyStartDate() + "','%Y-%m-%d')"). |
|
|
|
@ -220,6 +221,28 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId()); |
|
|
|
//根据员工sid查询员工的上级岗位
|
|
|
|
ResultBean<String> 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<SysUserVo> 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<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); |
|
|
|
if (!voResultBean.getSuccess()) { |
|
|
|
|
