yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
dimengzhe 2 years ago
parent
1fed39696c
commit
19125ed180
6 changed files with 125 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java
  2. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  3. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
  4. 24
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java
  5. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
  6. 208
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java
View File

@ -88,7 +88,9 @@ public class AppArrearsCarryDto implements Dto {
//是否金融部复核
@ApiModelProperty("是否金融部复核，1是，0否")
private String isFinance;
@ApiModelProperty("金融人员用户sid")
private String financeUserSid;
@ApiModelProperty("金融人员")
private String financeName;
@ApiModelProperty("实例id")

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
View File

@ -106,7 +106,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ApiOperation("详情")
@GetMapping("/details")
@ResponseBody
ResultBean<AppArrearsCarryInfoVo> details(@RequestParam("sid")String sid);
ResultBean<AppArrearsCarryInfoVo> details(@RequestParam("sid") String sid);
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceArrearsInfo")
@ -118,6 +118,11 @@ public interface BusArrearsCarryVehicleApplyFeign {
@ResponseBody
public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);
@ApiOperation(value = "销售经理、销售内勤办理（同意）")
@PostMapping("/completeBy")
@ResponseBody
public ResultBean completeBy(@RequestBody CompleteByQuery query);
@ApiOperation(value = "办理（同意）")
@PostMapping("/InitiatorToAnswerInfo")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
View File

@ -117,6 +117,11 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
return null;
}
@Override
public ResultBean completeBy(CompleteByQuery query) {
return null;
}
@Override
public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
return null;

24
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java
View File

@ -0,0 +1,24 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class CompleteByQuery extends AppCompleteAdvanceArrearsDto {
@ApiModelProperty("车辆买卖合同")
private List<String> carContract = new ArrayList<>();
@ApiModelProperty("欠款提车担保承诺书")
private List<String> guaranteeLetter = new ArrayList<>();
@ApiModelProperty("股东会对外担保决议")
private List<String> gdLetter = new ArrayList<>();
@ApiModelProperty("总经理担保书")
private List<String> zjlLetter = new ArrayList<>();
@ApiModelProperty("其他附件")
private List<String> fileList = new ArrayList<>();
}

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
View File

