开发更新

jiangping

2024-12-05 43aa7504b0faa390ae778e6c56d8c4a42e5154ac

开发更新

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: test
    active: dev
  application:
    name: system_gateway
  # 安全配置

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java

@@ -103,6 +103,12 @@
    public ApiResponse<List<YwContract>> list (@RequestBody YwContract model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywContractService.findList(model));
    }
    @ApiOperation("列表")
    @PostMapping("/findForBills")
    @CloudRequiredPermission("business:ywcontract:query")
    public ApiResponse<YwContract> findForBills (@RequestBody YwContract model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywContractService.findForBills(model));
    }


    @ApiOperation("导出Excel")

 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: test
    active: dev
  application:
    name: visitsAdmin
    # 安全配置

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java

@@ -65,7 +65,7 @@
     * @return YwContract
     */
    YwContract findById(Integer id);

    YwContract findForBills(YwContract model);
    /**
     * 条件查询单条记录
     *

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -1228,6 +1228,17 @@
                            ,Constants.YwLogType.CONTRACT_UPDATE.getKey())
                    .orderByAsc(YwWorkorderLog::getCreateDate)));

            queryBillListByModel(model,new Date());
        }
        return model;
    }
    @Override
    public YwContract findForBills(YwContract model) {
        queryBillListByModel(model,model.getBtDate());
        return model;

    }
    private void queryBillListByModel(YwContract model,Date date) {
            //查询账单集合
            model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
                            .selectAll(YwContractBill.class )
@@ -1239,10 +1250,9 @@
            for (YwContractBill ywContractBill:model.getBillList()) {
                ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee()));
            }

            model.setCanBackRentBills(new ArrayList<>());
            long nowStart = Utils.Date.getStart(new Date()).getTime();
            long nowEnd = Utils.Date.getEnd(new Date()).getTime();
        long nowStart = Utils.Date.getStart(date).getTime();
        long nowEnd = Utils.Date.getEnd(date).getTime();
            if(model.getBillList()!=null && model.getBillList().size()>0){
                for(YwContractBill bill: model.getBillList()){
                    //付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭
@@ -1265,10 +1275,6 @@
                    }
                }
            }

        }

        return model;
    }

    @Override