Merge remote-tracking branch 'origin/master'

xuhy

2025-02-28 662729440051f2561f83b795905fcbf50e22b039

Merge remote-tracking branch 'origin/master'

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java

@@ -46,7 +46,7 @@
    /**
     * 获取流水列表
     */
    @PreAuthorize("@ss.hasPermi('system:bankFlow:list')")
    @PreAuthorize("@ss.hasPermi('flow:bank:detail:list')")
    @ApiOperation(value = "获取银行流水列表")
    @PostMapping("/list")
    public R<PageInfo<TBankFlow>> list(@RequestBody TBankFlowQuery query) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java

@@ -60,7 +60,7 @@
    /**
     * 修改轮播图
     */
    @PreAuthorize("@ss.hasPermi('system:banner:update')")
    @PreAuthorize("@ss.hasPermi('system:banner:edit')")
    @Log(title = "轮播图信息-修改轮播图", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改轮播图")
    @PostMapping(value = "/update")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java

@@ -40,7 +40,7 @@
    TBillDetailService tBillDetailService;


    @PreAuthorize("@ss.hasPermi('system:bill:list')")
    @PreAuthorize("@ss.hasPermi('bill:list')")
    @PostMapping("list")
    @ApiOperation("分页查询账单列表")
    public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
@@ -48,7 +48,7 @@
        return R.ok(pageInfo);
    }

    @PreAuthorize("@ss.hasPermi('system:bill:add')")
    @PreAuthorize("@ss.hasPermi('bill:list:addRent')")
    @PostMapping("add")
    @ApiOperation("新增账单")
    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
@@ -71,7 +71,7 @@
    }


    @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
    @PreAuthorize("@ss.hasPermi('bill:list:paid')")
    @ApiOperation("确认线下缴费")
    @PostMapping("checkOfflinePay")
    public R checkOfflinePay(@Validated @RequestBody  OfflinePayCheckDto dto){
@@ -79,7 +79,7 @@
        return R.ok();
    }

    @PreAuthorize("@ss.hasPermi('system:bill:sendSmsByBillIds')")
    @PreAuthorize("@ss.hasPermi('bill:list:sendMsg')")
    @ApiOperation("账单批量发送短信通知")
    @PostMapping("sendSmsByBillIds")
    public R sendSmsByBillIds(@Validated @RequestBody SmsByBillDto dto){
@@ -88,7 +88,7 @@
    }


    @PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
    @PreAuthorize("@ss.hasPermi('bill:list:sendMail')")
    @ApiOperation("账单批量发送邮箱通知")
    @PostMapping("sendMailBatchByBillIds")
    public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
