|
|
|
@ -36,6 +36,7 @@ import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery; |
|
|
|
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery; |
|
|
|
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto; |
|
|
|
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery; |
|
|
|
import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.*; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*; |
|
|
|
@ -61,6 +62,7 @@ import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrg; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
@ -107,6 +109,9 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
private MessageFeign messageFeign; |
|
|
|
@Autowired |
|
|
|
private AsBusrepairBillNodeService asBusrepairBillNodeService; |
|
|
|
@Autowired |
|
|
|
private SysUserRoleFeign sysUserRoleFeign; |
|
|
|
|
|
|
|
private QueryWrapper<AsBusrepairBillReverseSettle> createQueryWrapper(AsBusrepairBillReverseSettleQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
@ -499,6 +504,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
|
|
|
|
variables.put("app", appMap); |
|
|
|
//判断发起人是否为前台主管
|
|
|
|
String createBySid = reverseSettle.getCreateBySid(); |
|
|
|
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); |
|
|
|
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
@ -565,6 +574,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
String businessSid = bv.getBusinessSid(); |
|
|
|
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(businessSid); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//判断发起人是否为前台主管
|
|
|
|
String createBySid = reverseSettle.getCreateBySid(); |
|
|
|
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); |
|
|
|
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
@ -635,7 +648,17 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
ResultBean<List<ReverseSettleNodeVo>> rb = ResultBean.fireFail(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(query, bv); |
|
|
|
bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//查询业务信息
|
|
|
|
AsBusrepairBillReverseSettle asBusrepairBillReverseSettle = fetchBySid(query.getBusinessSid()); |
|
|
|
//判断发起人是否为前台主管
|
|
|
|
String createBySid = asBusrepairBillReverseSettle.getCreateBySid(); |
|
|
|
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); |
|
|
|
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); |
|
|
|
bv.setModelId(asBusrepairBillReverseSettle.getProcDefId()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); |
|
|
|
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
|
|
|
|
List<ReverseSettleNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ReverseSettleNodeVo.class)).collect(Collectors.toList()); |
|
|
|
@ -646,7 +669,17 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
ResultBean<List<ReverseSettleNodeVo>> rb = ResultBean.fireFail(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(query, bv); |
|
|
|
bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//查询业务信息
|
|
|
|
AsBusrepairBillReverseSettle asBusrepairBillReverseSettle = fetchBySid(query.getBusinessSid()); |
|
|
|
//判断发起人是否为前台主管
|
|
|
|
String createBySid = asBusrepairBillReverseSettle.getCreateBySid(); |
|
|
|
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); |
|
|
|
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); |
|
|
|
bv.setModelId(asBusrepairBillReverseSettle.getProcDefId()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); |
|
|
|
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
|
|
|
|
List<ReverseSettleNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ReverseSettleNodeVo.class)).collect(Collectors.toList()); |
|
|
|
@ -675,6 +708,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//判断发起人是否为前台主管
|
|
|
|
String createBySid = reverseSettle.getCreateBySid(); |
|
|
|
List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); |
|
|
|
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); |
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
|
God
7 months ago