fix: 计划合并提交

kongdeqiang

2025-03-27 6f9623981926d78ce8ccd80bce55ad631bd2c76b

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java

@@ -1,14 +1,19 @@
package com.by4cloud.platformx.device.controller;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Contract;
import com.by4cloud.platformx.device.service.ContractService;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -36,6 +41,7 @@
public class ContractController {

    private final ContractService contractService;
   private final JcMaxSizeService maxSizeService;

    /**
     * 分页查询
@@ -48,6 +54,9 @@
    @PreAuthorize("@pms.hasPermission('platformx_contract_view')" )
    public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
        LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
      wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType());
      wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName());
      wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber());
        return R.ok(contractService.page(page, wrapper));
    }

@@ -74,6 +83,7 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('platformx_contract_add')" )
    public R save(@RequestBody Contract contract) {
      contract.setNumber(maxSizeService.nextNo(MaxSizeContant.CONTRACT_NUM));
        return R.ok(contractService.save(contract));
    }