|
|
|
@ -54,6 +54,10 @@ import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUser; |
|
|
|
@ -107,6 +111,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
private SysUserFeign userFeign; |
|
|
|
@Autowired |
|
|
|
private BusDiscountpackageHandoverFeign busDiscountpackageHandoverFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffinfoFeign sysStaffinfoFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
|
|
|
|
private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
@ -131,10 +139,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getType())) { |
|
|
|
if ("2".equals(query.getType())) { |
|
|
|
qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "销售专员申请")); |
|
|
|
qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "发起申请")); |
|
|
|
} |
|
|
|
if ("1".equals(query.getType())) { |
|
|
|
qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "销售专员申请")); |
|
|
|
qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "发起申请")); |
|
|
|
} |
|
|
|
} |
|
|
|
qw.apply(StringUtils.isNotEmpty(query.getDate()), "date_format (applyDate,'%Y-%m-%d') = date_format('" + query.getDate() + "','%Y-%m-%d')"); |
|
|
|
@ -152,7 +160,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
for (BaseDiscountpackageApplyVo applyVo : records) { |
|
|
|
applyVo.setShowHandleBtn(true); |
|
|
|
if (StringUtils.isNotBlank(applyVo.getNodeState())) { |
|
|
|
if (!("待提交".equals(applyVo.getNodeState()) || "销售专员申请".equals(applyVo.getNodeState()))) { |
|
|
|
if (!("待提交".equals(applyVo.getNodeState()))) { |
|
|
|
applyVo.setShowHandleBtn(false); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -204,6 +212,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
if (StringUtils.isNotBlank(entity.getCreateBySid())) { |
|
|
|
vo.setUserSid(entity.getCreateBySid()); |
|
|
|
} |
|
|
|
vo.setCarNumber(entity.getNumber()); |
|
|
|
vo.setOrgPath(entity.getOrgSidPath()); |
|
|
|
vo.setProcInsId(entity.getProcInstId()); |
|
|
|
//根据优惠包申请sid查询对应优惠包列表
|
|
|
|
List<BaseDiscountpackagelistDto> dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid); |
|
|
|
vo.setDiscountPackageList(dtoList); |
|
|
|
@ -231,17 +242,44 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
|
|
|
|
public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isNotBlank(dto.getCarNumber())) { |
|
|
|
dto.setNumber(dto.getCarNumber()); |
|
|
|
} |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); |
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dto.getApplyName())) { |
|
|
|
String staffSid = userVoResultBean.getData().getStaffSid(); |
|
|
|
ResultBean<SysStaffinfoDetailsVo> staffinfoDetailsVoResultBean = sysStaffinfoFeign.fetchBySid(staffSid); |
|
|
|
if (staffinfoDetailsVoResultBean.getSuccess()) { |
|
|
|
SysStaffinfoDetailsVo data = staffinfoDetailsVoResultBean.getData(); |
|
|
|
if (null != data) { |
|
|
|
dto.setApplyName(data.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!staffOrgResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(staffOrgResultBean.getMsg()); |
|
|
|
} |
|
|
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
|
|
|
if (StringUtils.isBlank(dto.getCreateOrgSid()) && StringUtils.isBlank(dto.getUseOrgSid()) && StringUtils.isBlank(dto.getCreateOrgName()) && StringUtils.isBlank(dto.getUseOrgName())) { |
|
|
|
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); |
|
|
|
if (orgSidByPath.getSuccess()) { |
|
|
|
String userOrgPath = orgSidByPath.getData(); |
|
|
|
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(userOrgPath); |
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
SysOrganizationVo organizationVo = resultBean.getData(); |
|
|
|
dto.setCreateOrgName(organizationVo.getName()); |
|
|
|
dto.setUseOrgName(organizationVo.getName()); |
|
|
|
dto.setCreateOrgSid(userOrgPath); |
|
|
|
dto.setUseOrgSid(userOrgPath); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) { |
|
|
|
@ -252,6 +290,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
String sid = this.insertByDto(baseDiscountpackageApplyDto); |
|
|
|
if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) { |
|
|
|
for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) { |
|
|
|
if (StringUtils.isNotBlank(appDiscountpackagelist.getExplain())) { |
|
|
|
appDiscountpackagelist.setPackageExplain(appDiscountpackagelist.getExplain()); |
|
|
|
} |
|
|
|
BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto(); |
|
|
|
BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist); |
|
|
|
baseDiscountpackagelist.setDiscountSid(sid); |
|
|
|
@ -268,7 +309,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
// baseDiscountpackagelistService.delByDiscountSid(dtoSid);
|
|
|
|
BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto(); |
|
|
|
BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto); |
|
|
|
baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath()); |
|
|
|
baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath); |
|
|
|
this.updateByDto(baseDiscountpackageApplyDto); |
|
|
|
if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) { |
|
|
|
for (AppDiscountpackagelistDto packageList : appDiscountpackagelists) { |
|
|
|
@ -321,8 +362,8 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
appMap.put("businessSid", businessSid); |
|
|
|
variables.put("appMap", appMap); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath()); |
|
|
|
|
fanzongzhe
2 years ago