diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index cc2a91527e..9ac4bcae74 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -151,6 +151,8 @@ public class CommonContractRest implements CommonContractFeign { busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + busUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); + busUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto); BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto(); busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); @@ -162,6 +164,8 @@ public class CommonContractRest implements CommonContractFeign { busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + busUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); + busUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto); } return rb.success().setData(commonContract.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java index 200928c2fc..2a63a24744 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java @@ -57,4 +57,8 @@ public class BusCollectionConfirmationQuery implements Query { private String collectionTypeKey; // 收款方式key @ApiModelProperty("认款状态") private String subscriptionState; // 认款状态 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java index 9badb16d55..28d0ae6466 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java @@ -53,6 +53,8 @@ public class BusUncollectedReceivablesDetailedDto implements Dto { private String sid; // 应收未收款项sid @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("合同sid") private String contractSid; // 合同sid @ApiModelProperty("合同编号") 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 a52b45257c..895267b4d3 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 @@ -92,7 +92,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - + qw.eq("useOrgSid", query.getUseOrgSid()); + qw.eq("createBySid",query.getCreateBySid()); if (StringUtils.isNotBlank(query.getCollectionDate())) { qw.eq("collectionDate", query.getCollectionDate()); } @@ -123,18 +124,18 @@ public class BusCollectionConfirmationService extends MybatisBaseService 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){ + if (collectionMoney.compareTo(subscriptionMoney) == 0) { record.setSubscriptionState(3); - }else { + } else { record.setSubscriptionState(2); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java index b8e45c688e..d09f931542 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java @@ -64,7 +64,7 @@ public class BusUncollectedReceivablesDetailedService extends MybatisBaseService // todo: 这里根据具体业务调整查询条件 // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - + qw.ne("currentReceivableMoney",0); if (StringUtils.isNotBlank(query.getContractNo())) { qw.eq("contractNo", query.getContractNo()); }