From 704b0bfe21cb94218773ca7ce04a07ba783fe0c4 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 21 Nov 2024 14:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSpecialRebateWithDetailsVo.java | 2 +- .../AppSpecialRebateWithApplyService.java | 5 ++ .../as/api/asbusclaimbill/AsBusclaimBill.java | 8 +- .../asbusclaimbill/AsBusclaimBillQuery.java | 4 +- .../AsBusclaimInvoiceBillQuery.java | 6 +- .../asbusclaiminvoicebill/ExcelInfoVo.java | 2 +- .../AsBusclaimInvoiceBillDetailVo.java | 4 +- .../api/asbusrepairbill/AsBusrepairBill.java | 2 + .../AsBusrepairBwBillPageListVo.java | 2 + .../AsBwinvoiceapplyDetail.java | 3 +- .../AsBwinvoiceapplyDetailDetailsVo.java | 3 +- .../AsBwinvoiceapplyDetailDto.java | 3 +- .../asbusclaimbill/AsBusclaimBillMapper.xml | 1 + .../asbusclaimbill/AsBusclaimBillService.java | 77 +++++++++++++++++++ .../AsBusclaimInvoiceBillMapper.java | 1 + .../AsBusclaimInvoiceBillMapper.xml | 1 + .../AsBusclaimInvoiceBillService.java | 44 +++++++++++ .../AsBusclaimInvoiceBillDetailMapper.xml | 7 +- .../asbusrepairbill/AsBusrepairBillMapper.xml | 3 +- 19 files changed, 163 insertions(+), 15 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java index d59e9a4313..e847ca3920 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java @@ -60,7 +60,7 @@ public class AppSpecialRebateWithDetailsVo implements Vo { @ApiModelProperty("返利类型value") private String rebateTypeValue; @ApiModelProperty("预提返利") - private String withRebate; + private BigDecimal withRebate; @ApiModelProperty("预计支出费用") private BigDecimal expectItureCost; @ApiModelProperty("预计待支付费用") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java index d83cd2eb92..8ee8e3703d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java @@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -74,6 +75,10 @@ public class AppSpecialRebateWithApplyService { for (AppSpecialRebateWithDetailsVo appSpecialRebateWithDetailsVo : scmSpecialRebateWiths) { appSpecialRebateWithDetailsVo.setSid(appSpecialRebateWithDetailsVo.getSpecialRebateSid()); } + appSpecialRebateWithApplyDetailsVo.setWithRebateTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getWithRebate).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); + appSpecialRebateWithApplyDetailsVo.setExpectItureCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectItureCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); + appSpecialRebateWithApplyDetailsVo.setExpectTreatCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectTreatCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); + appSpecialRebateWithApplyDetailsVo.setExpectSuppCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectSuppCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); return rb.success().setData(appSpecialRebateWithApplyDetailsVo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java index ce90a49b45..ae4da2fa7d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java @@ -50,10 +50,14 @@ public class AsBusclaimBill extends BaseEntity { private Date invoiceTime; @ApiModelProperty("回款时间") private Date returnAmountTime; + @ApiModelProperty("调整状态") + private Integer adjustState; @ApiModelProperty("审核时间") private Date auditDate; @ApiModelProperty("保单时间") private Date policyDate; - @ApiModelProperty("调整状态") - private Integer adjustState; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java index 2672eab3a4..40bad80a51 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java @@ -38,6 +38,8 @@ public class AsBusclaimBillQuery implements Query { @ApiModelProperty("应收调整状态") private String adjustState; - private String createBySid; private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java index 0bb4e85afb..5b3756233d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java @@ -34,8 +34,8 @@ public class AsBusclaimInvoiceBillQuery implements Query { @ApiModelProperty("开票类型key") private String invoiceValue; - private String createBySid; private String orgPath; - - + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java index a30e1320a0..366e690c65 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java @@ -30,7 +30,7 @@ public class ExcelInfoVo { private String claimOutAmount = "0"; @ApiModelProperty("厂家补助") private String claimSubsidyAmount = "0"; - @ApiModelProperty("厂家补助") + @ApiModelProperty("施救费") private String claimRescueAmount = "0"; @ApiModelProperty("其他费用") private String claimOtherAmount = "0"; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java index baae0eff54..087863062a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java @@ -15,6 +15,8 @@ public class AsBusclaimInvoiceBillDetailVo { @ApiModelProperty("索赔单号") private String claimBillNo; + @ApiModelProperty("索赔厂家") + private String claimManufacturer; @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") @@ -30,7 +32,7 @@ public class AsBusclaimInvoiceBillDetailVo { @ApiModelProperty("厂家补助费") private String claimSubsidyAmount; @ApiModelProperty("施救费") - private BigDecimal claimRescueAmount; + private String claimRescueAmount; @ApiModelProperty("其他费用") private String claimOtherAmount; @ApiModelProperty("费用是否一致") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 2cc774f8f7..f2d9932c24 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -162,4 +162,6 @@ public class AsBusrepairBill extends BaseEntity { private String shClaimTypeKey; @ApiModelProperty("索赔类型value") private String shClaimTypeValue; + @ApiModelProperty("加税点项目") + private String taxItems; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java index 1231ab3053..454069b3e4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java @@ -43,4 +43,6 @@ public class AsBusrepairBwBillPageListVo { private BigDecimal outAmount; @ApiModelProperty("其他费用") private BigDecimal otherAmount; + @ApiModelProperty("加税点项目") + private String taxItems; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java index 999a45ba7a..3eaeae8e02 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java @@ -83,5 +83,6 @@ public class AsBwinvoiceapplyDetail extends BaseEntity { private BigDecimal otherAmount; // 其他费用 @ApiModelProperty("费用合计") private BigDecimal totalAmount; // 费用合计 - + @ApiModelProperty("加税点项目") + private String taxItems; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java index 0cfbf16b1a..ec0358c02f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java @@ -84,5 +84,6 @@ public class AsBwinvoiceapplyDetailDetailsVo implements Vo { private BigDecimal otherAmount; // 其他费用 @ApiModelProperty("费用合计") private BigDecimal totalAmount; // 费用合计 - + @ApiModelProperty("加税点项目") + private String taxItems; } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java index 8a0bfd9caf..bc36920adf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java @@ -84,5 +84,6 @@ public class AsBwinvoiceapplyDetailDto implements Dto { private BigDecimal otherAmount; // 其他费用 @ApiModelProperty("费用合计") private BigDecimal totalAmount; // 费用合计 - + @ApiModelProperty("加税点项目") + private String taxItems; } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml index a1560e7506..d49f339094 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml @@ -33,6 +33,7 @@ FROM as_busclaim_bill a LEFT JOIN as_busrepair_bill_vech abbv ON a.repairBillSid = abbv.billSid LEFT JOIN as_busrepair_bill ab ON a.repairBillSid = ab.sid + LEFT JOIN anrui_portal.sys_organization AS s ON a.useOrgSid = s.sid ${ew.sqlSegment} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java index 543c82e032..e4fe09998b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java @@ -5,17 +5,26 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asbusclaimbill.*; +import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApplyVo; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListQuery; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo; +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; +import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; /** @@ -26,6 +35,13 @@ import java.util.List; @Service public class AsBusclaimBillService extends MybatisBaseService { + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Resource + private SysOrganizationFeign sysOrganizationFeign; + public ResultBean saveBill(AsBusclaimBillDto dto) { ResultBean rb = ResultBean.fireFail(); int i = baseMapper.checkBillNo(dto.getBillNo()); @@ -35,6 +51,28 @@ public class AsBusclaimBillService extends MybatisBaseService split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptSid = sysOrganization.getSid(); + } + asBusclaimBill.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + asBusclaimBill.setCreateOrgSid(createOrgSid); + } + } baseMapper.insert(asBusclaimBill); return rb.success(); } @@ -42,6 +80,45 @@ public class AsBusclaimBillService extends MybatisBaseService listPage(PagerQuery pagerQuery) { AsBusclaimBillQuery query = pagerQuery.getParams(); QueryWrapper 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 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 p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } //ToDo:添加查询条件 //索赔单号 if (StringUtils.isNotBlank(query.getBillNo())) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java index e705f1db9d..288a169d5e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java @@ -19,6 +19,7 @@ import java.util.Map; **/ @Mapper public interface AsBusclaimInvoiceBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); int selectBySid(String join); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml index 2db7270f30..98cd2bd020 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml @@ -14,6 +14,7 @@ a.invoiceValue, a.invoiceMoney from as_busclaim_invoice_bill a + LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid ${ew.sqlSegment} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index 983fa2c20a..a94b120bd7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillExcelInfo; +import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo; import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto; import com.yxt.anrui.as.api.asbusclaiminvoicebill.*; import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*; @@ -36,8 +37,10 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo; import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; +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; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -101,10 +104,51 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService listPage(PagerQuery pagerQuery) { AsBusclaimInvoiceBillQuery query = pagerQuery.getParams(); QueryWrapper 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 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 p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } //ToDo:添加查询条件 //分公司 if (StringUtils.isNotBlank(query.getUseOrgName())) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml index 105b8323f4..c86d0550b6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml @@ -18,9 +18,12 @@ a.claimOutAmount, a.claimSubsidyAmount, a.claimOtherAmount, - a.remarks + a.claimRescueAmount, + a.remarks, + ab.claimManufacturer from as_busclaim_invoice_bill_detail a - where billSid = #{sid} + left join as_busrepair_bill ab on a.repairBillNo = ab.billNo + where a.billSid = #{sid}