diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index d2f68a5107..16c4ba0382 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -90,6 +90,11 @@ public interface BaseVehicleTempstateFeign { @ResponseBody ResultBean> selectAllOne(@PathVariable("s") String s); + @ApiOperation("查询该车架号是否在审批中") + @GetMapping("/selectByVin/{vin}") + @ResponseBody + ResultBean selectByVin(@PathVariable("vin") String vin); + @ApiOperation("根据业务类型查询临时状态") @GetMapping("/getList") @ResponseBody diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java index 61f6f9090d..d5f5e1a47f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java @@ -89,4 +89,9 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe public ResultBean> getList(String tempStateKey) { return null; } + + @Override + public ResultBean selectByVin(String vin) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java index 428b353cf4..d6ff878a6b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java @@ -19,7 +19,9 @@ public class VehicleStateTempOrLast { BAG_CARD_BUSINESS("0003", "包牌业务"), - FIN_PAYMENT("0005", "款项确认"); + FIN_PAYMENT("0005", "款项确认"), + + NORMAL_INVOICING("0006", "正常开票"); /** * code值 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java index 7cdf9d17de..f84c5dd509 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java @@ -71,5 +71,8 @@ public interface BaseVehicleTempstateMapper extends BaseMapper selectAllOne(String s); + @Select("select count(*) from base_vehicle_tempstate where vinNo = #{vin}") + Integer selectByVin(@Param("vin") String vin); + List getList(String tempStateKey); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java index bb85264de8..bdaffcb8ab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java @@ -121,4 +121,11 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign { List baseVehicleTempstates = baseVehicleTempstateService.getList(tempStateKey); return rb.success().setData(baseVehicleTempstates); } + + @Override + public ResultBean selectByVin(String vin) { + ResultBean rb = ResultBean.fireFail(); + Integer count = baseVehicleTempstateService.selectByVin(vin); + return rb.setData(count); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java index df5b87ca35..e798dff6b7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java @@ -124,4 +124,9 @@ public class BaseVehicleTempstateService extends MybatisBaseService getList(String tempStateKey) { return baseMapper.getList(tempStateKey); } + + + public Integer selectByVin(String vin) { + return baseMapper.selectByVin(vin); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 94c807b509..3ac526bb3a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -518,7 +518,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); if (!staffOrgResultBean.getSuccess()) { @@ -616,6 +616,14 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService carList = dto.getCarList(); + for (AdCarListDto adCarListDto : carList) { + Integer count = baseVehicleTempstateFeign.selectByVin(adCarListDto.getVin()).getData(); + if (count > 0) { + return rb.setMsg("该申请车架号中存在审核中，请重新选择！"); + } + } //新增修改保存 ResultBean resultBean = saveAdvanceInvoice(dto); if (!resultBean.getSuccess()) { @@ -626,9 +634,13 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid()); for (BusGinvoiceapplyVehicleDetailsVo busGinvoiceapplyVehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) { baseVehicleTempstateDto.setVehSid(busGinvoiceapplyVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateDto.setVinNo(busGinvoiceapplyVehicleDetailsVo.getVinNo()); baseVehicleTempstateFeign.save(baseVehicleTempstateDto); } baseMapper.updateType(busAdvanceGinvoiceapply.getSid()); @@ -768,14 +780,15 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService vinList = new ArrayList<>(); List busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid()); for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) { AppVinListDto appVinListDto = new AppVinListDto(); appVinListDto.setVIN(vehicleDetailsVo.getVinNo()); - appVinListDto.setBillTypeKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()); - appVinListDto.setBillTypeValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getRemarks()); vinList.add(appVinListDto); } addInvoicedApplyDto.setVinList(vinList); @@ -896,7 +909,10 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService vinList = new ArrayList<>(); List busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid()); for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) { @@ -1029,6 +1045,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busAdvanceGinvoiceapply.getCreateBySid())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + baseVehicleTempstateFeign.delByBusSid(busAdvanceGinvoiceapply.getSid()); } else { messageFlowableQuery.setMsgContent(busAdvanceGinvoiceapply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } @@ -1057,6 +1074,12 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busAdvanceGinvoiceapply.getCreateBySid())) { + baseVehicleTempstateFeign.delByBusSid(busAdvanceGinvoiceapply.getSid()); + } return rb.success().setData(resultBean.getData()); } } @@ -1086,6 +1109,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService carList = dto.getCarList(); + for (AdCarListDto adCarListDto : carList) { + Integer count = baseVehicleTempstateFeign.selectByVin(adCarListDto.getVin()).getData(); + if (count > 0) { + return rb.setMsg("该申请车架号中存在审核中，请重新选择！"); + } + } //新增修改保存 ResultBean resultBean = saveArrearsApply(dto); if (!resultBean.getSuccess()) { @@ -679,9 +687,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateDto.setVinNo(busArrearsCarryVehicleDetailsVo.getVinNo()); baseVehicleTempstateFeign.save(baseVehicleTempstateDto); } baseMapper.updateType(businessSid); @@ -1109,6 +1121,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid()); } else { messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } @@ -1136,6 +1149,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) { + baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid()); + } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); } @@ -1165,6 +1183,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService vinList; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoDto.java index 813c2ffce0..6a5b38a248 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoDto.java @@ -15,7 +15,7 @@ public class AppBillApplicationIInfoDto implements Dto { private String sid; @ApiModelProperty("用户sid") - private String createBySid; + private String userSid; @ApiModelProperty("合同sid") private String contractSid; @@ -43,7 +43,11 @@ public class AppBillApplicationIInfoDto implements Dto { @ApiModelProperty("开票状态") @JsonProperty("invoiceState") - private String billState; + private String billState; // 开票状态 + + @ApiModelProperty("开票状态") + @JsonProperty("invoiceStateKey") + private String billStateKey;// 开票状态key @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @@ -61,4 +65,7 @@ public class AppBillApplicationIInfoDto implements Dto { @JsonProperty("procInsId") private String procInstSid; + @ApiModelProperty("用户部门路径") + private String orgSidPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java index 78bb000ef1..ba6bcb8fec 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java @@ -11,6 +11,9 @@ import java.util.List; public class AppBillApplicationIInfoVo implements Vo { private static final long serialVersionUID = 2940544958680782026L; + @ApiModelProperty("业务sid") + private String sid; + @ApiModelProperty("用户sid") private String createBySid; @@ -41,6 +44,9 @@ public class AppBillApplicationIInfoVo implements Vo { @ApiModelProperty("开票状态") private String billState; + @ApiModelProperty("开票状态") + private String billStateKey; + @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @@ -54,7 +60,7 @@ public class AppBillApplicationIInfoVo implements Vo { private String taskId; @ApiModelProperty("流程实列id") - private String procInstSid; + private String procInstId; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageInfoQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageInfoQuery.java new file mode 100644 index 0000000000..1491752bc6 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageInfoQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBillApplicationPageInfoQuery implements Query { + private static final long serialVersionUID = 2215486698112622511L; + + @ApiModelProperty("") + private String sid; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java index 801f89ac82..923ffdd472 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java @@ -1,6 +1,5 @@ package com.yxt.anrui.fin.api.finbillapplication; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java index f3c856ed58..33fe321ade 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finbillapplication; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +11,7 @@ public class AppVinListVo implements Vo { private static final long serialVersionUID = -8613016702728614645L; @ApiModelProperty("车架号") - private String vin; + private String VIN; @ApiModelProperty("开票名称") private String invoiceName; @@ -19,8 +20,8 @@ public class AppVinListVo implements Vo { private String invoiceNameKey; @ApiModelProperty("开票类型") - private String invoiceType; + private String billTypeValue; @ApiModelProperty("开票类型") - private String invoiceTypeKey; + private String billTypeKey; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index bed9656a57..0237665f66 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -72,24 +72,28 @@ public class FinBillApplication extends BaseEntity { private BigDecimal totalBillMoney; // 开票金额合计 @ApiModelProperty("开票状态") private String billState; // 开票状态 + @ApiModelProperty("开票状态") + private String billStateKey;// 开票状态key @ApiModelProperty("车辆总台数") private Integer num; // 车辆总台数 @ApiModelProperty("申请日期") private String applyDate; // 申请日期 @ApiModelProperty("开票公共表sid") private String billAppPublicSid; // 开票公共表sid - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("环节定义的sid") - private String nodeSid; - @ApiModelProperty("流程实例的sid") - private String procInstSid; + @ApiModelProperty(value = "是否延迟开票") + private Integer isDelayBill; @ApiModelProperty(value = "节点状态") private String nodeState; - @ApiModelProperty(value = "是否延迟开票") - private Integer isDelayBill; - @ApiModelProperty("当前用户部门全路径") - private String orgSidPath; + @ApiModelProperty(value = "节点id") + private String nodeId; + @ApiModelProperty(value = "流程id") + private String procDefId; + @ApiModelProperty(value = "实例id") + private String procInstId; + @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "当前用户部门全路径") + private String orgSidPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 28bae3ab83..9a7d61fba0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -114,6 +114,10 @@ public interface FinBillApplicationFeign { public ResultBean flowRecord( @ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId, @ApiParam(value = "目前没用")@PathVariable(value = "deployId")String deployId);*/ + @ApiOperation("提交开票申请审批流程") + @PostMapping("/submitBillApplication") + public ResultBean submitBillApplication(@RequestBody @Valid SubmitBillApplicationDto dto); + @ApiOperation(value = "办理（同意）") @PostMapping("/complete") public ResultBean complete(@Valid @RequestBody FinBillCompleteDto query); @@ -147,9 +151,9 @@ public interface FinBillApplicationFeign { public ResultBean> getInvoicedApplyList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-初始化 开票申请/详情") - @GetMapping("/getInvoicedApply/{sid}") + @GetMapping("/getInvoicedApply") @ResponseBody - public ResultBean getInvoicedApply(@PathVariable("sid") String sid); + public ResultBean getInvoicedApply(@SpringQueryMap AppBillApplicationPageInfoQuery query); @ApiOperation("移动端-保存开票申请") @PostMapping("/saveInvoicedApplyInfo") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index ae64c0e854..9ff9c072eb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -81,6 +81,12 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return null; } + @Override + public ResultBean submitBillApplication(SubmitBillApplicationDto dto) { + return null; + } + + @Override public ResultBean complete(FinBillCompleteDto query) { return null; @@ -117,7 +123,7 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign } @Override - public ResultBean getInvoicedApply(String contractSid) { + public ResultBean getInvoicedApply(AppBillApplicationPageInfoQuery query) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitBillApplicationDto.java new file mode 100644 index 0000000000..77420d00a3 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitBillApplicationDto.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SubmitBillApplicationDto extends AppBillApplicationIInfoDto { + private static final long serialVersionUID = -6842441201786563058L; + + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitFinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitFinBillApplicationDto.java index 4f8fac78ec..92d95eaf1a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitFinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/SubmitFinBillApplicationDto.java @@ -13,7 +13,7 @@ import lombok.Data; */ @ApiModel("提交") @Data -public class SubmitFinBillApplicationDto extends FinBillApplicationDto { +public class SubmitFinBillApplicationDto extends AppBillApplicationIInfoDto { private static final long serialVersionUID = 315255996193475787L; /* @ApiModelProperty("业务sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillNodeQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillNodeQuery.java index 5d89639d6f..facd2254dd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillNodeQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillNodeQuery.java @@ -2,6 +2,7 @@ package com.yxt.anrui.fin.api.finbillapplication.flowable; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import javax.validation.constraints.NotBlank; @@ -10,6 +11,7 @@ import javax.validation.constraints.NotBlank; * @Date 2022/9/6 15:04 * @Description */ +@Data public class FinBillNodeQuery implements Query { private static final long serialVersionUID = 9117613683840483366L; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index 613325a59d..7643c77b3d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -66,7 +66,7 @@ public interface FinBillApplicationMapper extends BaseMapper int updateFlowFiled(Map map); - IPage getInvoicedApplyList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getInvoicedApplyList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 43fa096f8c..2b5ed80d84 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -21,9 +21,9 @@