@@ -96,7 +96,7 @@
        return R.ok(failNum);
    }

    @PreAuthorize("@ss.hasPermi('system:bill:cashPay')")
    @PreAuthorize("@ss.hasPermi('bill:list:receipt')")
    @ApiOperation("收款")
    @PostMapping("cashPay")
    public R cashPay(@RequestBody OfflinePayDto offlinePayDto){

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java

@@ -58,7 +58,7 @@
    /**
     * 获取验收记录管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:accept:list')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:list')")
    @ApiOperation(value = "获取验收记录分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TCheckAcceptRecordVO>> pageList(@RequestBody TCheckAcceptRecordQuery query) {
@@ -93,7 +93,7 @@
    /**
     * 添加验收记录管理
     */
    @PreAuthorize("@ss.hasPermi('system:accept:add')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:add')")
    @Log(title = "验收记录信息-新增验收记录", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加验收记录")
    @PostMapping(value = "/add")
@@ -126,7 +126,7 @@
    /**
     * 查看验收记录详情
     */
    @PreAuthorize("@ss.hasPermi('system:accept:detail')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:detail')")
    @ApiOperation(value = "查看验收记录详情")
    @GetMapping(value = "/getDetailById")
    public R<TCheckAcceptRecordVO> getDetailById(@RequestParam String id) {
@@ -143,7 +143,7 @@
    /**
     * 删除验收记录
     */
    @PreAuthorize("@ss.hasPermi('system:accept:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
    @Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除验收记录")
    @DeleteMapping(value = "/deleteById")
@@ -154,7 +154,7 @@
    /**
     * 批量删除验收记录
     */
    @PreAuthorize("@ss.hasPermi('system:accept:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
    @Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除验收记录")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -80,118 +80,17 @@
    private StateProcessTemplateService stateProcessTemplateService;
    @Autowired
    private FlwTaskMapper flwTaskMapper;
    @ApiOperation(value = "测试生成账单")
    @PostMapping(value = "/testBill")
    public R testBill(String id) {
        TContract contract = contractService.getById(id);
        // 查询所有已签订的合同并且未生成第一笔账单的

        List<TBill> bills = new ArrayList<>();
        List<TContractRentType> contractRentTypes = contractRentTypeService.list();
            contract.setFirstPayTime(contract.getStartTime().plusDays(10));
            // 第一次应缴费日期
            LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
            TBill rentBill = new TBill();
            rentBill.setContractId(contract.getId());
            rentBill.setContractNumber(contract.getContractNumber());
            rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
            rentBill.setPayFeesStatus("1");
            rentBill.setBillType("1");
            rentBill.setStartTime(contract.getStartPayTime());
            TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);

            if (tContractRentType!=null && contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(tContractRentType.getChangeTime())){
                // 计算租金变动的天数
                long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L;
                contract.setChangeTime(LocalDateTime.now());
                // 递增递减的租金
                BigDecimal contractRentTypeMoney = new BigDecimal("0");
                // 不递增递减的租金
                BigDecimal originalMoney = new BigDecimal("0");
                // 原租金
                switch (tContractRentType.getIncreasingDecreasingType()){
                    case 1:
                        switch (tContractRentType.getIncreasingDecreasing()){
                            case 1:
                                contractRentTypeMoney =contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
                                contract.setChangeRent(contractRentTypeMoney);
                                break;
                            case 2:
                                contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).divide(new BigDecimal(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12),2,BigDecimal.ROUND_DOWN));
                                contract.setChangeRent(contractRentTypeMoney);
                                break;
                        }
                        break;
                    case 2:
                        switch (tContractRentType.getIncreasingDecreasing()){
                            case 1:
                                contractRentTypeMoney =contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
                                contract.setChangeRent(contractRentTypeMoney);
                                break;
                            case 2:
                                contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
                                contract.setChangeRent(contractRentTypeMoney);

                                break;
                        }
                        break;
                }
                // 不需要涨租金的时间段
                if (contract.getFirstPayTime().isBefore(tContractRentType.getChangeTime())){
                    long originalDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime());
                    originalMoney=originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                            .multiply(new BigDecimal(originalDays));
                    rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
                }else{
                    rentBill.setPayableFeesMoney(contractRentTypeMoney);
                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
                }

                if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
                    rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
                }else{
                    rentBill.setEndTime(contract.getEndTime());
                }
            }else{
                if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
                    rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
                }else{
                    rentBill.setEndTime(contract.getEndTime());
                }
                // 不走递增递减
                long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
                rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());

            }
            // 租金账单
            bills.add(rentBill);
            // 押金账单
            TBill depositBill = new TBill();
            depositBill.setContractId(contract.getId());
            depositBill.setContractNumber(contract.getContractNumber());
            depositBill.setPayableFeesMoney(contract.getDeposit());
            depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());

            depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
            depositBill.setPayFeesStatus("1");
            depositBill.setBillType("2");
        contractService.updateById(contract);
        billService.save(rentBill);
        billService.save(depositBill);
        return R.ok();
    }
    @ApiOperation(value = "获取合同分页列表")
    @PostMapping(value = "/contractList")
    @PreAuthorize("@ss.hasPermi('system:contract:list')")
    @PreAuthorize("@ss.hasPermi('contract:list')")
    public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
        return R.ok(contractService.contractList(query));
    }
    @Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增合同")
    @PostMapping(value = "/addContract")
    @PreAuthorize("@ss.hasPermi('system:contract:add')")
    @PreAuthorize("@ss.hasPermi('contract:list:add')")
    public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
        long count = contractService.count(new LambdaQueryWrapper<TContract>().eq(TContract::getContractNumber, dto.getContractNumber()));
        if (count!=0){
@@ -244,7 +143,7 @@
    @Log(title = "合同管理-编辑合同", businessType =  BusinessType.UPDATE)
    @ApiOperation(value = "编辑合同")
    @PostMapping(value = "/updateContract")
    @PreAuthorize("@ss.hasPermi('system:contract:update')")
    @PreAuthorize("@ss.hasPermi('contract:list:edit')")
    public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
        contractService.updateById(dto);
        contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
@@ -263,8 +162,7 @@
    }
    @Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除合同")
    @PreAuthorize("@ss.hasPermi('system:contract:delete')")

    @PreAuthorize("@ss.hasPermi('contract:list:delete')")
    @DeleteMapping(value = "/deleteContractByIds")
    public R<Boolean> deleteContractByIds(@RequestParam String ids) {
        if (StringUtils.isNotEmpty(ids)){
@@ -275,7 +173,7 @@

    @ApiOperation(value = "查询合同信息信息")
    @GetMapping(value = "/getContractById")
    @PreAuthorize("@ss.hasPermi('system:contract:detail')")
    @PreAuthorize("@ss.hasPermi('contract:list:detail')")
    public R<TContractVO> getContractById(@RequestParam String id) {
        TContractVO res = new TContractVO();
        TContract contract = contractService.getById(id);
@@ -312,7 +210,7 @@
    }
    @Log(title = "合同管理-撤销审批", businessType =  BusinessType.UPDATE)
    @ApiOperation(value = "撤销审批")
    @PreAuthorize("@ss.hasPermi('system:contract:revoke')")
    @PreAuthorize("@ss.hasPermi('contract:list:cancel')")
    @PostMapping(value = "/updateContractStatus")
    public R<Boolean> updateContractStatus(@RequestBody RevokeDTO dto) {
        TContract contract = contractService.getById(dto.getContractId());
@@ -323,7 +221,7 @@

        return R.ok();
    }
    @PreAuthorize("@ss.hasPermi('system:contract:confirm')")
    @PreAuthorize("@ss.hasPermi('contract:list:settlement')")
    @Log(title = "合同管理-确认结算", businessType =  BusinessType.UPDATE)
    @ApiOperation(value = "确认结算")
    @PostMapping(value = "/confirmSettlement")
@@ -336,20 +234,18 @@
    }
    @ApiOperation(value = "终止合同剩余未缴费账单列表")
    @PostMapping(value = "/contractBillList")
    @PreAuthorize("@ss.hasPermi('system:contract:billList')")
    public R<PageInfo<BillVO>> contractBillList(@RequestBody TContractBillQuery query) {
        return R.ok(contractService.contractBillList(query));
    }
    @ApiOperation(value = "终止合同")
    @PostMapping(value = "/terminateContract")
    @PreAuthorize("@ss.hasPermi('system:contract:terminate')")
    @PreAuthorize("@ss.hasPermi('contract:list:break')")
    public R terminateContract(@RequestBody TerminateContractDTO dto) {
        contractService.terminateContract(dto);
        return R.ok();
    }
    @ApiOperation(value = "根据合同id查看验收记录")
    @GetMapping(value = "/getCheckByContractId")
    @PreAuthorize("@ss.hasPermi('system:contract:checkDetail')")
    public R<CheckAcceptRecordVO> getCheckByContractId(String id) {
        return R.ok(contractService.getCheckByContractId(id));
    }
@@ -358,7 +254,7 @@
    @ApiOperation(value = "生成合同附件")
    @PostMapping("/set")
    @Log(title = "生成合同附件", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:contract:set')")
    @PreAuthorize("@ss.hasPermi('contract:list:generate')")
    public R<List<String>> set(@RequestBody SetContractDto dto,HttpServletResponse response){
        List<TContract> list = contractService.lambdaQuery().in(TContract::getId, dto.getIds()).list();
        List<String> res = new ArrayList<>();
@@ -398,7 +294,7 @@
     * 导出
     */
    @ApiOperation(value = "导出")
    @PreAuthorize("@ss.hasPermi('system:contract:export')")
    @PreAuthorize("@ss.hasPermi('contract:list:export')")
    @Log(title = "导出", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void exportOpticalInspection(@RequestBody TContractQuery query)

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java

@@ -51,7 +51,7 @@
    /**
     * 获取部门管理管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:dept:list')")
    @PreAuthorize("@ss.hasPermi('system:department:list')")
    @ApiOperation(value = "获取部门管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<DeptVO>> pageList(@RequestBody TDeptQuery query) {
@@ -61,7 +61,7 @@
    /**
     * 添加部门管理管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:add')")
    @PreAuthorize("@ss.hasPermi('system:department:add')")
    @Log(title = "部门管理信息-新增部门管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加部门管理")
    @PostMapping(value = "/add")
@@ -77,7 +77,7 @@
    /**
     * 修改部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:update')")
    @PreAuthorize("@ss.hasPermi('system:department:edit')")
    @Log(title = "部门管理信息-修改部门管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改部门管理")
    @PostMapping(value = "/update")
@@ -93,7 +93,7 @@
    /**
     * 查看部门管理详情
     */
    @PreAuthorize("@ss.hasPermi('system:dept:detail')")
    @PreAuthorize("@ss.hasPermi('system:department:edit')")
    @ApiOperation(value = "查看部门管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TDept> getDetailById(@RequestParam String id) {
@@ -103,7 +103,7 @@
    /**
     * 删除部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:delete')")
    @PreAuthorize("@ss.hasPermi('system:department:delete')")
    @Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除部门管理")
    @DeleteMapping(value = "/deleteById")
@@ -117,7 +117,7 @@
    /**
     * 批量删除部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:delete')")
    @PreAuthorize("@ss.hasPermi('system:department:delete')")
    @Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除部门管理")
    @DeleteMapping(value = "/deleteByIds")
@@ -131,7 +131,7 @@
    /**
     * 轮播图上下架
     */
    @PreAuthorize("@ss.hasPermi('system:dept:upAndDown')")
    @PreAuthorize("@ss.hasPermi('system:department:open')")
    @ApiOperation(value = "部门管理上下架",notes = "true:上架，false:下架")
    @PostMapping(value = "/upAndDown")
    public R upAndDown(@RequestBody TDeptUpAndDownDTO dto) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java

@@ -76,7 +76,7 @@
    /**
     * 修改故障区域
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:update')")
    @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
    @Log(title = "故障区域信息-修改故障区域", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改故障区域")
    @PostMapping(value = "/update")
@@ -90,7 +90,7 @@
    /**
     * 查看故障区域详情
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:detail')")
    @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
    @ApiOperation(value = "查看故障区域详情")
    @GetMapping(value = "/getDetailById")
    public R<TFaultAreaDic> getDetailById(@RequestParam String id) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java

@@ -41,7 +41,7 @@
    /**
     * 获取故障描述管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:list')")
    @PreAuthorize("@ss.hasPermi('system:tag:list')")
    @ApiOperation(value = "获取故障描述分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TFaultDescribeDicVO>> pageList(@RequestBody TFaultDescribeDicQuery query) {
@@ -51,7 +51,7 @@
    /**
     * 添加故障描述管理
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:add')")
    @PreAuthorize("@ss.hasPermi('system:tag:add')")
    @Log(title = "故障描述信息-新增故障描述", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加故障描述")
    @PostMapping(value = "/add")
@@ -62,7 +62,7 @@
    /**
     * 修改故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:update')")
    @PreAuthorize("@ss.hasPermi('system:tag:edit')")
    @Log(title = "故障描述信息-修改故障描述", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改故障描述")
    @PostMapping(value = "/update")
@@ -73,7 +73,7 @@
    /**
     * 查看故障描述详情
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:detail')")
    @PreAuthorize("@ss.hasPermi('system:tag:edit')")
    @ApiOperation(value = "查看故障描述详情")
    @GetMapping(value = "/getDetailById")
    public R<TFaultDescribeDic> getDetailById(@RequestParam String id) {
@@ -83,7 +83,7 @@
    /**
     * 删除故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:delete')")
    @PreAuthorize("@ss.hasPermi('system:tag:delete')")
    @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除故障描述")
    @DeleteMapping(value = "/deleteById")
@@ -94,7 +94,7 @@
    /**
     * 批量删除故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:delete')")
    @PreAuthorize("@ss.hasPermi('system:tag:delete')")
    @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除故障描述")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java

@@ -41,7 +41,7 @@
    /**
     * 获取报修管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:fault:list')")
    @PreAuthorize("@ss.hasPermi('houseManage:acceptance:list')")
    @ApiOperation(value = "获取报修分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageQuery query) {
@@ -51,7 +51,7 @@
    /**
     * 处理维修
     */
    @PreAuthorize("@ss.hasPermi('system:fault:update')")
    @PreAuthorize("@ss.hasPermi('houseManage:acceptance:dispose')")
    @Log(title = "报修信息-处理维修", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "处理维修")
    @PostMapping(value = "/update")
@@ -63,7 +63,7 @@
    /**
     * 查看报修详情
     */
    @PreAuthorize("@ss.hasPermi('system:fault:detail')")
    @PreAuthorize("@ss.hasPermi('houseManage:acceptance:detail')")
    @ApiOperation(value = "查看报修详情")
    @GetMapping(value = "/getDetailById")
    public R<TFaultRepairMessageVO> getDetailById(@RequestParam String id) {
@@ -74,7 +74,7 @@
    /**
     * 删除报修
     */
    @PreAuthorize("@ss.hasPermi('system:fault:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:acceptance:delete')")
    @Log(title = "报修信息-删除报修", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除报修")
    @DeleteMapping(value = "/deleteById")
@@ -85,7 +85,7 @@
    /**
     * 批量删除报修
     */
    @PreAuthorize("@ss.hasPermi('system:fault:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:acceptance:delete')")
    @Log(title = "报修信息-删除报修", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除报修")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java

@@ -32,7 +32,7 @@
    /**
     * 获取流水列表
     */
    @PreAuthorize("@ss.hasPermi('system:flow:list')")
    @PreAuthorize("@ss.hasPermi('flow:sys:detail:list')")
    @ApiOperation(value = "获取流水列表")
    @PostMapping("/list")
    public R<PageInfo<TFlowManagement>> list(@RequestBody TFlowManagementQuery query) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java

@@ -46,20 +46,20 @@
    @Log(title = "房屋基础信息管理-新增房屋", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增房屋")
    @PostMapping(value = "/addHouse")
    @PreAuthorize("@ss.hasPermi('system:house:add')")
    @PreAuthorize("@ss.hasPermi('house:list:add')")
    public R<Boolean> addHouse(@Validated @RequestBody THouseDTO dto) {
        return R.ok(tHouseService.save(dto));
    }
    @Log(title = "房屋基础信息管理-编辑房屋", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "编辑房屋")
    @PostMapping(value = "/updateHouse")
    @PreAuthorize("@ss.hasPermi('system:house:edit')")
    @PreAuthorize("@ss.hasPermi('house:list:edit')")
    public R<Boolean> updateHouse(@Validated @RequestBody THouseDTO dto) {
        return R.ok(tHouseService.updateById(dto));
    }
    @ApiOperation(value = "查询房屋信息")
    @GetMapping(value = "/getHouseById")
    @PreAuthorize("@ss.hasPermi('system:house:detail')")
    @PreAuthorize("@ss.hasPermi('house:list:detail')")
    public R<THouse> getHouseById(@RequestParam String id) {
        THouse tHouse = tHouseService.getById(id);
        tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
@@ -69,21 +69,20 @@
    @Log(title = "房屋基础信息管理-删除房屋", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除房屋")
    @DeleteMapping(value = "/deleteHouseById")
    @PreAuthorize("@ss.hasPermi('system:house:delete')")
    @PreAuthorize("@ss.hasPermi('house:list:delete')")

    public R<Boolean> deleteHouseById(@RequestParam String id) {
        return R.ok(tHouseService.removeById(id));
    }
    @ApiOperation(value = "获取房屋分页列表")
    @PostMapping(value = "/houseList")
    @PreAuthorize("@ss.hasPermi('system:house:list')")
    @PreAuthorize("@ss.hasPermi('house:list')")

    public R<PageInfo<THouse>> houseList(@RequestBody THouseQuery query) {
        return R.ok(tHouseService.houseList(query));
    }
    @ApiOperation(value = "历史租户列表")
    @PostMapping(value = "/userHistoryList")
    @PreAuthorize("@ss.hasPermi('system:house:historyList')")
    public R<PageInfo<HouseVO>> userHistoryList(@RequestBody TUserHistoryQuery query) {
        return R.ok(tHouseService.userHistoryList(query));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java

@@ -39,7 +39,7 @@
    /**
     * 获取资讯管理管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:information:list')")
    @PreAuthorize("@ss.hasPermi('dynamic:list')")
    @ApiOperation(value = "获取资讯管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TInformation>> pageList(@RequestBody TInformationQuery query) {
@@ -49,7 +49,7 @@
    /**
     * 添加资讯管理管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:add')")
    @PreAuthorize("@ss.hasPermi('dynamic:list:add')")
    @Log(title = "资讯管理信息-新增资讯管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加资讯管理")
    @PostMapping(value = "/add")
@@ -60,7 +60,7 @@
    /**
     * 修改资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:update')")
    @PreAuthorize("@ss.hasPermi('dynamic:list:edit')")
    @Log(title = "资讯管理信息-修改资讯管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改资讯管理")
    @PostMapping(value = "/update")
@@ -71,7 +71,7 @@
    /**
     * 查看资讯管理详情
     */
    @PreAuthorize("@ss.hasPermi('system:information:detail')")
    @PreAuthorize("@ss.hasPermi('dynamic:list:detail')")
    @ApiOperation(value = "查看资讯管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TInformation> getDetailById(@RequestParam String id) {
@@ -81,7 +81,7 @@
    /**
     * 删除资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:delete')")
    @PreAuthorize("@ss.hasPermi('dynamic:list:delete')")
    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除资讯管理")
    @DeleteMapping(value = "/deleteById")
@@ -92,7 +92,7 @@
    /**
     * 批量删除资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:delete')")
    @PreAuthorize("@ss.hasPermi('dynamic:list:delete')")
    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除资讯管理")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java

@@ -31,14 +31,14 @@
    private TInvoiceService invoiceService;
    @Autowired
    TBillService tBillService;
    @PreAuthorize("@ss.hasPermi('system:invoice:list')")
    @PreAuthorize("@ss.hasPermi('invoice:list')")
    @ApiOperation(value = "获取开票列表")
    @PostMapping("/list")
    public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
        return R.ok(invoiceService.pageList(query));
    }

    @PreAuthorize("@ss.hasPermi('system:invoice:delete')")
    @PreAuthorize("@ss.hasPermi('invoice:list:del')")
    @Log(title = "开票信息-删除开票", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除开票")
    @DeleteMapping(value = "/deleteById")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java

@@ -40,7 +40,7 @@
    /**
     * 获取维修物品管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:item:list')")
    @PreAuthorize("@ss.hasPermi('houseManage:list:list')")
    @ApiOperation(value = "获取维修物品分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TItemVO>> pageList(@RequestBody TItemQuery query) {
@@ -50,7 +50,7 @@
    /**
     * 添加维修物品管理
     */
    @PreAuthorize("@ss.hasPermi('system:item:add')")
    @PreAuthorize("@ss.hasPermi('houseManage:list:add')")
    @Log(title = "维修物品信息-新增维修物品", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加维修物品")
    @PostMapping(value = "/add")
@@ -61,7 +61,7 @@
    /**
     * 修改维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:update')")
    @PreAuthorize("@ss.hasPermi('houseManage:list:edit')")
    @Log(title = "维修物品信息-修改维修物品", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改维修物品")
    @PostMapping(value = "/update")
@@ -82,7 +82,7 @@
    /**
     * 删除维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:list:delete')")
    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除维修物品")
    @DeleteMapping(value = "/deleteById")
@@ -93,7 +93,7 @@
    /**
     * 批量删除维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:list:delete')")
    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除维修物品")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java

@@ -44,7 +44,7 @@
    /**
     * 获取维修物品分类管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:list')")
    @PreAuthorize("@ss.hasPermi('houseManage:class_list')")
    @ApiOperation(value = "获取维修物品分类分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TItemType>> pageList(@RequestBody TItemTypeQuery query) {
@@ -63,7 +63,7 @@
    /**
     * 添加维修物品分类管理
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:add')")
    @PreAuthorize("@ss.hasPermi('houseManage:class:add')")
    @Log(title = "维修物品分类信息-新增维修物品分类", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加维修物品分类")
    @PostMapping(value = "/add")
@@ -77,7 +77,7 @@
    /**
     * 修改维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:update')")
    @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
    @Log(title = "维修物品分类信息-修改维修物品分类", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改维修物品分类")
    @PostMapping(value = "/update")
@@ -91,7 +91,7 @@
    /**
     * 查看维修物品分类详情
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:detail')")
    @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
    @ApiOperation(value = "查看维修物品分类详情")
    @GetMapping(value = "/getDetailById")
    public R<TItemType> getDetailById(@RequestParam String id) {
@@ -101,7 +101,7 @@
    /**
     * 删除维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除维修物品分类")
    @DeleteMapping(value = "/deleteById")
@@ -116,7 +116,7 @@
    /**
     * 批量删除维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除维修物品分类")
    @DeleteMapping(value = "/deleteByIds")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java

@@ -44,7 +44,7 @@
    /**
     * 系统公共参数设置详情
     */
    @PreAuthorize("@ss.hasPermi('system:config:detail')")
    @PreAuthorize("@ss.hasPermi('system:commonParameter')")
    @ApiOperation(value = "查看系统公共参数设置详情")
    @GetMapping(value = "/getDetailById")
    public R<TSysConfig> getDetailById() {
@@ -54,7 +54,7 @@
    /**
     * 修改系统公共参数设置
     */
    @PreAuthorize("@ss.hasPermi('system:config:update')")
    @PreAuthorize("@ss.hasPermi('system:commonParameter:save')")
    @Log(title = "租户信息-修改系统公共参数设置", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改系统公共参数设置")
    @PostMapping(value = "/update")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java

@@ -58,7 +58,7 @@
    /**
     * 获取租户管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
    @PreAuthorize("@ss.hasPermi('tenant:list')")
    @ApiOperation(value = "获取租户分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TenantVO>> pageList(@RequestBody TTenantQuery query) {
@@ -68,7 +68,7 @@
    /**
     * 添加租户管理
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
    @PreAuthorize("@ss.hasPermi('tenant:list:add')")
    @Log(title = "租户信息-新增租户", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加租户")
    @PostMapping(value = "/add")
@@ -84,7 +84,7 @@
    /**
     * 修改租户
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:update')")
    @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
    @Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改租户")
    @PostMapping(value = "/update")
@@ -102,7 +102,7 @@
    /**
     * 查看租户详情
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:detail')")
    @PreAuthorize("@ss.hasPermi('tenant:list:detail')")
    @ApiOperation(value = "查看租户详情")
    @GetMapping(value = "/getDetailById")
    public R<TTenant> getDetailById(@RequestParam String id) {
@@ -112,7 +112,6 @@
        return R.ok(tenant);
    }

    @PreAuthorize("@ss.hasPermi('system:contract:list')")
    @ApiOperation(value = "获取合同分页列表")
    @GetMapping(value = "/contractListByTenantId")
    public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
@@ -122,7 +121,7 @@
    /**
     * 删除租户
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
    @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
    @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除租户")
    @DeleteMapping(value = "/deleteById")
@@ -133,7 +132,7 @@
    /**
     * 批量删除租户
     */
    @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
    @PreAuthorize("@ss.hasPermi('tenant:list:edit')")
    @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除租户")
    @DeleteMapping(value = "/deleteByIds")
@@ -145,7 +144,6 @@
     * 导出
     */
    @ApiOperation(value = "导出")
    @PreAuthorize("@ss.hasPermi('system:contract:export')")
    @Log(title = "导出", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void exportOpticalInspection(@Validated @RequestBody TContractQuery query)