diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java index 24e0dab6c8..8c299d7763 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java @@ -60,7 +60,7 @@ public interface BusCollectionConfirmationFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("新增保存") + @ApiOperation("提交新增保存") @PostMapping("/save") public ResultBean save(@RequestBody BusCollectionConfirmationDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java index f3b3ee81f7..65eaf817e0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java @@ -55,8 +55,8 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf } @Override - public ResultBean saveOrUpdate(BusCollectionConfirmationDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/saveOrUpdate无法访问"); + public ResultBean save(BusCollectionConfirmationDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/save无法访问"); } @Override diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java index b313ff3f70..2fecfbac2e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java @@ -67,4 +67,6 @@ public class BusCollectionConfirmationVo implements Vo { private String remarks; // 备注 @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") private Integer auditState; // 审核状态 + @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）") + private Integer subscriptionState; // 审核状态 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java index b489ed70e1..a81bf69307 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; @@ -46,217 +47,37 @@ import java.math.BigDecimal; * @since 1.0 */ @ApiModel(value = "已选应收款项明细表", description = "已选应收款项明细表") +@Data @TableName("bus_selected_receivables_detailed") public class BusSelectedReceivablesDetailed extends BaseEntity { private static final long serialVersionUID = 1L; - @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 VIN; // 车架号 - @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - @ApiModelProperty("应收项目名称") private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") private BigDecimal currentReceivableMoney; // 当前应收金额 - @ApiModelProperty("认款金额") private BigDecimal subscriptionMoney; // 认款金额 - @ApiModelProperty("认款申请日期") private String subscriptionDate; // 认款申请日期 - @ApiModelProperty("收款确认单sid") private String collSid; // 收款确认单sid - - /** - * @return 创建人接口 - */ - public String getCreateByName(){ - return createByName; - } - - /** - * @param createByName 创建人接口 to set - */ - public void setCreateByName(String createByName){ - this.createByName = createByName; - } - /** - * @return 合同sid - */ - public String getContractSid(){ - return contractSid; - } - - /** - * @param contractSid 合同sid to set - */ - public void setContractSid(String contractSid){ - this.contractSid = contractSid; - } - /** - * @return 合同编号 - */ - public String getContractNo(){ - return contractNo; - } - - /** - * @param contractNo 合同编号 to set - */ - public void setContractNo(String contractNo){ - this.contractNo = contractNo; - } - /** - * @return 客户sid - */ - public String getCustomerSid(){ - return customerSid; - } - - /** - * @param customerSid 客户sid to set - */ - public void setCustomerSid(String customerSid){ - this.customerSid = customerSid; - } - /** - * @return 客户名称 - */ - public String getCustomerName(){ - return customerName; - } - - /** - * @param customerName 客户名称 to set - */ - public void setCustomerName(String customerName){ - this.customerName = customerName; - } - /** - * @return 车架号 - */ - public String getVIN(){ - return VIN; - } - - /** - * @param VIN 车架号 to set - */ - public void setVIN(String VIN){ - this.VIN = VIN; - } - /** - * @return 分公司sid - */ - public String getUseOrgSid(){ - return useOrgSid; - } - - /** - * @param useOrgSid 分公司sid to set - */ - public void setUseOrgSid(String useOrgSid){ - this.useOrgSid = useOrgSid; - } - /** - * @return 联系电话 - */ - public String getCustomerPhone(){ - return customerPhone; - } - - /** - * @param customerPhone 联系电话 to set - */ - public void setCustomerPhone(String customerPhone){ - this.customerPhone = customerPhone; - } - /** - * @return 应收项目名称 - */ - public String getReceivablesName(){ - return receivablesName; - } - - /** - * @param receivablesName 应收项目名称 to set - */ - public void setReceivablesName(String receivablesName){ - this.receivablesName = receivablesName; - } - /** - * @return 当前应收金额 - */ - public BigDecimal getCurrentReceivableMoney(){ - return currentReceivableMoney; - } - - /** - * @param currentReceivableMoney 当前应收金额 to set - */ - public void setCurrentReceivableMoney(BigDecimal currentReceivableMoney){ - this.currentReceivableMoney = currentReceivableMoney; - } - /** - * @return 认款金额 - */ - public BigDecimal getSubscriptionMoney(){ - return subscriptionMoney; - } - - /** - * @param subscriptionMoney 认款金额 to set - */ - public void setSubscriptionMoney(BigDecimal subscriptionMoney){ - this.subscriptionMoney = subscriptionMoney; - } - /** - * @return 认款申请日期 - */ - public String getSubscriptionDate(){ - return subscriptionDate; - } - - /** - * @param subscriptionDate 认款申请日期 to set - */ - public void setSubscriptionDate(String subscriptionDate){ - this.subscriptionDate = subscriptionDate; - } - /** - * @return 收款确认单sid - */ - public String getCollSid(){ - return collSid; - } - - /** - * @param collSid 收款确认单sid to set - */ - public void setCollSid(String collSid){ - this.collSid = collSid; - } + @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") + private Integer auditState; // 审核状态 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java index b61f4969fe..d4558f71c4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java @@ -63,9 +63,4 @@ public interface BusSelectedReceivablesDetailedFeign { @ApiOperation("修改保存") @PostMapping("/update/{sid}") public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); - - @ApiOperation("根据车架号和应收款项名称移除数据") - @DeleteMapping("/delByVinAndRecName") - public ResultBean delByVinAndRecName(@RequestParam("vin") String vin,@RequestParam("receivablesName") String receivablesName); - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java index e92122366a..9ebfea312e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java @@ -88,4 +88,7 @@ public class BusSelectedReceivablesDetailedVo implements Vo { @ApiModelProperty("收款确认单sid") private String collSid; // 收款确认单sid + + @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") + private Integer auditState; // 审核状态 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java index 53623f1f2c..8381601936 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java @@ -71,7 +71,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF } @Override - @ApiOperation("新增保存") + @ApiOperation("提交新增保存") @PostMapping("/save") public ResultBean save(@RequestBody BusCollectionConfirmationDto dto) { return busCollectionConfirmationService.saveAllDto(dto); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index 4bc744b932..a52b45257c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -113,6 +113,32 @@ public class BusCollectionConfirmationService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (BusCollectionConfirmationVo record : records) { + String s = ""; + BigDecimal subscriptionMoney = null; + String sid = record.getSid(); + List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); + for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { + Integer auditState = busSelectedReceivablesDetailedVo.getAuditState(); + s += auditState + ","; + } + if (!s.contains("3")){ + record.setSubscriptionState(1); + }else if (s.contains("3")){ + List busSelectedReceivablesDetailedVos1 = busSelectedReceivablesDetailedService.fetchByAuditState(); + for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos1) { + BigDecimal subscriptionMoney1 = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); + subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); + } + BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney()); + if (collectionMoney.compareTo(subscriptionMoney) == 0){ + record.setSubscriptionState(3); + }else { + record.setSubscriptionState(2); + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -125,7 +151,6 @@ public class BusCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); String sid1 = busCollectionConfirmation.getSid(); - String sid = dto.getSid(); BeanUtil.copyProperties(dto, busCollectionConfirmation); busCollectionConfirmation.setSid(sid1); String payFilePath = ""; @@ -193,6 +218,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - void delByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + @Select("select * from bus_selected_receivables_detailed where auditState = #{auditState}") + List fetchByAuditState(int auditState); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml index f70c894a3b..316e92bdce 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml @@ -23,12 +23,4 @@ - - - DELETE - FROM - bus_selected_receivables_detailed - WHERE VIN = #{vin} - AND receivablesName = #{receivablesName} - \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java index 99a639f017..fd941a5b0f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java @@ -78,11 +78,4 @@ public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivable busSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid); return rb.success(); } - - @Override - public ResultBean delByVinAndRecName(String vin, String receivablesName) { - ResultBean rb = ResultBean.fireFail(); - busSelectedReceivablesDetailedService.delByVinAndRecName(vin,receivablesName); - return rb.success(); - } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java index 9c25eff730..12af5261e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java @@ -183,7 +183,8 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService fetchByAuditState() { + int auditState = 3; + return baseMapper.fetchByAuditState(auditState); } } \ No newline at end of file