|
|
|
@ -503,6 +503,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
appMap.put("noCalc", true); |
|
|
|
appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails"); |
|
|
|
variables.put("app", appMap); |
|
|
|
BusSolutionsChange busSolutionsChange1 = fetchBySid(businessSid); |
|
|
|
String msgBusinessSid = busSolutionsChange1.getSid(); |
|
|
|
@ -586,6 +587,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
appMap.put("noCalc", true); |
|
|
|
appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails"); |
|
|
|
variables.put("app", appMap); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); |
|
|
|
@ -665,6 +667,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
appMap.put("noCalc", true); |
|
|
|
appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails"); |
|
|
|
variables.put("app", appMap); |
|
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
@ -798,17 +801,17 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
} |
|
|
|
|
|
|
|
//----------------------------------app---------------------------------------
|
|
|
|
public ResultBean<AppSolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) { |
|
|
|
public ResultBean<AppSolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) { |
|
|
|
ResultBean<AppSolutionChangeVo> rb = ResultBean.fireFail(); |
|
|
|
AppSolutionChangeVo vo = new AppSolutionChangeVo(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
SolutionssVo solutionssVo = loanSolutionsFeign.selectDetails2(orderSid).getData(); |
|
|
|
SolutionssVo solutionssVo = loanSolutionsFeign.selectDetails2(sid).getData(); |
|
|
|
if (null != solutionssVo) { |
|
|
|
BeanUtil.copyProperties(solutionssVo, vo); |
|
|
|
} |
|
|
|
vo.setUserSid(userSid); |
|
|
|
vo.setOrgPath(orgPath); |
|
|
|
vo.setOrderSid(orderSid); |
|
|
|
vo.setOrderSid(sid); |
|
|
|
vo.setApplyDate(sdf.format(new Date())); |
|
|
|
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); |
|
|
|
if (null != sysUserVo) { |
|
|
|
@ -827,7 +830,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
vo.setPublishInfo(vo.getDept() + "-" + vo.getApplyName()); |
|
|
|
} |
|
|
|
//销售订单信息
|
|
|
|
BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid); |
|
|
|
BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(sid); |
|
|
|
if (null != salesOrder) { |
|
|
|
if (StringUtils.isNotBlank(salesOrder.getAffiliatedCompany())) { |
|
|
|
vo.setAffiliatedCompany(salesOrder.getAffiliatedCompany()); |
|
|
|
@ -938,6 +941,13 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(dto.getOrderSid()).getData(); |
|
|
|
if (solutions != null) { |
|
|
|
entity.setSolutionsSid(solutions.getSid()); |
|
|
|
String solutionsSid = solutions.getSid(); |
|
|
|
BusSolutionsChange busSolutionsChange = baseMapper.selectBySolutionSid(solutionsSid); |
|
|
|
if (null != busSolutionsChange) { |
|
|
|
if (!busSolutionsChange.getNodeState().equals("终止")) { |
|
|
|
return rb.fail().setMsg("请勿重复新增！"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()); |
|
|
|
@ -990,7 +1000,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<AppSolutionChangeVo> appDetails(String sid) { |
|
|
|
public ResultBean<AppSolutionChangeVo> appDetails(String sid, String userSid, String orgPath) { |
|
|
|
ResultBean<AppSolutionChangeVo> rb = ResultBean.fireFail(); |
|
|
|
AppSolutionChangeVo vo = new AppSolutionChangeVo(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
@ -1113,9 +1123,10 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
String businessSid = ""; |
|
|
|
//新增修改保存
|
|
|
|
ResultBean<String> resultBean = saveAppSolutions(dto); |
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
businessSid = resultBean.getData(); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.fail().setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
businessSid = resultBean.getData(); |
|
|
|
BusSolutionsChange entity = fetchBySid(businessSid); |
|
|
|
String orgSidPath = ""; |
|
|
|
if (StringUtils.isNotBlank(entity.getOrgSidPath())) { |
|
|
|
@ -1150,6 +1161,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
appMap.put("noCalc", true); |
|
|
|
appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails"); |
|
|
|
variables.put("app", appMap); |
|
|
|
BusSolutionsChange busSolutionsChange1 = fetchBySid(businessSid); |
|
|
|
String msgBusinessSid = busSolutionsChange1.getSid(); |
|
|
|
@ -1218,4 +1230,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh |
|
|
|
} |
|
|
|
return rb; |
|
|
|
} |
|
|
|
|
|
|
|
public BusSolutionsChange selectBySolutionSid(String solutionsSid) { |
|
|
|
return baseMapper.selectBySolutionSid(solutionsSid); |
|
|
|
} |
|
|
|
} |
fanzongzhe
2 years ago