|
|
@ -75,37 +75,37 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo |
|
|
|
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); |
|
|
|
privilegeQuery.setUserSid(pagerQuery.getUserSid()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = pagerQuery.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", pagerQuery.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
|
|
|
|
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
// String orgSidPath = pagerQuery.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", pagerQuery.getUserSid());
|
|
|
|
// } else {
|
|
|
|
// PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
|
|
|
|
// return p;
|
|
|
|
// }
|
|
|
|
// } else {
|
|
|
|
// PagerVo<LoanRelieveMortgageVo> p = new PagerVo<>();
|
|
|
|
// return p;
|
|
|
|
// }
|
|
|
|
//=======================
|
|
|
|
//移交状态
|
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getState())) { |
|
|
@ -153,7 +153,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo |
|
|
|
apply(StringUtils.isNotEmpty(endDate), "date_format (transferDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
|
|
|
|
qw.eq("a.isDelete", 0); |
|
|
|
qw.eq("isDelete", 0); |
|
|
|
qw.orderBy(true, false, "`state`") |
|
|
|
.orderBy(true, false, "createTime") |
|
|
|
; |
|
|
@ -186,7 +186,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo |
|
|
|
sb.append(trailer.getVinNo()).append("/"); |
|
|
|
} |
|
|
|
if (sb.length() > 0) { |
|
|
|
sb.delete(sb.length(), sb.length() - 1); |
|
|
|
sb.delete(sb.length() - 1, sb.length()); |
|
|
|
} |
|
|
|
vo.setVinNo(sb.toString()); |
|
|
|
} |
|
|
@ -235,10 +235,11 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo |
|
|
|
sb.append(s).append(","); |
|
|
|
}); |
|
|
|
if (sb.length() > 0) { |
|
|
|
sb.delete(sb.length(), sb.length() - 1); |
|
|
|
sb.delete(sb.length() - 1, sb.length()); |
|
|
|
} |
|
|
|
entity.setReceiveFiles(sb.toString()); |
|
|
|
} |
|
|
|
entity.setState(2); |
|
|
|
baseMapper.updateById(entity); |
|
|
|
//删除附件表中关于该linkSid的文件
|
|
|
|
loanFileService.delByLinkSidOrType(sid, LoanFileEnum.MORTGAGE_NOTICES.getAttachType()); |
|
|
@ -291,7 +292,7 @@ public class LoanRelieveMortgageService extends MybatisBaseService<LoanRelieveMo |
|
|
|
sb.append(trailer.getVinNo()).append("/"); |
|
|
|
} |
|
|
|
if (sb.length() > 0) { |
|
|
|
sb.delete(sb.length(), sb.length() - 1); |
|
|
|
sb.delete(sb.length() - 1, sb.length()); |
|
|
|
} |
|
|
|
vo.setVinNo(sb.toString()); |
|
|
|
} |
|
|
|