Merge remote-tracking branch 'origin/master'

kongdeqiang

2025-04-02 adf58ddc0337678c2a6770fe8687e54a44998c0d

Merge remote-tracking branch 'origin/master'

 platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java

@@ -6,6 +6,9 @@
@Data
public class ReceivingNoteQueryDTO {

    @Schema(description = "验收单名称")
    private String noteName;

    @Schema(description = "验收单编号")
    private String releaseCode;


 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java

@@ -11,6 +11,11 @@
    private Long id;

    /**
     * 验收单名称
     */
    private String noteName;

    /**
     * 合同 名称
     */
    private String contractName;

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

@@ -52,8 +52,9 @@
    @PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_view')" )
    public R getDeviceLeasingLedgerPage(@ParameterObject Page page, @ParameterObject DeviceLeasingLedger deviceLeasingLedger) {
        LambdaQueryWrapper<DeviceLeasingLedger> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
        wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
        wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerName()),DeviceLeasingLedger::getLedgerName,deviceLeasingLedger.getLedgerName());
        wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
        wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
        wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime);
        return R.ok(deviceLeasingLedgerService.page(page, wrapper));
    }

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

@@ -123,8 +123,8 @@
     * 获取下拉列表
     * @return
     */
    @GetMapping("/getDropdownnList")
    public R<List<DeviceTechnicalAgreemnt>> getDropdownnList() {
        return R.ok(deviceTechnicalAgreementService.list());
    @GetMapping("/getDropdownnList/{deviceId}")
    public R<List<DeviceTechnicalAgreemnt>> getDropdownnList(@PathVariable("deviceId")Long deviceId) {
        return R.ok(deviceTechnicalAgreementService.getDropdownnList(deviceId));
    }
}

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.java

@@ -9,9 +9,12 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface DeviceTechnicalAgreementMapper extends PlatformxBaseMapper<DeviceTechnicalAgreemnt> {


    IPage<DeviceTechnicalAgreementPageVo> page(Page page, @Param("queryDTO") DeviceTechnicalAgreemntQueryDTO queryDTO);

}

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java

@@ -6,7 +6,11 @@
import com.by4cloud.platformx.device.dto.DeviceTechnicalAgreemntQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceTechnicalAgreemnt;

import java.util.List;

public interface DeviceTechnicalAgreementService extends IService<DeviceTechnicalAgreemnt> {

    IPage pageNew(Page page, DeviceTechnicalAgreemntQueryDTO queryDTO);

    List<DeviceTechnicalAgreemnt> getDropdownnList(Long deviceId);
}

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java

@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,9 @@
import com.by4cloud.platformx.device.mapper.DeviceTechnicalAgreementMapper;
import com.by4cloud.platformx.device.service.DeviceTechnicalAgreementService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 设备技术协议
 *
@@ -20,4 +24,12 @@
    public IPage pageNew(Page page, DeviceTechnicalAgreemntQueryDTO queryDTO) {
        return baseMapper.page(page,queryDTO);
    }

    @Override
    public List<DeviceTechnicalAgreemnt> getDropdownnList(Long deviceId) {
        QueryWrapper<DeviceTechnicalAgreemnt> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_id",deviceId);
        List<DeviceTechnicalAgreemnt> list = baseMapper.selectList(queryWrapper);
        return list;
    }
}

 platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml

@@ -21,6 +21,7 @@
    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
        select
            rn.id,
            rn.note_name,
            rn.resource_type ,
            rn.release_date ,
            rn.release_code,
@@ -40,6 +41,9 @@
        <if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
            and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
        </if>
        <if test="queryDTO.noteName != null and queryDTO.noteName !=''">
            and rn.note_name like CONCAT('%', #{queryDTO.noteName}, '%')
        </if>
        <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
            and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
        </if>