Browse Source

更改

master
ligaode 5 months ago
parent
commit
704b0bfe21
  1. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java
  2. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java
  3. 8
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java
  4. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java
  5. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java
  6. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java
  7. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java
  8. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
  9. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListVo.java
  10. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java
  11. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java
  12. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java
  13. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
  14. 77
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
  15. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
  16. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
  17. 44
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
  18. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml
  19. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

2
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("预计待支付费用")

5
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);
}

8
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;
}

4
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;
}

6
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;
}

2
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";

4
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("费用是否一致")

2
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;
}

2
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;
}

3
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;
}

3
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;
}

3
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;
}

1
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
<where>
${ew.sqlSegment}
</where>

77
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<AsBusclaimBillMapper, AsBusclaimBill> {
@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<AsBusclaimBillMapp
AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
BeanUtil.copyProperties(dto, asBusclaimBill, "sid");
asBusclaimBill.setReportDate(DateUtil.today());
String deptSid = "";
String createOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> 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<SysOrganizationVo> 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<AsBusclaimBillMapp
public PagerVo<AsBusclaimBillVo> listPage(PagerQuery<AsBusclaimBillQuery> pagerQuery) {
AsBusclaimBillQuery query = pagerQuery.getParams();
QueryWrapper<AsBusclaimBill> 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<AsBusclaimBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusclaimBillVo> p = new PagerVo<>();
return p;
}
}
//ToDo:添加查询条件
//索赔单号
if (StringUtils.isNotBlank(query.getBillNo())) {

1
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<AsBusclaimInvoiceBill> {
IPage<AsBusclaimInvoiceBillVo> listPage(IPage<AsBusclaimInvoiceBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimInvoiceBill> qw);
int selectBySid(String join);

1
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
<where>
${ew.sqlSegment}
</where>

44
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<AsBusclaimI
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private AsBusclaimCheckService asBusclaimCheckService;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
QueryWrapper<AsBusclaimInvoiceBill> 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<AsBusclaimInvoiceBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusclaimInvoiceBillVo> p = new PagerVo<>();
return p;
}
}
//ToDo:添加查询条件
//分公司
if (StringUtils.isNotBlank(query.getUseOrgName())) {

7
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}
</select>
<select id="selectByBillSid"

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@ -194,7 +194,8 @@
a.hourAmount,
a.goodsAmount,
a.outAmount,
a.otherAmount
a.otherAmount,
a.taxItems
from as_busrepair_bill a
LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
<where>

Loading…
Cancel
Save