Browse Source

优化

master
God 2 years ago
parent
commit
0f6a37779f
  1. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java
  2. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  3. 50
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
  5. 77
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  6. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
  7. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java
  8. 60
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java

@ -17,6 +17,7 @@ public class ContractPageQuery implements Query {
private int stateType;
@ApiModelProperty("组织全路径")
private String orgPath;
private String menuSid;
@ApiModelProperty("pc客户名称")
private String customerName;

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@ -224,16 +224,18 @@
<select id="getApprovalContractList" resultType="com.yxt.anrui.base.api.commoncontract.ContractPageVo">
SELECT
sid as contractSid,
contractNo as contractId,
customerSid,
partyA,
partyB as customerName,
DATE_FORMAT(createDate, '%Y-%m-%d') as createDate,
modelSid,
modelName
cc.sid AS contractSid,
cc.contractNo AS contractId,
cc.customerSid,
cc.partyA,
cc.partyB AS customerName,
DATE_FORMAT(cc.createDate, '%Y-%m-%d') AS createDate,
cc.modelSid,
cc.modelName
FROM
common_contract
common_contract cc
JOIN anrui_buscenter.`bus_sales_order` bo
ON cc.`contractNo` = bo.`contractNo`
<where>
${ew.sqlSegment}
</where>

50
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -69,9 +69,11 @@ 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.config.DictCommonType;
import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@ -2655,21 +2657,61 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
QueryWrapper<ContractPageVo> qw = new QueryWrapper<>();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
if (params.getStateType() == 2) {
if (StringUtils.isNotBlank(params.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(params.getOrgPath());
privilegeQuery.setMenuSid(params.getMenuSid());
privilegeQuery.setUserSid(params.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = params.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)) {
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
String staffSid = sysUserVo.getStaffSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
qw.eq("staffSid", staffSid);
qw.eq("orgSid", sysOrganizationVo.getSid());
qw.eq("cc.staffSid", staffSid);
qw.eq("cc.orgSid", sysOrganizationVo.getSid());
} else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
} else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
}
ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid);
if (!busList.getData().isEmpty()) {
qw.in("busSid", busList.getData());
qw.in("cc.busSid", busList.getData());
} else {
IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
page.setRecords(new ArrayList<>());
return page;
}
if (StringUtils.isNotBlank(params.getName())) {
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
qw.and(wrapper -> wrapper.like("cc.partyB", params.getName()).or().like("cc.contractNo", params.getName()));
}
} else {
//欠款提车只允许三方金融贷款业务欠款提车

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@ -127,7 +127,7 @@ public class FinBillApplicationDto implements Dto {
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
private String arrearsMoney = "0";
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")

77
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -1916,6 +1916,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs();
List<FinBillFileDto> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
List<FinBillFileDto> pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy();
List<FinBillFileDto> pczrrdbcns = dto.getPczrrdbcns();
List<FinBillFileDto> pczfxsjt = dto.getPczfxsjt();
if (StringUtils.isBlank(dtoSid)) {//新增
FinBillApplication finBillApplication = new FinBillApplication();
BeanUtil.copyProperties(dto, finBillApplication, "sid");
@ -2040,6 +2043,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pcgsgdhdwdbjy.size() > 0) {
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczrrdbcns.size() > 0) {
for (FinBillFileDto finBillFileDto : pczrrdbcns) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczfxsjt.size() > 0) {
for (FinBillFileDto finBillFileDto : pczfxsjt) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
}
FinBillApplication finBillApplication = fetchBySid(dtoSid);
@ -2111,6 +2150,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pcgsgdhdwdbjy.size() > 0) {
for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczrrdbcns.size() > 0) {
for (FinBillFileDto finBillFileDto : pczrrdbcns) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (pczfxsjt.size() > 0) {
for (FinBillFileDto finBillFileDto : pczfxsjt) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(finBillApplication.getSid());
finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
finBillVehicleService.delByBillAppSid(dtoSid);
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
FinBillVehicle finBillVehicle = new FinBillVehicle();
@ -2497,6 +2572,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
@ -2627,6 +2703,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
}
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@ -34,6 +34,10 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String invoicingUnit;
@ApiModelProperty("是否领取原件")
private String getOriginalValue;
@ApiModelProperty("默认开票类型key")
private String openTickTypeKey;
@ApiModelProperty("默认开票类型value")
private String openTickTypeValue;
@ApiModelProperty("默认开票sid")
private String openTickSid;
@ApiModelProperty("默认开票名称")
@ -58,7 +62,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String reasonRemarks;
@ApiModelProperty("欠款开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers;
@ApiModelProperty("欠款承诺书(欠款人、担保人同签)")
@ApiModelProperty("欠款承诺书(欠款人、担保人同签)(欠款领票上传)")
private List<String> fjApplicationAppendxs;
@ApiModelProperty("公司股东会对外担保决议(公司担保)")
private List<String> gsgdhdwdbjy;
@ -76,7 +80,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
private List<String> registerContractImages;
@ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages;
@ApiModelProperty("欠款领票附件")
@ApiModelProperty("《欠款承诺书》(欠款人、担保人同签)(欠款开票上传)")
private List<String> arrearsCollectionAppendxs;
@ApiModelProperty("用户sid")
private String userSid;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java

@ -16,4 +16,5 @@ public class RovalContractPageQuery implements Query {
private int stateType;
@ApiModelProperty("组织全路径")
private String orgPath;
private String menuSid;
}

60
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -224,6 +224,8 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
vo.setName(finBillApplicationDetailsVo.getCustomerName());
vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
vo.setContractId(finBillApplicationDetailsVo.getContractNo());
@ -280,11 +282,17 @@ public class AppBusAdvanceGinvoiceapplyService {
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs();
List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>();
List<String> qklpfjImages = new ArrayList<>();
List<String> gsgdhdwdbjy = new ArrayList<>();
List<String> zrrdbcns = new ArrayList<>();
List<String> zfxsjt = new ArrayList<>();
if (zjApplicationAppendxs != null) {
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl());
@ -310,11 +318,29 @@ public class AppBusAdvanceGinvoiceapplyService {
qklpfjImages.add(arrearsCollectionAppendx.getFileUrl());
}
}
if (pcgsgdhdwdbjy != null) {
for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
}
}
if (pczrrdbcns != null) {
for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
zrrdbcns.add(pczrrdbcn.getFileUrl());
}
}
if (pczfxsjt != null) {
for (FinBillFileVo pczfxs : pczfxsjt) {
zfxsjt.add(pczfxs.getFileUrl());
}
}
vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
vo.setRegisterContractImages(registerContractImages);
vo.setIdCardImages(idCardImages);
vo.setArrearsCollectionAppendxs(qklpfjImages);
vo.setGsgdhdwdbjy(gsgdhdwdbjy);
vo.setZrrdbcns(zrrdbcns);
vo.setZfxsjt(zfxsjt);
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
vo.setIsCanEdit(false);
@ -522,12 +548,18 @@ public class AppBusAdvanceGinvoiceapplyService {
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = dto.getIdCardImages();//证件
List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件
List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
List<String> zrrdbcns = dto.getZrrdbcns();
List<String> zfxsjt = dto.getZfxsjt();
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
List<FinBillFileDto> qklpfjImages = new ArrayList<>(); // 欠款领票附件
List<FinBillFileDto> qklpfjImages = new ArrayList<>();
List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
List<FinBillFileDto> pczfxsjt = new ArrayList<>();
if (customerInvoiceApplyImages != null) {
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
@ -563,11 +595,35 @@ public class AppBusAdvanceGinvoiceapplyService {
qklpfjImages.add(finBillFileDto);
}
}
if (gsgdhdwdbjy != null) {
for (String gsgdhdwdb : gsgdhdwdbjy) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(gsgdhdwdb);
pcgsgdhdwdbjy.add(finBillFileDto);
}
}
if (zrrdbcns != null) {
for (String zrrdbcn : zrrdbcns) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zrrdbcn);
pczrrdbcns.add(finBillFileDto);
}
}
if (zfxsjt != null) {
for (String zfxs : zfxsjt) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(zfxs);
pczfxsjt.add(finBillFileDto);
}
}
finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages);
finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
finBillApplicationDto.setPczrrdbcns(pczrrdbcns);
finBillApplicationDto.setPczfxsjt(pczfxsjt);
ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
return resultBean;
}

Loading…
Cancel
Save