@ -112,7 +112,7 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
return rb.success().setData(vo);
}*/
/* *//**
/* *//**
* 欠款提车-车辆列表
*
* @param pq
@ -145,9 +145,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
return busArrearsCarryVehicleApplyService.submitArrearsCarryVehicle(dto);
}
*//**
*/
/**
* 欠款提车单附件保存接口
*
*//*
@Override
public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> list) {
@ -204,6 +205,11 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
return busArrearsCarryVehicleApplyService.complete(bv);
}
@Override
public ResultBean completeBy(CompleteByQuery query) {
return busArrearsCarryVehicleApplyService.completeBy(query);
}
@Override
public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
BusinessVariables bv = new BusinessVariables();

208
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -27,10 +27,7 @@ import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeQuery;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeVo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
@ -991,9 +988,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
String commitmentMoneyDate = dto.getCommitmentMoneyDate();
List<String> stringLists = Arrays.asList(commitmentMoneyDate.split("-"));
map.put("year",stringLists.get(0));
map.put("month",stringLists.get(1));
map.put("day",stringLists.get(2));
map.put("year", stringLists.get(0));
map.put("month", stringLists.get(1));
map.put("day", stringLists.get(2));
//车辆信息
ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(dto.getContractId());
if (resultBean.getSuccess()) {
@ -1211,7 +1208,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo();
map.put("money", appOrderPriceInfoVo.getTotalPrice());
BigDecimal wMoneyAll = BigDecimal.ZERO;
if(StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())){
if (StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())) {
wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getTotalPrice()));
}
map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(appOrderPriceInfoVo.getTotalPrice()).doubleValue())));
@ -1221,30 +1218,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
map.put("YMoney", subscribtAllResultBean.getData());
wMoneyAll = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData()));
}
if(wMoneyAll.compareTo(BigDecimal.ZERO)<0){
map.put("wMoney","0");
}else{
map.put("wMoney",wMoneyAll.toString());
if (wMoneyAll.compareTo(BigDecimal.ZERO) < 0) {
map.put("wMoney", "0");
} else {
map.put("wMoney", wMoneyAll.toString());
}
map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(subscribtAllResultBean.getData()).doubleValue())));
//根据存放地点查询
String address = "";
if(StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())){
if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())) {
ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
if(scmWarehouseVo != null){
if (scmWarehouseVo != null) {
address = scmWarehouseVo.getWarehouseAttribute();
}
}
map.put("address", address);
//组装到文档相对应的字段中
if(StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())){
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("orgName", invoicingDetailsVoResultBean.getData().getName());
}
}
map.put("mobile",appOrderDetailsVo.getPhone());
map.put("mobile", appOrderDetailsVo.getPhone());
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
if (crmResultBean.getSuccess()) {
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
@ -1365,9 +1362,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
}
if(arearsMoney.compareTo(BigDecimal.ZERO)<0){
if (arearsMoney.compareTo(BigDecimal.ZERO) < 0) {
busArrearsCarryVehicleApply.setArrearsMoney(BigDecimal.ZERO);
}else{
} else {
busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
}
List<String> carContract = dto.getCarContract();
@ -1437,9 +1434,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
}
if(arearsMoney.compareTo(BigDecimal.ZERO)<0){
if (arearsMoney.compareTo(BigDecimal.ZERO) < 0) {
busArrearsCarryVehicleApply.setArrearsMoney(BigDecimal.ZERO);
}else{
} else {
busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
}
if ("0".equals(busArrearsCarryVehicleApply.getIsFinance())) {
@ -1450,35 +1447,35 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (!carContract.isEmpty()) {
String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
}else{
} else {
busArrearsCarryVehicleApply.setCarContractFile("");
}
List<String> guaranteeLetter = dto.getGuaranteeLetter();
if (!guaranteeLetter.isEmpty()) {
String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
}else{
} else {
busArrearsCarryVehicleApply.setGuaranteeLetterFile("");
}
List<String> gdLetter = dto.getGdLetter();
if (!gdLetter.isEmpty()) {
String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
}else{
} else {
busArrearsCarryVehicleApply.setGdLetterFile("");
}
List<String> zjlLetter = dto.getZjlLetter();
if (!zjlLetter.isEmpty()) {
String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
}else{
} else {
busArrearsCarryVehicleApply.setZjlLetterFile("");
}
List<String> otherFile = dto.getFileList();
if (!otherFile.isEmpty()) {
String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setOtherFile(fileLists);
}else{
} else {
busArrearsCarryVehicleApply.setOtherFile("");
}
//车辆
@ -1731,14 +1728,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
bv.setFormVariables(variables);
bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
if ("Activity_0tieuz3".equals(bv.getTaskDefKey())) {
//销售内勤审批
}
if ("Activity_0ynxtyz".equals(bv.getTaskDefKey())) {
//销售部经理审批上传信审
}
if ("Activity_03na1gk".equals(bv.getTaskDefKey())) {
//金融部经理审批
bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid());
@ -1809,54 +1799,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
}
}
/* // 风控中心风控经理
UserRoleQuery userRoleQuery1 = new UserRoleQuery();
userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
for (SysUserVo userVo : list4) {
recipientSidList.add(userVo.getSid());
}
// 风控中心风控内勤
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
for (SysUserVo userVo : list1) {
recipientSidList.add(userVo.getSid());
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
for (SysUserVo userVo : list) {
recipientSidList.add(userVo.getSid());
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery();
userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
for (SysUserVo userVo : list3) {
recipientSidList.add(userVo.getSid());
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery2 = new UserRoleQuery();
userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
for (SysUserVo userVo : list2) {
recipientSidList.add(userVo.getSid());
}
query.setRecipientSidList(recipientSidList);
query.setAppMap(appMaps);
query.setMsgTitle("业务");
query.setMsgContent(sysUserVo.getName() + "提交的欠款提车申请,请查阅");
query.setMsgSource("业务");
query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
query.setApp_type("2");
query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
query.setName("业务");
// 消息推送
messageFeign.sendAutoserviceMessage(query);*/
}
return rb.success().setData(resultBean.getData());
} else {
@ -1956,54 +1898,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
}
}
/*
// 风控中心风控经理
UserRoleQuery userRoleQuery1 = new UserRoleQuery();
userRoleQuery1.setRoleSid("242d52de-7df9-4fab-91ff-d6f07dc98341");
List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
for (SysUserVo userVo : list4) {
recipientSidList.add(userVo.getSid());
}
// 风控中心风控内勤
UserRoleQuery userRoleQuery2 = new UserRoleQuery();
userRoleQuery2.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
for (SysUserVo userVo : list1) {
recipientSidList.add(userVo.getSid());
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
for (SysUserVo userVo : list) {
recipientSidList.add(userVo.getSid());
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery();
userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
for (SysUserVo userVo : list3) {
recipientSidList.add(userVo.getSid());
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery4 = new UserRoleQuery();
userRoleQuery4.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery4).getData();
for (SysUserVo userVo : list2) {
recipientSidList.add(userVo.getSid());
}
query.setRecipientSidList(recipientSidList);
query.setAppMap(appMaps);
query.setMsgTitle("业务");
query.setMsgContent(userVos.getName() + "提交的欠款提车申请,请查阅");
query.setMsgSource("业务");
query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
query.setApp_type("2");
query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
query.setName("业务");
// 消息推送
messageFeign.sendAutoserviceMessage(query);*/
}
return rb.success().setData(resultBean1.getData());
@ -2297,4 +2191,60 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
return rb.success().setData(appArrearsCarryInfoVo);
}
public ResultBean completeBy(CompleteByQuery query) {
ResultBean rb = ResultBean.fireFail();
if ("Activity_0tieuz3".equals(query.getTaskDefKey()) || "Activity_0ynxtyz".equals(query.getTaskDefKey())) {
//销售内勤审批|| //销售部经理审批上传信审
}
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
if (busArrearsCarryVehicleApply == null) {
return rb.setMsg("该申请不存在");
}
List<String> carContract = query.getCarContract();
if (carContract.isEmpty()) {
return rb.setMsg("请上传车辆买卖合同");
} else {
String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setCarContractFile(carContractImages);
}
List<String> guaranteeLetter = query.getGuaranteeLetter();
if (guaranteeLetter.isEmpty()) {
return rb.setMsg("请上传欠款提车担保承诺书");
} else {
String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages);
}
List<String> gdLetter = query.getGdLetter();
if (gdLetter.isEmpty()) {
return rb.setMsg("请上传股东会对外担保协议");
} else {
String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages);
}
List<String> zjlLetter = query.getZjlLetter();
if (zjlLetter.isEmpty()) {
return rb.setMsg("请上传总经理担保书");
} else {
String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
}
List<String> fileList = query.getFileList();
if (fileList.isEmpty()) {
return rb.setMsg("请上传其他附件");
} else {
String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busArrearsCarryVehicleApply.setOtherFile(fileLists);
}
baseMapper.updateById(busArrearsCarryVehicleApply);
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
ResultBean resultBean = complete(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}
Write Preview
Loading…
Cancel
Save