|
|
|
@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
@ -100,6 +101,7 @@ 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.sysstafforg.SysStaffOrgVo; |
|
|
|
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.portal.api.sysuser.UserRoleQuery; |
|
|
|
@ -265,7 +267,96 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) { |
|
|
|
FinBillApplicationQuery query = pq.getParams(); |
|
|
|
QueryWrapper<FinBillApplication> qw = createQueryWrapper(query); |
|
|
|
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>(); |
|
|
|
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
query.setUseOrgSid(useOrgSid); |
|
|
|
} |
|
|
|
//========================================数据授权开始
|
|
|
|
if(StringUtils.isNotBlank(query.getMenuUrl())){ |
|
|
|
//=======================
|
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
privilegeQuery.setUserSid(query.getCreateBySid()); |
|
|
|
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("fba.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("fba.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("fba.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("fba.orgSidPath", orgSidPath); |
|
|
|
} else if("5".equals(orgLevelKey)){ |
|
|
|
qw.eq("fba.createBySid",query.getCreateBySid()); |
|
|
|
}else{ |
|
|
|
PagerVo<FinBillApplicationVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
PagerVo<FinBillApplicationVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
}else { |
|
|
|
qw.eq("fba.useOrgSid", query.getUseOrgSid()); |
|
|
|
qw.eq("fba.createBySid", query.getCreateBySid()); |
|
|
|
} |
|
|
|
qw.and(wrapper -> wrapper.eq("fba.billStateKey", "001").or().eq("fba.billStateKey", "002")); |
|
|
|
if ("1".equals(query.getType())) { |
|
|
|
qw.eq("fba.nodeState", "待提交"); |
|
|
|
} else if ("2".equals(query.getType())) { |
|
|
|
qw.ne("fba.nodeState", "待提交"); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSaleTypeKey())) { |
|
|
|
qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getContractNo())) { |
|
|
|
qw.like("fba.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOpenTickUnitName())) { |
|
|
|
qw.like("fba.openTickUnitName", query.getOpenTickUnitName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("fba.customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getModelName())) { |
|
|
|
qw.like("fba.modelName", query.getModelName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillStateKey())) { |
|
|
|
qw.eq("fba.billStateKey", query.getBillStateKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("fba.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
//移动端条件
|
|
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
|
qw.and(wrapper -> wrapper.like("fba.customerName", query.getName()).or().like("fba.contractNo", query.getName())); |
|
|
|
} |
|
|
|
String applyStartDate = query.getApplyStartDate(); |
|
|
|
String applyEndDate = query.getApplyEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String returnedMoneyStartDate = query.getReturnedMoneyStartDate(); |
|
|
|
String returnedMoneyEndDate = query.getReturnedMoneyEndDate(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(returnedMoneyStartDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') >= date_format('" + returnedMoneyStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(returnedMoneyEndDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') <= date_format('" + returnedMoneyEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("fba.createTime"); |
|
|
|
IPage<FinBillApplication> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
for (FinBillApplicationVo record : pagging.getRecords()) { |
|
|
|
@ -277,6 +368,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
vinNos = vinNos + vinNo + ","; |
|
|
|
} |
|
|
|
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); |
|
|
|
String contractNo = record.getContractNo(); |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); |
|
|
|
record.setOrderSid(busSalesOrder.getSid()); |
|
|
|
} |
|
|
|
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
@ -2424,6 +2518,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
vinNos = vinNos + vinNo + ","; |
|
|
|
} |
|
|
|
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); |
|
|
|
String contractNo = record.getContractNo(); |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); |
|
|
|
record.setOrderSid(busSalesOrder.getSid()); |
|
|
|
} |
|
|
|
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
@ -2489,6 +2586,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
vinNos = vinNos + vinNo + ","; |
|
|
|
} |
|
|
|
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); |
|
|
|
String contractNo = record.getContractNo(); |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); |
|
|
|
record.setOrderSid(busSalesOrder.getSid()); |
|
|
|
} |
|
|
|
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
|
God
2 years ago