diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java index 133af7221e..f777684d6c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java @@ -72,5 +72,4 @@ public class BusSalesOrderPrice extends BaseEntity { @ApiModelProperty("计划提车地点") private String plannedPickUpLocationKey; - } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6c0c989ca3..f36b1fbd63 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6079,7 +6079,10 @@ public class BusSalesOrderService extends MybatisBaseService appOrderDiscountListVos = busSalesOrderDiscountService.selectDiscount(busSalesOrder.getSid()); if (appOrderDiscountListVos.size() == 0) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java index 18e97b8bb2..82d1ed1e97 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java @@ -86,4 +86,6 @@ public class FinBillApplicationQuery implements Query { @ApiModelProperty("移动端查询条件") private String name; + + private String menuUrl; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java index af9e973a9d..c13b6ace76 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java @@ -97,4 +97,6 @@ public class FinBillApplicationVo implements Vo { @ApiModelProperty("车架号拼接") private String vinNo; + @ApiModelProperty("销售订单sid") + private String orderSid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 04b08030f5..267e72f8d8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -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 listPageVo(PagerQuery pq) { FinBillApplicationQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); + QueryWrapper 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 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 p = new PagerVo<>(); + return p; + } + }else{ + PagerVo 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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for (FinBillApplicationVo record : pagging.getRecords()) { @@ -277,6 +368,9 @@ public class FinBillApplicationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; @@ -2424,6 +2518,9 @@ public class FinBillApplicationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; @@ -2489,6 +2586,9 @@ public class FinBillApplicationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index a8ca7eb257..beaadd60e8 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -15,7 +15,8 @@ public enum ProcDefEnum { //FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"), FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"), //QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"), - QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"), + //QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"), + QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"), //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index c6c14e1ddf..212555bb4e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -427,7 +427,7 @@ public class AppBusAdvanceGinvoiceapplyService { public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) { //开票车辆信息 List vinList = dto.getVinList(); - if (vinList == null) { + if (vinList.isEmpty()) { return new ResultBean().fail().setMsg("请选择车辆信息"); } FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); @@ -633,6 +633,10 @@ public class AppBusAdvanceGinvoiceapplyService { public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) { ResultBean rb = ResultBean.fireFail(); + List vinList = dto.getVinList(); + if (vinList.isEmpty()) { + return new ResultBean().fail().setMsg("请选择车辆信息"); + } SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto(); BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); @@ -664,7 +668,6 @@ public class AppBusAdvanceGinvoiceapplyService { submitAdvanceInvoiceDto.setDeptName(split[0]); submitAdvanceInvoiceDto.setCreateByName(split[1]); //开票车辆信息 - List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (AppCarListDto vinListDto : vinList) { FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); diff --git a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl index 31755198c8..27173df48f 100644 --- a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl +++ b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl @@ -1267,64 +1267,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 车架号 - - - - - - - - - - - - - - - - - - - - - - - - - - - ${vinNo!} - - - - + <#if (isxsVinNo == "是")> + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + + @@ -1497,64 +1499,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 订金结转 - - - - - - - - - - - - - - - - - - - - - - - - - - - ${djjz!} - - - - + <#if (isxsDjjz == "是")> + + + + + + + + + + + + + + + + + + + + + + + + + 订金结转 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${djjz!} + + + + +