|
|
@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.yxt.anrui.as.api.asappendix.AsAppendix; |
|
|
import com.yxt.anrui.as.api.asappendix.AsAppendix; |
|
|
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; |
|
|
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; |
|
|
|
|
|
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.*; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.*; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.app.*; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.app.*; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.report.*; |
|
|
import com.yxt.anrui.as.api.asbusrepairbill.report.*; |
|
|
@ -1706,6 +1707,45 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
public PagerVo<AsBusrepairBillPageListVo> billPageList(PagerQuery<AsBusrepairBillPageListQuery> pagerQuery) { |
|
|
public PagerVo<AsBusrepairBillPageListVo> billPageList(PagerQuery<AsBusrepairBillPageListQuery> pagerQuery) { |
|
|
AsBusrepairBillPageListQuery query = pagerQuery.getParams(); |
|
|
AsBusrepairBillPageListQuery query = pagerQuery.getParams(); |
|
|
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>(); |
|
|
QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>(); |
|
|
|
|
|
//========================================数据授权开始
|
|
|
|
|
|
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("s.orgSidPath", orgSidPath); |
|
|
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
|
|
|
} else { |
|
|
|
|
|
PagerVo<AsBusrepairBillPageListVo> p = new PagerVo<>(); |
|
|
|
|
|
return p; |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
PagerVo<AsBusrepairBillPageListVo> p = new PagerVo<>(); |
|
|
|
|
|
return p; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
//ToDo:添加查询条件
|
|
|
//ToDo:添加查询条件
|
|
|
//分公司
|
|
|
//分公司
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
@ -1723,6 +1763,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
qw.like("a.billNo", query.getBillNo()); |
|
|
qw.like("a.billNo", query.getBillNo()); |
|
|
} |
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getShClaimTypeValue())) { |
|
|
|
|
|
qw.like("a.shClaimTypeValue", query.getShClaimTypeValue()); |
|
|
|
|
|
} |
|
|
//单据日期开始时间-单据日期结束时间
|
|
|
//单据日期开始时间-单据日期结束时间
|
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). |
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). |
|
|
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" |
|
|
@ -1731,17 +1774,18 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
if (StringUtils.isNotBlank(query.getBillType())) { |
|
|
if (StringUtils.isNotBlank(query.getBillType())) { |
|
|
qw.like("a.billType", query.getBillType()); |
|
|
qw.like("a.billType", query.getBillType()); |
|
|
} |
|
|
} |
|
|
//科目
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getSubject())) { |
|
|
|
|
|
qw.like("a.subject", query.getSubject()); |
|
|
|
|
|
} |
|
|
|
|
|
//进厂时间开始时间-进厂时间结束时间
|
|
|
//进厂时间开始时间-进厂时间结束时间
|
|
|
qw.apply(StringUtils.isNotBlank(query.getEntryTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')"). |
|
|
qw.apply(StringUtils.isNotBlank(query.getEntryTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')"). |
|
|
apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
//预计完工开始时间-预计完工结束时间
|
|
|
qw.apply(StringUtils.isNotBlank(query.getFinishTimeStart()), "date_format (a.finishTime,'%Y-%m-%d') >= date_format('" + query.getFinishTimeStart() + "','%Y-%m-%d')"). |
|
|
qw.apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeStart()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') >= date_format('" + query.getEstimatedFinishTimeStart() + "','%Y-%m-%d')"). |
|
|
apply(StringUtils.isNotBlank(query.getFinishTimeEnd()), "date_format (a.finishTime,'%Y-%m-%d') <= date_format('" + query.getFinishTimeEnd() + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeEnd()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') <= date_format('" + query.getEstimatedFinishTimeEnd() + "','%Y-%m-%d')" |
|
|
); |
|
|
|
|
|
qw.apply(StringUtils.isNotBlank(query.getSettleTimeStart()), "date_format (a.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleTimeStart() + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotBlank(query.getSettleTimeEnd()), "date_format (a.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleTimeEnd() + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
qw.apply(StringUtils.isNotBlank(query.getReportFirstDateStart()), "date_format (a.reportFirstDate,'%Y-%m-%d') >= date_format('" + query.getReportFirstDateStart() + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotBlank(query.getReportFirstDateEnd()), "date_format (a.reportFirstDate,'%Y-%m-%d') <= date_format('" + query.getReportFirstDateEnd() + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
//客户名称
|
|
|
//客户名称
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
@ -3069,4 +3113,10 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
} |
|
|
} |
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean<String> updateManuReportNo(String sid, String manuReportNo, String reportFirstDate) { |
|
|
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
|
|
baseMapper.updateManuReportNo(sid,manuReportNo,reportFirstDate); |
|
|
|
|
|
return rb.success(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
ligaode
7 months ago