|
|
|
@ -102,7 +102,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<BaseVehinstallModprice> qw = new QueryWrapper<>(); |
|
|
|
//qw.eq("createBySid", query.getCreateBySid());
|
|
|
|
qw.eq("createBySid", query.getCreateBySid()); |
|
|
|
if(StringUtils.isNotBlank(query.getOrgPath())){ |
|
|
|
String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
qw.eq("createOrgSid",orgPath); |
|
|
|
@ -127,6 +127,24 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
|
|
|
|
public ResultBean<String> saveOrUpdateDto(BaseVehinstallModpriceDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String orgPath = ""; |
|
|
|
if (StringUtils.isNotBlank(dto.getOrgPath())){ |
|
|
|
orgPath = dto.getOrgPath(); |
|
|
|
}else { |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!orgByStaffSid.getSuccess()) { |
|
|
|
return rb.setMsg(orgByStaffSid.getMsg()); |
|
|
|
} |
|
|
|
//用户的组织全路径
|
|
|
|
orgPath = orgByStaffSid.getData().getOrgSidPath(); |
|
|
|
} |
|
|
|
dto.setOrgPath(orgPath); |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
List<BaseVehinstallModpricedetailDto> baseVehinstallModpricedetails = dto.getBaseVehinstallModpricedetails(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
|
@ -156,6 +174,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
BaseVehinstallModprice entity = new BaseVehinstallModprice(); |
|
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
|
entity.setNodeState("待提交"); |
|
|
|
entity.setOrgSidPath(dto.getOrgPath()); |
|
|
|
baseMapper.insert(entity); |
|
|
|
return rb.success().setMsg("添加成功").setData(entity.getSid()); |
|
|
|
} |
|
|
|
@ -196,18 +215,23 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
|
|
|
|
public ResultBean submitBaseVehInstallModPrice(SubmitBaseVehInstallModPriceDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!orgByStaffSid.getSuccess()) { |
|
|
|
return rb.setMsg(orgByStaffSid.getMsg()); |
|
|
|
String orgPath = ""; |
|
|
|
if (StringUtils.isNotBlank(dto.getOrgPath())){ |
|
|
|
orgPath = dto.getOrgPath(); |
|
|
|
}else { |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!orgByStaffSid.getSuccess()) { |
|
|
|
return rb.setMsg(orgByStaffSid.getMsg()); |
|
|
|
} |
|
|
|
//用户的组织全路径
|
|
|
|
orgPath = orgByStaffSid.getData().getOrgSidPath(); |
|
|
|
} |
|
|
|
//用户的组织全路径
|
|
|
|
String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); |
|
|
|
BaseVehinstallModprice baseVehinstallModprice = fetchBySid(dto.getSid()); |
|
|
|
int r = submitBusinessData(dto, baseVehinstallModprice); |
|
|
|
if (r == 3) { |
|
|
|
@ -217,6 +241,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
//新增修改保存
|
|
|
|
dto.setOrgPath(orgPath); |
|
|
|
ResultBean<String> resultBean = saveOrUpdateDto(dto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
@ -229,7 +254,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins |
|
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
bv.setOrgSidPath(orgPath); |
|
|
|
//业务sid
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
//用户sid
|
|
|
|
|
God
2 years ago