|
|
|
@ -58,6 +58,7 @@ 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.sysuser.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit; |
|
|
|
@ -215,11 +216,86 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
* @param pagerQuery |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public IPage<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) { |
|
|
|
public PagerVo<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) { |
|
|
|
IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); |
|
|
|
pagerQuery.getParams().setUseOrgSid(useOrgSid); |
|
|
|
QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams()); |
|
|
|
// QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams());
|
|
|
|
ScmVehicleGressionPageQuery query = pagerQuery.getParams(); |
|
|
|
QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>(); |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getType())) { |
|
|
|
qw.eq("svg.handleState", query.getType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getApplyId())) { |
|
|
|
qw.like("svg.applicantNo", query.getApplyId()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVin())) { |
|
|
|
qw.like("svg.vinNo", query.getVin()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getLocationSid())) { |
|
|
|
qw.eq("svg.locationSid", query.getLocationSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getTargetLocationSid())) { |
|
|
|
qw.eq("svg.targetLocationSid", query.getTargetLocationSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOperator())) { |
|
|
|
qw.like("svg.operator", query.getOperator()); |
|
|
|
} |
|
|
|
String inventStartDate = query.getApplyDateStart(); |
|
|
|
String inventEndDate = query.getApplyDateEnd(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (applicantDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
//========================================数据授权开始
|
|
|
|
if(StringUtils.isNotBlank(query.getMenuUrl())){ |
|
|
|
//=======================
|
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if("5".equals(orgLevelKey)){ |
|
|
|
qw.eq("bo.createBySid",query.getUserSid()); |
|
|
|
}else{ |
|
|
|
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if (StringUtils.isNotBlank(query.getUserSid())) { |
|
|
|
qw.eq("svg.createBySid", query.getUserSid()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(query.getOrgPath())){ |
|
|
|
String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
qw.eq("svg.useorgSid",orgpath); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw); |
|
|
|
List<ScmVehicleGressionPageVo> records = iPage.getRecords(); |
|
|
|
for (ScmVehicleGressionPageVo record : records) { |
|
|
|
@ -244,7 +320,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
} |
|
|
|
record.setImages(image); |
|
|
|
} |
|
|
|
return iPage; |
|
|
|
PagerVo<ScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -255,9 +332,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
*/ |
|
|
|
private QueryWrapper<ScmVehicleGressionPageVo> pcQueryWrapper(ScmVehicleGressionPageQuery query) { |
|
|
|
QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>(); |
|
|
|
// if (StringUtils.isNotBlank(query.getUseOrgSid())) {
|
|
|
|
// qw.eq("svg.useOrgSid", query.getUseOrgSid());
|
|
|
|
// }
|
|
|
|
if (StringUtils.isNotBlank(query.getUserSid())) { |
|
|
|
qw.eq("svg.createBySid", query.getUserSid()); |
|
|
|
} |
|
|
|
@ -335,12 +409,69 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
* @param pagerQuery |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public IPage<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) { |
|
|
|
public PagerVo<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) { |
|
|
|
String type = "05"; |
|
|
|
IPage<AppScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppScmVehicleGressionPageVo> qw = appQueryWrapper(pagerQuery.getParams()); |
|
|
|
AppScmVehicleGressionPageQuery params = pagerQuery.getParams(); |
|
|
|
IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames()); |
|
|
|
AppScmVehicleGressionPageQuery query = pagerQuery.getParams(); |
|
|
|
QueryWrapper<AppScmVehicleGressionPageVo> qw = new QueryWrapper<>(); |
|
|
|
if (StringUtils.isNotBlank(query.getType())) { |
|
|
|
qw.eq("svg.handleState", query.getType()); |
|
|
|
} |
|
|
|
//========================================数据授权开始
|
|
|
|
if(StringUtils.isNotBlank(query.getMenuSid())){ |
|
|
|
//=======================
|
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuSid(query.getMenuSid()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("bo.orgSidPath", orgSidPath); |
|
|
|
} else if("5".equals(orgLevelKey)){ |
|
|
|
qw.eq("bo.createBySid",query.getUserSid()); |
|
|
|
}else{ |
|
|
|
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|
|
|
//切换机构
|
|
|
|
//根据用户所在组织全路径获取分公司sid
|
|
|
|
String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
qw.eq("svg.useOrgSid", orgPath); |
|
|
|
} else { |
|
|
|
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); |
|
|
|
qw.eq("svg.useOrgSid", useOrgSid); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUserSid())) { |
|
|
|
qw.eq("svg.createBySid", query.getUserSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, query.getNames()); |
|
|
|
List<AppScmVehicleGressionPageVo> records = iPage.getRecords(); |
|
|
|
for (AppScmVehicleGressionPageVo record : records) { |
|
|
|
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid()); |
|
|
|
@ -361,7 +492,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
record.setShowUploadBtn(false); |
|
|
|
} |
|
|
|
} |
|
|
|
return iPage; |
|
|
|
PagerVo<AppScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
