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

问题优化

master
God 2 years ago
parent
a90227254a
commit
79172a1ea9
13 changed files with 834 additions and 93 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. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  3. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  4. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  5. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
  6. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java
  7. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
  8. 439
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  9. 49
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  10. 39
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
  11. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java
  12. 43
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  13. 312
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -3846,9 +3846,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
List<BaseVehicleQKKPVo> records = page.getRecords();
List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
for (BaseVehicleQKKPVo record : records) {
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
if (finBillVehicleDetailsVo == null){
recordsNew.add(record);
if (StringUtils.isNotBlank(record.getVehSid())){
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
if (finBillVehicleDetailsVo == null){
recordsNew.add(record);
}
}
}
for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
View File

@ -205,4 +205,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
IPage<AppRovalContractPageVo> selectByStaffSid(IPage<AppRovalContractPageVo> page,@Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw);
List<String> selectBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
List<String> selectQKBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
View File

@ -404,4 +404,9 @@
${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' and bo.financePlan = '2'
</where>
</select>
<select id="selectQKBusinessSid" resultType="java.lang.String">
select sid
from bus_sales_order where createBySid = #{userSid} and useOrgSid = #{useOrgSid} and nodeState = '已办结' and financePlan = '2'
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -6315,7 +6315,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
qw.notIn("bv.sid", stringList);
}
}
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid,qw);
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw);
stringList.removeAll(Collections.singleton(null));
return rb.success().setData(stringList);
}
@ -6323,7 +6323,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
ResultBean<List<String>> rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid);
List<String> stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid);
stringList.removeAll(Collections.singleton(null));
List<String> busSids = new ArrayList<>();
for (String orderSid : stringList) {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
View File

@ -186,7 +186,7 @@ public interface FinBillApplicationFeign {
@PostMapping("/completeQKLP")
public ResultBean completeQKLP(@Valid @RequestBody FinBillCompleteDto query);
//欠款开票销售内勤审批
//欠款领票销售内勤审批
@ApiOperation(value = "办理（同意）")
@PostMapping("/completeByQKLP")
ResultBean completeByQKLP(@Valid @RequestBody FinBillCompleteDto query);

20
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java
View File

@ -1,10 +1,12 @@
package com.yxt.anrui.fin.api.finbillapplication.flowable;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.List;
/**
@ -37,14 +39,14 @@ public class FinBillCompleteDto implements Dto {
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
@ApiModelProperty("附件")
private List<String> fjApplicationAppendxs;
@ApiModelProperty("客户开票申请书附件信息")
private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>();
@ApiModelProperty("款项确认书附件信息")
private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>();
@ApiModelProperty("车辆登记合同附件信息")
private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>();
@ApiModelProperty("证件")
private List<String> idCardImages;
@ApiModelProperty("客户开票申请书")
private List<String> customerInvoiceApplyImages;
@ApiModelProperty("车辆登记合同")
private List<String> registerContractImages;
@ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages;
private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
@ApiModelProperty("附件")
private List<FinBillFileDto> fjApplicationAppendxs = new ArrayList<>();
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
View File

@ -242,7 +242,7 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
BusinessVariables bv=new BusinessVariables();
BeanUtil.copyProperties(query,bv);
bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
return finBillApplicationService.completeByQKLP(bv);
return finBillApplicationService.completeByQKLP(bv,query);
}
@Override

439
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -415,7 +415,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
}
vo.setFinBillTrailers(finBillTrailerVos);
} else {
}
/*else {
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(), entity.getContractNo()).getData();
@ -443,7 +444,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
vo.setFinBillTrailers(finBillTrailerVos);
}
}*/
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid);
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
String fileUrl = khkpsqsApplicationAppendx.getFileUrl();
@ -792,7 +793,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中，不可提交");
}
}
}
@ -1462,7 +1463,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public ResultBean saveQKLP(FinBillApplicationDto dto) {
public ResultBean<String> saveQKLP(FinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
@ -1586,7 +1587,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中，不可提交");
}
}
}
@ -1724,14 +1725,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean completeBy(BusinessVariables bv, FinBillCompleteDto query) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
List<String> idCardImages = query.getIdCardImages();
List<String> customerInvoiceApplyImages = query.getCustomerInvoiceApplyImages();//客户开票申请书
List<String> invoiceApplyConfirmImages = query.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = query.getRegisterContractImages();//车辆登记合同
if (idCardImages.size() == 0){
List<FinBillFileDto> khkpsqsApplicationAppendxs = query.getKhkpsqsApplicationAppendxs();
List<FinBillFileDto> kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs();
List<FinBillFileDto> cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs();
List<FinBillFileDto> zjApplicationAppendxs = query.getZjApplicationAppendxs();
if (zjApplicationAppendxs.size() == 0){
return rb.setMsg("证件不能为空");
}
if (customerInvoiceApplyImages.size() == 0){
if (khkpsqsApplicationAppendxs.size() == 0){
return rb.setMsg("客户开票申请书不能为空");
}
FinBillApplication finBillApplication = fetchBySid(businessSid);
@ -1753,9 +1754,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//更新图片
finBillFileService.deleteByFinAppSid(businessSid);
//附件信息
if (customerInvoiceApplyImages.size() > 0) {
for (String filePath : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
if (khkpsqsApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
@ -1765,9 +1766,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (idCardImages.size() > 0) {
for (String filePath : idCardImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
if (zjApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
@ -1777,9 +1778,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (invoiceApplyConfirmImages.size() > 0) {
for (String filePath : invoiceApplyConfirmImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
if (kpxxqrsApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
@ -1789,9 +1790,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (registerContractImages.size() > 0) {
for (String filePath : registerContractImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
if (cldjhtApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
@ -2157,38 +2158,412 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
FinBillApplication finBillApplication2 = fetchBySid(dtoSid);
if (!finBillApplication2.getNodeState().equals("已办结")){
return rb.setMsg("该申请仍在审核过程中，不可提交");
}
if (finBillApplication2.getIsLQOrigInvoice().equals("是")){
return rb.setMsg("该申请已领取过发票原件，请重新选择");
}
String contractNo = dto.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationDetailsVos != null) {
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票/欠款领票申请正在审批中，不可提交");
}
}
}
//用户的组织全路径
String orgSidPath = "";
if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
orgSidPath = dto.getOrgSidPath();
} else {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
dto.setOrgSidPath(orgSidPath);
finBillApplication2.setSid(null);
int r = submitBusinessDataPc(dto, finBillApplication2);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
dto.setIsLQOrigInvoice("是");
//新增修改保存
ResultBean<String> resultBean = saveQKLP(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
FinBillApplication finBillApplication1 = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
variables.put("isAdj", finBillApplication1.getIsLQOrigInvoice().equals("是"));
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("欠款领票");
messageFlowableQuery.setMsgContent(finBillApplication1.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款领票");
messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
if (r == 2) {
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
}
bv.setTaskId(finBillApplication1.getTaskId());
bv.setTaskDefKey(finBillApplication1.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return null;
}
public ResultBean completeQKLP(BusinessVariables bv) {
return null;
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
FinBillApplication finBillApplication = fetchBySid(businessSid);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
} else {
//极光推送
finBillApplication = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finBillApplication.getProcDefId());
ufVo.setProcInsId(finBillApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("欠款领票");
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款领票");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean completeByQKLP(BusinessVariables bv) {
return null;
public ResultBean completeByQKLP(BusinessVariables bv,FinBillCompleteDto query) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
List<FinBillFileDto> fjApplicationAppendxs = query.getFjApplicationAppendxs();
if (fjApplicationAppendxs.size() == 0){
return rb.setMsg("附件不能为空");
}
FinBillApplication finBillApplication = fetchBySid(businessSid);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//更新图片
finBillFileService.deleteByFinAppSid(businessSid);
//附件信息
if (fjApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : fjApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
finBillFileDto.setFileUrl(filePath);
finBillFileDto.setBillAppSid(businessSid);
finBillFileDto.setAttachType(FinAttachTypeEnum.FJ.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
//极光推送
finBillApplication = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finBillApplication.getProcDefId());
ufVo.setProcInsId(finBillApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("欠款领票");
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款领票");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean companyToDivisionOperateQKLP(BusinessVariables bv) {
return null;
ResultBean rb = ResultBean.fireFail();
FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
return rb.setMsg("下一环节暂无操作人员");
}
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
//极光推送
UpdateFlowFieldVo ufVo = resultBean1.getData();
finBillApplication = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcInsId(finBillApplication.getProcInstSid());
messageFlowVo.setProcDefId(finBillApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("欠款领票");
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款领票");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success().setData(resultBean1.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean<List<FinBillNodeVo>> getPreviousNodesForRejectQKLP(FinBillNodeQuery query) {
return null;
ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
bv.setFormVariables(variables);
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmitQKLP(FinBillNodeQuery query) {
return null;
ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
bv.setFormVariables(variables);
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean rejectQKLP(FinBillTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid();
FinBillApplication finBillApplication = fetchBySid(businessSid);
if (finBillApplication == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = finBillApplication.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
finBillApplication = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finBillApplication.getProcInstSid();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(finBillApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("欠款领票");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finBillApplication.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("欠款领票");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean revokeProcessQKLP(FinBillTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
String businessTaskId = finBillApplication.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败，提交的数据不一致!");
}
public ResultBean breakProcessQKLP(FinBillTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
String businessTaskId = finBillApplication.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
finBillVehicleService.updateByMainSid(finBillApplication.getSid());
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
}

49
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
View File

@ -106,6 +106,8 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ResponseBody
public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
/********************************************欠款开票流程*************************************************/
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceInvoiceInfo")
@ResponseBody
@ -141,13 +143,50 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ResponseBody
ResultBean stopAdvanceInvoiceInfo(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AdvanceInvoiceQuery query);
@ApiOperation("获取下一环节")
@GetMapping("/getFlowOperateTitleBy")
@ResponseBody
ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(@SpringQueryMap AdvanceInvoiceQuery query);
/********************************************欠款领票流程*************************************************/
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceInvoiceInfoQKLP")
@ResponseBody
ResultBean submitAdvanceInvoiceInfoQKLP(@RequestBody SubmitAdvanceInvoiceDto dto);
@ApiOperation("办理")
@PutMapping("/agreeAdvanceInvoiceInfoQKLP")
@ResponseBody
ResultBean agreeAdvanceInvoiceInfoQKLP(@RequestBody CompleteAdvanceInvoiceDto dto);
@ApiOperation("办理")
@PutMapping("/completeByQKLP")
@ResponseBody
ResultBean agreeQKKPInfoByQKLP(@RequestBody qkkpDto dto);
@ApiOperation("办理 跨机构")
@PutMapping("/initiatorToAnswerInfoQKLP")
@ResponseBody
ResultBean initiatorToAnswerQKLP(@RequestBody CompleteAdvanceInvoiceDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectAdvanceInvoiceInfoQKLP")
@ResponseBody
ResultBean rejectAdvanceInvoiceInfoQKLP(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallAdvanceInvoiceInfoQKLP")
@ResponseBody
ResultBean recallAdvanceInvoiceInfoQKLP(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopAdvanceInvoiceInfoQKLP")
@ResponseBody
ResultBean stopAdvanceInvoiceInfoQKLP(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("获取下一环节")
@GetMapping("/getFlowOperateTitleByQKLP")
@ResponseBody
ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(@SpringQueryMap AdvanceInvoiceQuery query);
}

39
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
View File

@ -129,12 +129,47 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
return null;
}
@Override
public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
public ResultBean submitAdvanceInvoiceInfoQKLP(SubmitAdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean agreeAdvanceInvoiceInfoQKLP(CompleteAdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean agreeQKKPInfoByQKLP(qkkpDto dto) {
return null;
}
@Override
public ResultBean initiatorToAnswerQKLP(CompleteAdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean rejectAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean recallAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean stopAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
return null;
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java
View File

@ -36,6 +36,8 @@ public class qkkpDto implements Dto {
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
@ApiModelProperty("附件")
private List<String> fjApplicationAppendxs;
@ApiModelProperty("证件")
private List<String> idCardImages;
@ApiModelProperty("客户开票申请书")

43
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
View File

@ -136,12 +136,47 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
return appBusAdvanceGinvoiceapplyService.getFlowOperateTitle(query);
public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleBy(query);
}
@Override
public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleBy(query);
public ResultBean submitAdvanceInvoiceInfoQKLP(SubmitAdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.submitAdvanceInvoiceInfoQKLP(dto);
}
@Override
public ResultBean agreeAdvanceInvoiceInfoQKLP(CompleteAdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.agreeAdvanceInvoiceInfoQKLP(dto);
}
@Override
public ResultBean agreeQKKPInfoByQKLP(qkkpDto dto) {
return appBusAdvanceGinvoiceapplyService.agreeQKKPInfoByQKLP(dto);
}
@Override
public ResultBean initiatorToAnswerQKLP(CompleteAdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.initiatorToAnswerQKLP(dto);
}
@Override
public ResultBean rejectAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.rejectAdvanceInvoiceInfoQKLP(query);
}
@Override
public ResultBean recallAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.recallAdvanceInvoiceInfoQKLP(query);
}
@Override
public ResultBean stopAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.stopAdvanceInvoiceInfoQKLP(query);
}
@Override
public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleByQKLP(query);
}
}

312
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -684,8 +684,6 @@ public class AppBusAdvanceGinvoiceapplyService {
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
ResultBean resultBean = finBillApplicationFeign.completeQK(finBillCompleteDto);
@ -707,8 +705,6 @@ public class AppBusAdvanceGinvoiceapplyService {
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
ResultBean resultBean = finBillApplicationFeign.companyToDivisionOperateQK(finBillCompleteDto);
@ -751,35 +747,6 @@ public class AppBusAdvanceGinvoiceapplyService {
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = busAdvanceGinvoiceapplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busAdvanceGinvoiceapplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
return rb.success().setData(data);
}
public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(String sid) {
ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
@ -906,6 +873,47 @@ public class AppBusAdvanceGinvoiceapplyService {
}
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
//附件信息
List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = dto.getIdCardImages();//证件
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
if (customerInvoiceApplyImages != null) {
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(customerInvoiceApplyImage);
khkpsqsApplicationAppendxs.add(finBillFileDto);
}
}
if (invoiceApplyConfirmImages != null) {
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
kpxxqrsApplicationAppendxs.add(finBillFileDto);
}
}
if (registerContractImages != null) {
for (String registerContractImage : registerContractImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(registerContractImage);
cldjhtApplicationAppendxs.add(finBillFileDto);
}
}
if (idCardImages != null) {
for (String idCardImage : idCardImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(idCardImage);
idCardImagesPC.add(finBillFileDto);
}
}
finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillCompleteDto.setZjApplicationAppendxs(idCardImagesPC);
finBillCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = finBillApplicationFeign.completeBy(finBillCompleteDto);
if (!resultBean.getSuccess()) {
@ -920,7 +928,7 @@ public class AppBusAdvanceGinvoiceapplyService {
FinBillNodeQuery getNodeQuery = new FinBillNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
ResultBean<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmit(getNodeQuery);
ResultBean<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmitQK(getNodeQuery);
if (nextNodesForSubmit.getSuccess()) {
nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = nextNodesForSubmit.getData().get(0).getName();
@ -998,4 +1006,240 @@ public class AppBusAdvanceGinvoiceapplyService {
}
return rb.success().setData(qkkpFlowListVo);
}
public ResultBean submitAdvanceInvoiceInfoQKLP(SubmitAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail();
SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
submitAdvanceInvoiceDto.setUseOrgSid(useOrgSid);
submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
submitAdvanceInvoiceDto.setArrearsMoney(dto.getInvoiceTotal());
submitAdvanceInvoiceDto.setReturnedMoneyDate(dto.getCollectionDate());
submitAdvanceInvoiceDto.setArrearsOpenYYKey(dto.getReasonKey());
submitAdvanceInvoiceDto.setArrearsOpenYYValue(dto.getReasonValue());
submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());
submitAdvanceInvoiceDto.setOpenTickName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setContractNo(dto.getContractId());
submitAdvanceInvoiceDto.setApplyDate(dto.getDate());
submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
submitAdvanceInvoiceDto.setNodeState(dto.getNodeState());
submitAdvanceInvoiceDto.setBillNo(dto.getBillNo());
submitAdvanceInvoiceDto.setModelSid(dto.getModelSid());
submitAdvanceInvoiceDto.setModelName(dto.getModelName());
String publishInfo = dto.getPublishInfo();
String[] split = publishInfo.split("-");
submitAdvanceInvoiceDto.setDeptName(split[0]);
submitAdvanceInvoiceDto.setCreateByName(split[1]);
//开票车辆信息
List<AppCarListDto> vinList = dto.getVinList();
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
for (AppCarListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVin());
finBillVehicleDto.setVehSid(vinListDto.getVinSid());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
finBillVehicleDtos.add(finBillVehicleDto);
}
submitAdvanceInvoiceDto.setFinBillVehicles(finBillVehicleDtos);
//开票挂车信息
List<com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
if (finBillTrailers != null && finBillTrailers.size() > 0) {
for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) {
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
finBillTrailerDtos.add(finBillTrailerDto);
}
}
submitAdvanceInvoiceDto.setFinBillTrailers(finBillTrailerDtos);
//附件信息
List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();//附件
List<FinBillFileDto> fj = new ArrayList<>();//附件
if (fjApplicationAppendxs != null) {
for (String fjApplicationAppendx : fjApplicationAppendxs) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(fjApplicationAppendx);
fj.add(finBillFileDto);
}
}
submitAdvanceInvoiceDto.setFjApplicationAppendxs(fj);
ResultBean resultBean = finBillApplicationFeign.submitFinBillApplicationQKLP(submitAdvanceInvoiceDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean agreeAdvanceInvoiceInfoQKLP(CompleteAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
ResultBean resultBean = finBillApplicationFeign.completeQKLP(finBillCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean agreeQKKPInfoByQKLP(qkkpDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgSidPath = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSidPath = dto.getOrgPath();
} else {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
//附件信息
List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();//附件
List<FinBillFileDto> fj = new ArrayList<>();//附件
if (fjApplicationAppendxs != null) {
for (String fjApplicationAppendx : fjApplicationAppendxs) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(fjApplicationAppendx);
fj.add(finBillFileDto);
}
}
finBillCompleteDto.setFjApplicationAppendxs(fj);
finBillCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = finBillApplicationFeign.completeByQKLP(finBillCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean initiatorToAnswerQKLP(CompleteAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
ResultBean resultBean = finBillApplicationFeign.companyToDivisionOperateQK(finBillCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FinBillTaskQuery taskQuery = new FinBillTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = finBillApplicationFeign.rejectQKLP(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FinBillTaskQuery taskQuery = new FinBillTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = finBillApplicationFeign.revokeProcessQKLP(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopAdvanceInvoiceInfoQKLP(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
FinBillTaskQuery taskQuery = new FinBillTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = finBillApplicationFeign.breakProcessQKLP(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
ResultBean<qkkpFlowListVo> rb = ResultBean.fireFail();
qkkpFlowListVo qkkpFlowListVo = new qkkpFlowListVo();
FinBillNodeQuery getNodeQuery = new FinBillNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
ResultBean<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmitQKLP(getNodeQuery);
if (nextNodesForSubmit.getSuccess()) {
nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = nextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(nextNodesForSubmit.getMsg());
}
qkkpFlowListVo.setTitle(data);
AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
appBillApplicationDetailsQKQuery.setSid(query.getBusinessSid());
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
if (finBillApplicationDetailsVo != null) {
//附件信息
List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs();
List<String> fj = new ArrayList<>();
List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>();
if (fjApplicationAppendxs != null) {
for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) {
fj.add(fjApplicationAppendx.getFileUrl());
}
ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
itemEditTextInfo.setTitle("附件");
itemEditTextInfo.setType(1);
itemEditTextInfo.setNullAble(false);
itemEditTextInfo.setKey("fjApplicationAppendxs");
itemEditTextInfo.setFilesPath(fj);
itemEditTextInfos.add(itemEditTextInfo);
}
qkkpFlowListVo.setList(itemEditTextInfos);
}
return rb.success().setData(qkkpFlowListVo);
}
}
Write Preview
Loading…
Cancel
Save