|
|
|
@ -33,11 +33,13 @@ import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDto; |
|
|
|
import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; |
|
|
|
import com.yxt.anrui.as.api.asbusreservebill.*; |
|
|
|
import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem; |
|
|
|
import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack; |
|
|
|
import com.yxt.anrui.as.api.enums.AsBillTypeEnum; |
|
|
|
import com.yxt.anrui.as.api.utils.AsRule; |
|
|
|
import com.yxt.anrui.as.api.utils.domain.AsBillNo; |
|
|
|
import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; |
|
|
|
import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService; |
|
|
|
import com.yxt.anrui.as.biz.asbusreservebilltrack.AsBusreserveBillTrackService; |
|
|
|
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
@ -83,6 +85,9 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private AsBusreserveBillTrackService asBusreserveBillTrackService; |
|
|
|
|
|
|
|
private QueryWrapper<AsBusreserveBill> createQueryWrapper(AsBusreserveBillQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
@ -91,16 +96,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill |
|
|
|
// qw.eq("useOrgSid",query.getUseOrgSid());
|
|
|
|
// }
|
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state",query.getState()); |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("customerName",query.getCustomerName()); |
|
|
|
qw.like("customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getMobile())) { |
|
|
|
qw.like("mobile",query.getMobile()); |
|
|
|
qw.like("mobile", query.getMobile()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehMark())) { |
|
|
|
qw.like("vehMark",query.getVehMark()); |
|
|
|
qw.like("vehMark", query.getVehMark()); |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
@ -115,67 +120,70 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill |
|
|
|
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("orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<AsBusreserveBillVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<AsBusreserveBillVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
// 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("orgSidPath", orgSidPath);
|
|
|
|
// } else if ("2".equals(orgLevelKey)) {
|
|
|
|
// orgSidPath = orgSidPath.substring(0, i2);
|
|
|
|
// qw.like("orgSidPath", orgSidPath);
|
|
|
|
// } else if ("3".equals(orgLevelKey)) {
|
|
|
|
// orgSidPath = orgSidPath.substring(0, i3);
|
|
|
|
// qw.like("orgSidPath", orgSidPath);
|
|
|
|
// } else if ("4".equals(orgLevelKey)) {
|
|
|
|
// orgSidPath = orgSidPath.substring(0, i4);
|
|
|
|
// qw.like("orgSidPath", orgSidPath);
|
|
|
|
// } else if ("5".equals(orgLevelKey)) {
|
|
|
|
// qw.eq("createBySid", query.getUserSid());
|
|
|
|
// } else {
|
|
|
|
// PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
|
|
|
|
// return p;
|
|
|
|
// }
|
|
|
|
// } else {
|
|
|
|
// PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
|
|
|
|
// return p;
|
|
|
|
// }
|
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state",query.getState()); |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName",query.getUseOrgName()); |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWaitorName())) { |
|
|
|
qw.like("waitorName", query.getWaitorName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateDept())) { |
|
|
|
qw.like("createDept",query.getCreateDept()); |
|
|
|
qw.like("createDept", query.getCreateDept()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("createByName",query.getCreateByName()); |
|
|
|
qw.like("createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("billNo",query.getBillNo()); |
|
|
|
qw.like("billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("customerName",query.getCustomerName()); |
|
|
|
qw.like("customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehMark())) { |
|
|
|
qw.like("vehMark",query.getVehMark()); |
|
|
|
qw.like("vehMark", query.getVehMark()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("vinNo",query.getVinNo()); |
|
|
|
qw.like("vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getMobile())) { |
|
|
|
qw.like("mobile",query.getMobile()); |
|
|
|
qw.like("mobile", query.getMobile()); |
|
|
|
} |
|
|
|
String createStartTime = query.getStartCreateDate(); |
|
|
|
String createEndTime = query.getEndCreateDate(); |
|
|
|
@ -302,6 +310,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill |
|
|
|
} |
|
|
|
vo.setSitemVos(sitemVos); |
|
|
|
} |
|
|
|
List<AsBusreserveBillTrack> asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid); |
|
|
|
if (!asBusreserveBillTracks.isEmpty()) { |
|
|
|
List<String> remarks = new ArrayList<>(); |
|
|
|
for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) { |
|
|
|
if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) { |
|
|
|
remarks.add(asBusreserveBillTrack.getRemarks()); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setTrackLogs(remarks); |
|
|
|
} |
|
|
|
} |
|
|
|
return vo; |
|
|
|
} |
|
|
|
@ -318,10 +336,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill |
|
|
|
if (StringUtils.isNotBlank(dto.getSid())) { |
|
|
|
AsBusreserveBill bill = fetchBySid(dto.getSid()); |
|
|
|
if (null != bill) { |
|
|
|
if (StringUtils.isNotBlank(dto.getTrackLogs())) { |
|
|
|
bill.setTrackLogs(dto.getTrackLogs()); |
|
|
|
if (StringUtils.isNotBlank(dto.getTrackLog())) { |
|
|
|
AsBusreserveBillTrack billTrack = new AsBusreserveBillTrack(); |
|
|
|
billTrack.setRemarks(dto.getTrackLog()); |
|
|
|
billTrack.setBillSid(dto.getSid()); |
|
|
|
asBusreserveBillTrackService.insert(billTrack); |
|
|
|
} |
|
|
|
baseMapper.updateById(bill); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
fanzongzhe
12 months ago