diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java index e3d07f8d39..c3e5195c82 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java @@ -41,4 +41,6 @@ public class BusVehicleApplyQuery implements Query { private String applicationCode; @ApiModelProperty("当前组织机构的全路径sid") private String orgPath; + + private String menuUrl; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 297246161c..223db1085b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsD import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualsales.*; import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery; @@ -168,6 +169,19 @@ public class BaseVehicleActualSalesService extends MybatisBaseService rb = ResultBean.fireFail(); String sid = scmVehicleActualSalesDto.getSid(); if (StringUtils.isBlank(sid)) { + BigDecimal salesMoney = BigDecimal.ZERO; + BigDecimal payMoney = BigDecimal.ZERO; + if(scmVehicleActualSalesDto.getDetailsList().size()>0){ + salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + } + if(payMoney.compareTo(salesMoney)>0){ + return rb.setMsg("付款合计不允许大于买断金额合计"); + } //新增 //======================================= String orgSidPath = ""; @@ -216,7 +230,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid); - } } @@ -227,8 +240,23 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + } + if(payMoney.compareTo(salesMoney)>0){ + return rb.setMsg("付款合计不允许大于买断金额合计"); + } + BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "orgSidPath"); int i = baseMapper.updateById(baseVehicleActualSales); + //查询details中是否有关于sales的该条sid数据 List scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid); if (scmVehicleActualDetailsList.size() > 0) { @@ -237,7 +265,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualDetailsService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsList()); } - //查询pay中是否有关于sales的该条sid数据 List scmVehicleActualPayList = baseVehicleActualPayService.selectBySaleSid(sid); if (scmVehicleActualPayList.size() > 0) { @@ -347,6 +374,19 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + salesMoney = dto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + if ("1".equals(dto.getIsPay())) { + if (dto.getDetailsPayList().size() > 0) { + payMoney = dto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + } + if(payMoney.compareTo(salesMoney)>0){ + return rb.setMsg("付款合计不允许大于买断金额合计"); + } String useOrgSid = ""; String orgSidPath = ""; if(StringUtils.isNotBlank(dto.getOrgPath())){ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index d9ed6e9af0..4dfa4ba9a2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -53,6 +53,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; 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.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -148,8 +149,7 @@ public class BusVehicleApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { BusVehicleApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - BusVehicleApplyQuery params = pq.getParams(); - if (params != null) { + if (query != null) { String applicationDateStart = query.getApplicationDateStart(); String applicationDateEnd = query.getApplicationDateEnd(); qw.apply(StringUtils.isNotBlank(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')"). @@ -158,9 +158,7 @@ public class BusVehicleApplyService extends MybatisBaseService 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("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if("5".equals(orgLevelKey)){ + qw.eq("bo.createBySid",query.getUserSid()); + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("bva.createBySid", query.getUserSid()); + } + if (StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("bva.createOrgSid", orgPath); + } } } qw.orderByDesc("bva.id"); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java index d6d6811b42..6458950db9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java @@ -18,4 +18,6 @@ public class AppDeliveredApplyPageQuery implements Query { @ApiModelProperty("用户名称") private String name; + private String menuSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java index 70def67cf3..e295b623fe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java @@ -63,4 +63,9 @@ public class BusDeliveredApplyQuery implements Query { @ApiModelProperty("销售类型") private String paymentMethodKey; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 8d6aea5253..5baa2022b4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -26,7 +26,6 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapply; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -215,8 +214,8 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { @Override public ResultBean> getRetrievalApplyList(PagerQuery pagerQuery) { ResultBean rb = ResultBean.fireFail(); - IPage iPage = busDeliveredApplyService.getRetrievalApplyList(pagerQuery); - return rb.success().setData(iPage); + PagerVo pv = busDeliveredApplyService.getRetrievalApplyList(pagerQuery); + return rb.success().setData(pv); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 63816bb4f3..e80f4048e9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -100,6 +100,7 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +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.common.base.service.MybatisBaseService; @@ -228,7 +229,67 @@ public class BusDeliveredApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { BusDeliveredApplyQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //合同编号 + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bd.contractNo", query.getContractNo()); + } + //客户名称 + if (StringUtils.isNotBlank(query.getName())) { + qw.like("bd.name", query.getName()); + } + if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) { + qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd()); + } + if (StringUtils.isNotBlank(query.getApplyName())) { + qw.like("bd.applyName", query.getApplyName()); + } + if (StringUtils.isNotBlank(query.getPaymentMethodKey())) { + qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey()); + } + //========================================数据授权开始 + if(StringUtils.isNotBlank(query.getMenuUrl())){ + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getApplySid()); + 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("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if("5".equals(orgLevelKey)){ + qw.eq("bo.createBySid",query.getApplySid()); + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + qw.eq("bd.applySid", query.getApplySid()); + } + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -1339,21 +1400,61 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalApplyList - (PagerQuery pagerQuery) { + public PagerVo getRetrievalApplyList(PagerQuery pagerQuery) { + AppDeliveredApplyPageQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); String orgPath = pagerQuery.getParams().getOrgPath(); - String orgSid = ""; - if (StringUtils.isNotBlank(orgPath)) { - orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - } else { - orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + //========================================数据授权开始 + if(StringUtils.isNotBlank(query.getMenuSid())){ + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + 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("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if("5".equals(orgLevelKey)){ + qw.eq("bo.createBySid",query.getUserSid()); + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + } } - qw.eq("useOrgSid", orgSid); - qw.eq("applySid", pagerQuery.getParams().getUserSid()); IPage page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName()); - return iPage; + PagerVo p = PagerUtil.pageToVo(iPage, null); + return p; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 989f847805..08bce876cd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -234,9 +234,9 @@ public class BusHandoverPrepareService extends MybatisBaseService p = new PagerVo<>(); - return p;*/ - qw.eq("createBySid", params.getUserSid()); + PagerVo p = new PagerVo<>(); + return p; +// qw.eq("createBySid", params.getUserSid()); } if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备 qw.eq("handoverPrepareStateKey", params.getType()); 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 d81a6ce795..96b5e68375 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 @@ -4620,6 +4620,23 @@ public class BusSalesOrderService extends MybatisBaseService variabless = getOrderMap(busSalesOrderOne); + bv.setFormVariables(variabless); + bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath()); + bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！"); + return complete(bv); + + } //极光推送 busSalesOrder.set(fetchBySid(businessSid)); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -5326,6 +5343,14 @@ public class BusSalesOrderService extends MybatisBaseService" + xilie + "-" + typeValue; variables.put("orderNames", orderNames); + //增加抄送内部引荐人 + BusSalesOrderSubmit salesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid()); + if(salesOrderSubmit != null){ + if(StringUtils.isNotBlank(salesOrderSubmit.getUserSid())){ + //抄送中增加抄送内部引荐人 + variables.put("sendRecommendSid",salesOrderSubmit.getUserSid()); + } + } return variables; } @@ -6570,6 +6595,7 @@ public class BusSalesOrderService extends MybatisBaseService>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery); List> S = yuyanTest.getData(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 2aa9cd7a63..12a098a4cb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -37,7 +37,7 @@