Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
a1f2a23610
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  2. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
  5. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
  6. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
  7. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
  8. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java
  9. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFile.java
  10. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDto.java
  11. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java
  12. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java
  13. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java
  14. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
  15. 86
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  16. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java
  17. 50
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFegin.java
  18. 40
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFeginFallback.java
  19. 67
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillFileDto.java
  20. 72
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillTrailerDto.java
  21. 82
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillVehicleDto.java
  22. 155
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillApplicationDto.java
  23. 38
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillCompleteDto.java
  24. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeQuery.java
  25. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeVo.java
  26. 45
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillTaskQuery.java
  27. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/SubmitFinBillApplicationDto.java
  28. 35
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/billApplication/AppFinBillApplicationRest.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -187,4 +187,6 @@ public class BaseOutsourcingApplicationDto implements Dto {
@ApiModelProperty("申请人组织路径") @ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径 private String orgSidPath; // 申请人组织路径
@ApiModelProperty("申请人组织路径")
private String orgPath; // 申请人组织路径
} }

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -837,7 +837,21 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList(); List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList();
for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) { for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
String openTickRemarks = ""; String openTickRemarks = "";
//openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + ";" + baseDistributorListVo.getRegistDetailAddress() + ";" + baseDistributorListVo.getInvoPhone() + ";" + baseDistributorListVo.getInvoBank() + ";" + baseDistributorListVo.getInvoBankNum(); if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())){
openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())){
openTickRemarks = baseDistributorListVo.getRegistDetailAddress() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())){
openTickRemarks = baseDistributorListVo.getInvoPhone() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())){
openTickRemarks = baseDistributorListVo.getInvoBank() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
openTickRemarks = baseDistributorListVo.getInvoBankNum() + ";";
}
baseDistributorListVo.setOpenTickRemarks(openTickRemarks); baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
} }
return rb.success().setData(baseDistributorListVos); return rb.success().setData(baseDistributorListVos);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -178,8 +178,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
public ResultBean saveOrUpdateDto(BaseOutsourcingApplicationDto dto) { public ResultBean saveOrUpdateDto(BaseOutsourcingApplicationDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String orgPath = ""; String orgPath = "";
if (StringUtils.isNotBlank(dto.getOrgSidPath())){ if (StringUtils.isNotBlank(dto.getOrgPath())){
orgPath = dto.getOrgSidPath(); orgPath = dto.getOrgPath();
}else { }else {
//取组织架构的全路径sid //取组织架构的全路径sid
SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData(); SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@ -82,11 +82,11 @@ public class FinBillApplication extends BaseEntity {
@ApiModelProperty(value = "节点状态") @ApiModelProperty(value = "节点状态")
private String nodeState; private String nodeState;
@ApiModelProperty(value = "节点id") @ApiModelProperty(value = "节点id")
private String nodeId; private String nodeSid;
@ApiModelProperty(value = "流程id") @ApiModelProperty(value = "流程id")
private String procDefId; private String procDefId;
@ApiModelProperty(value = "实例id") @ApiModelProperty(value = "实例id")
private String procInstId; private String procInstSid;
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private String taskId; private String taskId;
@ApiModelProperty(value = "当前用户部门全路径") @ApiModelProperty(value = "当前用户部门全路径")

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@ -59,6 +59,8 @@ public class FinBillApplicationDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
private String createByName; // 创建人接口 private String createByName; // 创建人接口
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
@ -135,6 +137,19 @@ public class FinBillApplicationDetailsVo implements Vo {
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty(value = "节点状态")
private String nodeState;
@ApiModelProperty(value = "节点id")
private String nodeSid;
@ApiModelProperty(value = "流程id")
private String procDefId;
@ApiModelProperty(value = "实例id")
private String procInstSid;
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty(value = "当前用户部门全路径")
private String orgSidPath;
@ApiModelProperty("开票车辆信息") @ApiModelProperty("开票车辆信息")
private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息 private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息
@ApiModelProperty("开票挂车信息") @ApiModelProperty("开票挂车信息")

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

@ -61,8 +61,8 @@ public class FinBillApplicationDto implements Dto {
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("userSid") @ApiModelProperty("创建人sid")
private String userSid; // userSid private String createBySid; // 创建人sid
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
private String createByName; // 创建人接口 private String createByName; // 创建人接口
@ApiModelProperty("合同sid") @ApiModelProperty("合同sid")

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

@ -49,6 +49,8 @@ import lombok.Data;
@ApiModel(value = "开票申请表 查询条件", description = "开票申请表 查询条件") @ApiModel(value = "开票申请表 查询条件", description = "开票申请表 查询条件")
public class FinBillApplicationQuery implements Query { public class FinBillApplicationQuery implements Query {
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty(value = "销售类型key") @ApiModelProperty(value = "销售类型key")

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java

@ -9,7 +9,7 @@ public enum FinAttachTypeEnum {
KHKPSQS("001", "客户开票申请书"), KHKPSQS("001", "客户开票申请书"),
KPXXQRS("002", "开票信息确认书"), KPXXQRS("002", "开票信息确认书"),
CLDJHT("002", "车辆登记合同"); CLDJHT("003", "车辆登记合同");
/** /**
* 附件类型 * 附件类型

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFile.java

@ -60,6 +60,8 @@ public class FinBillFile extends BaseEntity {
private String fileSid; // 附件sid private String fileSid; // 附件sid
@ApiModelProperty("附件路径") @ApiModelProperty("附件路径")
private String fileUrl; // 附件路径 private String fileUrl; // 附件路径
@ApiModelProperty("附件名称")
private String fileName; // 附件名称
@ApiModelProperty("附件类型") @ApiModelProperty("附件类型")
private String attachType; // 附件类型 private String attachType; // 附件类型
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDto.java

@ -61,6 +61,8 @@ public class FinBillFileDto implements Dto {
private String fileSid; // 附件sid private String fileSid; // 附件sid
@ApiModelProperty("附件路径") @ApiModelProperty("附件路径")
private String fileUrl; // 附件路径 private String fileUrl; // 附件路径
@ApiModelProperty("附件名称")
private String fileName; // 附件名称
@ApiModelProperty("附件类型") @ApiModelProperty("附件类型")
private String attachType; // 附件类型 private String attachType; // 附件类型
} }

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java

@ -61,6 +61,10 @@ public class FinBillFileVo implements Vo {
private String fileType; // 附件类型 private String fileType; // 附件类型
@ApiModelProperty("附件sid") @ApiModelProperty("附件sid")
private String fileSid; // 附件sid private String fileSid; // 附件sid
@ApiModelProperty("附件名称")
private String fileName; // 附件名称
@ApiModelProperty("附件路径") @ApiModelProperty("附件路径")
private String fileUrl; // 附件路径 private String fileUrl; // 附件路径
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@ -55,7 +55,7 @@ public class FinBillVehicle extends BaseEntity {
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("开票类型key") @ApiModelProperty("开票类型key")
private String billTypeKey; // 开票类型key private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value") @ApiModelProperty("开票类型value")

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@ -71,4 +71,7 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid); AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid);
String selectNum(String bill); String selectNum(String bill);
@Select("select * from fin_bill_application where contractNo = #{contractNo}")
List<FinBillApplicationDetailsVo> selectByContractNo(String contractNo);
} }

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@ -56,12 +56,12 @@
<update id="updateFlowFiled"> <update id="updateFlowFiled">
UPDATE fin_bill_application UPDATE fin_bill_application
SET nodeState=#{nodeState}, nodeId=#{taskDefKey} SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''"> <if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId} , procDefId=#{procDefId}
</if> </if>
<if test="procInsId != null and procInsId != ''"> <if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId} , procInstSid=#{procInsId}
</if> </if>
<if test="taskId != null and taskId != ''"> <if test="taskId != null and taskId != ''">
, taskId=#{taskId} , taskId=#{taskId}

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

@ -65,10 +65,12 @@ import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService; import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService;
import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService; import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -97,6 +99,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -148,12 +151,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
private BaseVehicleFeign baseVehicleFeign; private BaseVehicleFeign baseVehicleFeign;
@Autowired @Autowired
private BaseTrailerFeign baseTrailerFeign; private BaseTrailerFeign baseTrailerFeign;
@Autowired
private FinVehicleInvoiceService finVehicleInvoiceService;
private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) { private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>(); QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
if (StringUtils.isNotBlank(query.getSaleTypeKey())) { if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
} }
@ -195,24 +201,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) { public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
//用户的组织全路径
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgSidPath())){
orgSidPath = dto.getOrgSidPath();
}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();
}
dto.setOrgSidPath(orgSidPath);
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers(); List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles(); List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
@ -276,16 +264,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (finBillApplication == null) { if (finBillApplication == null) {
rb.setMsg("该数据不存在"); rb.setMsg("该数据不存在");
} }
dto.setArrearsMoney("0");
updateByDto(dto);
finBillFileService.deleteByFinAppSid(dtoSid); finBillFileService.deleteByFinAppSid(dtoSid);
//附件信息 //附件信息
//挂车开票信息 if (khkpsqsApplicationAppendxs != null){
for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
FinBillTrailer finBillTrailer = new FinBillTrailer();
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(finBillApplication.getSid());
finBillTrailerService.save(finBillTrailer);
}
//附件信息
for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl(); String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -296,6 +279,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType()); finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto); finBillFileService.saveOrUpdateDto(finBillFileDto);
} }
}
if (kpxxqrsApplicationAppendxs != null){
for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl(); String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -306,6 +291,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType()); finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto); finBillFileService.saveOrUpdateDto(finBillFileDto);
} }
}
if (cldjhtApplicationAppendxs != null){
for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl(); String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -316,6 +303,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType()); finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType());
finBillFileService.saveOrUpdateDto(finBillFileDto); finBillFileService.saveOrUpdateDto(finBillFileDto);
} }
}
finBillVehicleService.delByBillAppSid(dtoSid); finBillVehicleService.delByBillAppSid(dtoSid);
for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
FinBillVehicle finBillVehicle = new FinBillVehicle(); FinBillVehicle finBillVehicle = new FinBillVehicle();
@ -351,6 +339,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public FinBillApplicationDetailsVo fetchDetailsVoBySid(String sid) { public FinBillApplicationDetailsVo fetchDetailsVoBySid(String sid) {
FinBillApplication entity = fetchBySid(sid); FinBillApplication entity = fetchBySid(sid);
String contractNo = entity.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationVos != null && finBillApplicationVos.size() > 0){
FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
}
FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
String sid1 = entity.getContractSid(); String sid1 = entity.getContractSid();
@ -676,7 +670,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
} }
if (bv.getTaskId().equals(finBillApplication.getTaskId())) { if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@ -685,14 +679,34 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} }
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if (!"Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillApplication.getOpenTickTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillApplication.getOpenTickTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setInvoicingName(finBillApplication.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}else {
//极光推送 //极光推送
finBillApplication = fetchBySid(businessSid); finBillApplication = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finBillApplication.getProcDefId()); ufVo.setProcDefId(finBillApplication.getProcDefId());
ufVo.setProcInsId(finBillApplication.getProcInstId()); ufVo.setProcInsId(finBillApplication.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
@ -722,7 +736,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
} }
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
@ -744,7 +758,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
} }
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
@ -794,7 +808,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finBillApplication.getProcInstId(); String procId = finBillApplication.getProcInstSid();
ufVo.setProcInsId(procId); ufVo.setProcInsId(procId);
ufVo.setProcDefId(finBillApplication.getProcDefId()); ufVo.setProcDefId(finBillApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
@ -876,7 +890,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
orgSidPath = dto.getOrgSidPath(); orgSidPath = dto.getOrgSidPath();
}else{ }else{
//根据用户sid获取staffSid //根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) { if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg()); return rb.setMsg(userVoResultBean.getMsg());
} }
@ -914,7 +928,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//业务sid //业务sid
bv.setBusinessSid(businessSid); bv.setBusinessSid(businessSid);
//用户sid //用户sid
bv.setUserSid(dto.getUserSid()); bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables); bv.setFormVariables(variables);
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId()); bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
@ -944,7 +958,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
bv.setTaskId(finBillApplication.getTaskId()); bv.setTaskId(finBillApplication.getTaskId());
bv.setTaskDefKey(finBillApplication.getNodeId()); bv.setTaskDefKey(finBillApplication.getNodeSid());
bv.setComment("重新提交"); bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId()); bv.setInstanceId(dto.getInstanceId());
return complete(bv); return complete(bv);
@ -1284,7 +1298,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
bv.setTaskId(finBillApplication.getTaskId()); bv.setTaskId(finBillApplication.getTaskId());
bv.setTaskDefKey(finBillApplication.getNodeId()); bv.setTaskDefKey(finBillApplication.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId()); bv.setInstanceId(dto.getInstanceId());
return complete(bv); return complete(bv);

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@ -74,12 +74,12 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
List<FinBillFileVo> groupByList(String sid); List<FinBillFileVo> groupByList(String sid);
@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '客户开票申请书'") @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '001'")
List<FinBillFileVo> fetchkhkpsqsBySid(String sid); List<FinBillFileVo> fetchkhkpsqsBySid(String sid);
@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '开票信息确认书'") @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '002'")
List<FinBillFileVo> fetchkpxxqrsBySid(String sid); List<FinBillFileVo> fetchkpxxqrsBySid(String sid);
@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '车辆登记合同'") @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '003'")
List<FinBillFileVo> fetchcldjhtBySid(String sid); List<FinBillFileVo> fetchcldjhtBySid(String sid);
} }

50
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFegin.java

@ -0,0 +1,50 @@
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
@Api(tags = "开票申请")
@FeignClient(
contextId = "anrui-terminal-AppFinBillApplicationFegin",
name = "anrui-terminal",
path = "finance/v1/billApplication",
fallback = AppFinBillApplicationFeginFallback.class)
public interface AppFinBillApplicationFegin {
/*-----------------------------------------流程------------------------------------------*/
@ApiOperation("提交开票申请")
@PostMapping("/submitBillApplicationInfo")
@ResponseBody
ResultBean submitBillApplicationInfo(@RequestBody SubmitFinBillApplicationDto dto);
@ApiOperation("办理")
@PutMapping("/agreeBillApplicationInfo")
@ResponseBody
ResultBean agreeBillApplicationInfo(@RequestBody SaleOrderRetVehDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectBillApplicationInfo")
@ResponseBody
ResultBean rejectBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallBillApplicationInfo")
@ResponseBody
ResultBean recallBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopBillApplicationInfo")
@ResponseBody
ResultBean stopBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
}

40
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFeginFallback.java

@ -0,0 +1,40 @@
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.anrui.terminal.api.finance.collectionConfirm.AppFinCollectionConfirmationFeignFallback;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@Component
public class AppFinBillApplicationFeginFallback implements AppFinBillApplicationFegin{
@Override
public ResultBean submitBillApplicationInfo(SubmitFinBillApplicationDto dto) {
return null;
}
@Override
public ResultBean agreeBillApplicationInfo(SaleOrderRetVehDto dto) {
return null;
}
@Override
public ResultBean rejectBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean recallBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean stopBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
}

67
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillFileDto.java

@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillFileDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileDto <br/>
* Description: 开票附件关联表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 17:07:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票附件关联表 数据传输对象", description = "开票附件关联表 数据传输对象")
public class FinBillFileDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("附件类型")
private String fileType; // 附件类型
@ApiModelProperty("附件sid")
private String fileSid; // 附件sid
@ApiModelProperty("附件路径")
private String fileUrl; // 附件路径
@ApiModelProperty("附件名称")
private String fileName; // 附件名称
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
}

72
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillTrailerDto.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(开票挂车信息) <br/>
* File: FinBillTrailerDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
* Description: 开票挂车信息表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-04-06 16:41:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票挂车信息表 数据传输对象", description = "开票挂车信息表 数据传输对象")
public class FinBillTrailerDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("主车车架号")
private String vinNo; // 主车车架号
@ApiModelProperty("挂车车架号")
private String gcVinNo; // 挂车车架号
@ApiModelProperty("开票类型key")
private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billTypeValue; // 开票类型value
@ApiModelProperty("开票名称sid")
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
}

82
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillVehicleDto.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillVehicleDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto <br/>
* Description: 开票车辆信息表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 10:27:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票车辆信息表 数据传输对象", description = "开票车辆信息表 数据传输对象")
public class FinBillVehicleDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("开票类型key")
private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billTypeValue; // 开票类型value
@ApiModelProperty("挂靠公司sid")
private String billNameSid; // 挂靠公司sid
@ApiModelProperty("挂靠公司名称")
private String billName; // 挂靠公司名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("开票名称sid")
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
}

155
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillApplicationDto.java

@ -0,0 +1,155 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillFileDto;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillTrailerDto;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillVehicleDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillApplicationDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto <br/>
* Description: 开票申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 10:27:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票申请表 数据传输对象", description = "开票申请表 数据传输对象")
public class AppFinBillApplicationDto implements Dto {
private String sid; // sid
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("合同sid")
private String contractSid; // 合同sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("开票金额合计")
private String totalBillMoney; // 开票金额合计
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
@ApiModelProperty(value = "是否延迟开票")
private String isDelayBill;
@ApiModelProperty(value = "是否高低开")
private String isHighAndLowOpen;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("当前用户部门全路径")
private String orgSidPath;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("开票状态Value")
private String billStateValue; // 开票状态Value
@ApiModelProperty("开票状态key")
private String billStateKey;// 开票状态key
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票车辆信息")
private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
@ApiModelProperty("客户开票申请书附件信息")
private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
@ApiModelProperty("开票信息确认书附件信息")
private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
@ApiModelProperty("车辆登记合同附件信息")
private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
}

38
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillCompleteDto.java

@ -0,0 +1,38 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 14:57
* @Description
*/
@Data
public class AppFinBillCompleteDto implements Dto {
private static final long serialVersionUID = 6378752532534735663L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误:orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:04
* @Description
*/
@Data
public class AppFinBillNodeQuery implements Query {
private static final long serialVersionUID = 9117613683840483366L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
}

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:03
* @Description
*/
@Data
public class AppFinBillNodeVo implements Vo {
private static final long serialVersionUID = -833419512294877848L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

45
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillTaskQuery.java

@ -0,0 +1,45 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:06
* @Description
*/
@Data
public class AppFinBillTaskQuery implements Query {
private static final long serialVersionUID = 1288615499873178778L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/SubmitFinBillApplicationDto.java

@ -0,0 +1,23 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liuguohui
* @version 1.0
* @description
* @date 2022/04/13
*/
@ApiModel("提交")
@Data
public class SubmitFinBillApplicationDto extends AppFinBillApplicationDto {
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

35
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/billApplication/AppFinBillApplicationRest.java

@ -0,0 +1,35 @@
package com.yxt.anrui.terminal.biz.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.finance.billApplication.AppFinBillApplicationFegin;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.common.core.result.ResultBean;
public class AppFinBillApplicationRest implements AppFinBillApplicationFegin {
@Override
public ResultBean submitBillApplicationInfo(SubmitFinBillApplicationDto dto) {
return null;
}
@Override
public ResultBean agreeBillApplicationInfo(SaleOrderRetVehDto dto) {
return null;
}
@Override
public ResultBean rejectBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean recallBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean stopBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
}
Loading…
Cancel
Save