分页查询更改

zhangmei

2025-02-28 1fe1ac0e09132e0147e48007986be235e4130aa1

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

@@ -190,6 +190,22 @@
    public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
        dto.setChangeRent(dto.getMonthRent());
        contractService.save(dto);
        if (dto.getStatus().equals("2")){
            //发起合同新增审批
            ProcessStartBO processStartBO = new ProcessStartBO();
            processStartBO.setCategory(ProcessCategoryEnum.CATEGORY1.getValue().toString());
            processStartBO.setModuleName("合同新增审批");
            processStartBO.setName(dto.getContractName());
            //需要显示发起申请人所在单位
//            String cedName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
//            String remark = String.format("【镇/街】:%s,【征收实施单位】:%s,【申请金额】:%s万元", stateProject.getStreet(), cedName, stateApplyRecord.getAmount());
            processStartBO.setRemark("");
            Map<String, Object> variable = new HashMap<>();
            variable.put("projectId", dto.getId());
            processStartBO.setVariable(variable);
            //开启工作流程
            stateProcessTemplateService.start(processStartBO);
        }
        if (dto.getIsIncreasing()){
            TContractRentType tContractRentType = new TContractRentType();
            tContractRentType.setContractId(dto.getId());
@@ -199,23 +215,6 @@
            tContractRentType.setChangeTime(dto.getChangeTime());
            tContractRentType.setCycleTime(dto.getCycleTime());
            contractRentTypeService.save(tContractRentType);

            if (dto.getStatus().equals("2")){
                //发起合同新增审批
                ProcessStartBO processStartBO = new ProcessStartBO();
                processStartBO.setCategory(ProcessCategoryEnum.CATEGORY1.getValue().toString());
                processStartBO.setModuleName("合同新增审批");
                processStartBO.setName(dto.getContractName());
                //需要显示发起申请人所在单位
//            String cedName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
//            String remark = String.format("【镇/街】:%s,【征收实施单位】:%s,【申请金额】:%s万元", stateProject.getStreet(), cedName, stateApplyRecord.getAmount());
                processStartBO.setRemark("");
                Map<String, Object> variable = new HashMap<>();
                variable.put("projectId", dto.getId());
                processStartBO.setVariable(variable);
                //开启工作流程
                stateProcessTemplateService.start(processStartBO);
            }
        }
        return R.ok();
    }