shiyunteng
2025-03-25 51df7aac3c2264151f8dcdb6386f8563ba4483cf
合同及明细 验收单及明细 中标通知书
24个文件已修改
6个文件已添加
316 ■■■■ 已修改文件
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ContractItemQueryDTO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ContractItemPageVo.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ContractItemMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ReceivingNoteItemMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ReceivingNoteMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ContractItemService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ReceivingNoteItemService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ReceivingNoteService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractItemServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteItemServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/resources/mapper/ContractItemMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ContractItemQueryDTO.java
New file
@@ -0,0 +1,15 @@
package com.by4cloud.platformx.device.dto;
import lombok.Data;
@Data
public class ContractItemQueryDTO {
    private Long contractId;
    private Long deviceId;
    private String contractName;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java
New file
@@ -0,0 +1,10 @@
package com.by4cloud.platformx.device.dto;
import lombok.Data;
@Data
public class ReceivingNoteItemQueryDTO {
    private String contractItemName;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
New file
@@ -0,0 +1,10 @@
package com.by4cloud.platformx.device.dto;
import lombok.Data;
@Data
public class ReceivingNoteQueryDTO {
    private String contractName;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java
@@ -33,6 +33,7 @@
    @Schema(description = "名称")
    @Column(columnDefinition="VARCHAR(200) comment '名称'")
    private String name;
    @Schema(description = "编号")
    @Column(columnDefinition="VARCHAR(200) comment '编号'")
    private String number;
@@ -52,24 +53,29 @@
    /**
     * 合同金额
     */
    @Schema(description = "合同金额")
    @Column(columnDefinition="double comment '合同金额'")
    @TableField("`output`")
    private Double output;
    /**
     * 总量
     */
    @Schema(description = "总量")
    @Column(columnDefinition="double comment '总量'")
    private Double countExecutive;
    /**
     * 执行量
     */
    @Schema(description = "执行量")
    @Column(columnDefinition="double comment '执行量'")
    private Double executive;
    /**
     * 合同条款
     */
    @Schema(description = "合同条款")
    @TableField(updateStrategy = FieldStrategy.NOT_NULL)
    @Column(columnDefinition="varchar(500) comment '合同条款'")
    private String content;
@@ -78,10 +84,12 @@
     *
     */
    @TableField(updateStrategy = FieldStrategy.NOT_NULL)
    @Schema(description = "文件名称")
    @Column(columnDefinition="varchar(2000) comment '文件名称'")
    private String fileName;
    @TableField(updateStrategy = FieldStrategy.NOT_NULL)
    @Schema(description = "文件地址")
    @Column(columnDefinition="varchar(2000) comment '文件地址'")
    private String filePath;
@@ -98,10 +106,9 @@
    @Schema(description = "填报时间")
    @Column(columnDefinition = "datetime comment '填报时间'")
    private Date releaseDate;
    @Transient
    @TableField(exist = false)
    private List<ContractItem> contractItemList;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java
@@ -1,7 +1,7 @@
package com.by4cloud.platformx.device.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,15 +17,7 @@
@TableName("purchase_tendr_order")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "招标采购单")
public class PurchaseTendrOrderEntity extends Model<PurchaseTendrOrderEntity> {
    /**
    * id
    */
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description="id")
    private Long id;
public class PurchaseTendrOrderEntity extends BaseModel<PurchaseTendrOrderEntity> {
    /**
    * 采购计划编号
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,15 +19,7 @@
@TableName("purchase_winning_letter")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "中标通知书")
public class PurchaseWinningLetterEntity extends Model<PurchaseWinningLetterEntity> {
    /**
    * id
    */
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description="id")
    private Long id;
public class PurchaseWinningLetterEntity extends BaseModel<PurchaseWinningLetterEntity> {
    /**
    * 中标通知书编码
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -47,9 +48,12 @@
    /**
     * 总金额
     */
    @TableField("`output`")
    @Column(columnDefinition="double comment '总金额'")
    private Double output;
    @Schema(description = "验收单编号")
    @Column(columnDefinition="VARCHAR(32) comment '验收单编号'")
    private String releaseCode;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -39,9 +40,11 @@
    @Schema(description = "数量")
    @Column(columnDefinition="long comment '数量'")
    private Long num;
    /**
     * 验收金额
     */
    @TableField("`output`")
    @Column(columnDefinition="double comment '验收金额'")
    private Double output;
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ContractItemPageVo.java
New file
@@ -0,0 +1,31 @@
package com.by4cloud.platformx.device.entity.vo;
import lombok.Data;
@Data
public class ContractItemPageVo {
    private Long id;
    private Long contractId;
    private Long deviceId;
    private String month;
    private String name;
    private String num;
    private String price;
    private String specification;
    private String unit;
    private String deviceName;
    private String contractName;
    private String amount;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java
New file
@@ -0,0 +1,18 @@
package com.by4cloud.platformx.device.entity.vo;
import lombok.Data;
@Data
public class ReceivingNoteItemPageVo {
    private Long id;
    private String releaseCode;
    private String contractItemName;
    private String num;
    private String output;
}
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
New file
@@ -0,0 +1,18 @@
package com.by4cloud.platformx.device.entity.vo;
import lombok.Data;
@Data
public class ReceivingNotePageVo {
    private Long id;
    private String releaseCompName;
    private String releasePerson;
    private String contractName;
    private String releaseCode;
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -1,8 +1,10 @@
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 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;
@@ -48,6 +50,8 @@
    @PreAuthorize("@pms.hasPermission('platformx_contract_view')" )
    public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
        LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
        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));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractItemController.java
@@ -7,7 +7,10 @@
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.dto.ContractItemQueryDTO;
import com.by4cloud.platformx.device.entity.Contract;
import com.by4cloud.platformx.device.entity.ContractItem;
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.service.ContractItemService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -40,15 +43,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param contractItem 合同明细表
     * @param  合同明细表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('platformx_contractItem_view')" )
    public R getContractItemPage(@ParameterObject Page page, @ParameterObject ContractItem contractItem) {
        LambdaQueryWrapper<ContractItem> wrapper = Wrappers.lambdaQuery();
        return R.ok(contractItemService.page(page, wrapper));
    public R getContractItemPage(Page page,ContractItemQueryDTO queryDTO) {
        return R.ok(contractItemService.pageNew(page, queryDTO));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -3,10 +3,12 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
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.entity.Contract;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
@@ -49,6 +51,8 @@
    @PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_view')" )
    public R getPurchaseTendrOrderPage(@ParameterObject Page page, @ParameterObject PurchaseTendrOrderEntity purchaseTendrOrder) {
        LambdaQueryWrapper<PurchaseTendrOrderEntity> wrapper = Wrappers.lambdaQuery();
        wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
        wrapper.orderBy(true,false, PurchaseTendrOrderEntity::getCreateTime);
        return R.ok(purchaseTendrOrderService.page(page, wrapper));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
@@ -3,10 +3,13 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
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.entity.Contract;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,6 +50,9 @@
    @PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_view')" )
    public R getPurchaseWinningLetterPage(@ParameterObject Page page, @ParameterObject PurchaseWinningLetterEntity purchaseWinningLetter) {
        LambdaQueryWrapper<PurchaseWinningLetterEntity> wrapper = Wrappers.lambdaQuery();
        wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getPurchasePlanCode()), PurchaseWinningLetterEntity::getPurchasePlanCode,purchaseWinningLetter.getPurchasePlanCode());
        wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getWinningCode()), PurchaseWinningLetterEntity::getWinningCode,purchaseWinningLetter.getWinningCode());
        wrapper.orderBy(true,false, PurchaseWinningLetterEntity::getCreateTime);
        return R.ok(purchaseWinningLetterService.page(page, wrapper));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java
@@ -7,6 +7,7 @@
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.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
import com.by4cloud.platformx.device.service.ReceivingNoteService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
 * 验收表
@@ -40,15 +40,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param receivingNote 验收表
     * @param queryDTO 验收表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('device_receivingNote_view')" )
    public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNote receivingNote) {
        LambdaQueryWrapper<ReceivingNote> wrapper = Wrappers.lambdaQuery();
        return R.ok(receivingNoteService.page(page, wrapper));
    public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNoteQueryDTO queryDTO) {
        return R.ok(receivingNoteService.pageNew(page, queryDTO));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteItemController.java
@@ -7,6 +7,7 @@
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.dto.ReceivingNoteItemQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNoteItem;
import com.by4cloud.platformx.device.service.ReceivingNoteItemService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,15 +41,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param receivingNoteItem 验收子项表
     * @param queryDTO 验收子项表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('device_receivingNoteItem_view')" )
    public R getReceivingNoteItemPage(@ParameterObject Page page, @ParameterObject ReceivingNoteItem receivingNoteItem) {
        LambdaQueryWrapper<ReceivingNoteItem> wrapper = Wrappers.lambdaQuery();
        return R.ok(receivingNoteItemService.page(page, wrapper));
    public R getReceivingNoteItemPage(@ParameterObject Page page, @ParameterObject ReceivingNoteItemQueryDTO queryDTO) {
        return R.ok(receivingNoteItemService.pageNew(page, queryDTO));
    }
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ContractItemMapper.java
@@ -1,11 +1,17 @@
package com.by4cloud.platformx.device.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import com.by4cloud.platformx.device.dto.ContractItemQueryDTO;
import com.by4cloud.platformx.device.entity.ContractItem;
import com.by4cloud.platformx.device.entity.vo.ContractItemPageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface ContractItemMapper extends PlatformxBaseMapper<ContractItem> {
    IPage<ContractItemPageVo> pageNew(Page page, @Param("queryDTO") ContractItemQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ReceivingNoteItemMapper.java
@@ -1,11 +1,17 @@
package com.by4cloud.platformx.device.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import com.by4cloud.platformx.device.dto.ReceivingNoteItemQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNoteItem;
import com.by4cloud.platformx.device.entity.vo.ReceivingNoteItemPageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface ReceivingNoteItemMapper extends PlatformxBaseMapper<ReceivingNoteItem> {
    IPage<ReceivingNoteItemPageVo> pageNew(Page page, @Param("queryDTO") ReceivingNoteItemQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/ReceivingNoteMapper.java
@@ -1,11 +1,17 @@
package com.by4cloud.platformx.device.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
import com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface ReceivingNoteMapper extends PlatformxBaseMapper<ReceivingNote> {
    IPage<ReceivingNotePageVo> pageNew(Page page, @Param("queryDTO") ReceivingNoteQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ContractItemService.java
@@ -1,8 +1,12 @@
package com.by4cloud.platformx.device.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.device.dto.ContractItemQueryDTO;
import com.by4cloud.platformx.device.entity.ContractItem;
public interface ContractItemService extends IService<ContractItem> {
    IPage pageNew(Page page, ContractItemQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ReceivingNoteItemService.java
@@ -1,8 +1,12 @@
package com.by4cloud.platformx.device.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.device.dto.ReceivingNoteItemQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNoteItem;
public interface ReceivingNoteItemService extends IService<ReceivingNoteItem> {
    IPage pageNew(Page page, ReceivingNoteItemQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/ReceivingNoteService.java
@@ -1,8 +1,12 @@
package com.by4cloud.platformx.device.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
public interface ReceivingNoteService extends IService<ReceivingNote> {
    IPage pageNew(Page page, ReceivingNoteQueryDTO queryDTO);
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ContractItemServiceImpl.java
@@ -1,9 +1,14 @@
package com.by4cloud.platformx.device.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.dto.ContractItemQueryDTO;
import com.by4cloud.platformx.device.entity.ContractItem;
import com.by4cloud.platformx.device.mapper.ContractItemMapper;
import com.by4cloud.platformx.device.service.ContractItemService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
 * 合同明细表
@@ -12,5 +17,13 @@
 * @date 2025-03-13 10:48:44
 */
@Service
@RequiredArgsConstructor
public class ContractItemServiceImpl extends ServiceImpl<ContractItemMapper, ContractItem> implements ContractItemService {
    private final ContractItemMapper contractItemMapper;
    @Override
    public IPage pageNew(Page page, ContractItemQueryDTO queryDTO) {
        return baseMapper.pageNew(page,queryDTO);
    }
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
@@ -1,7 +1,9 @@
package com.by4cloud.platformx.device.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
import com.by4cloud.platformx.device.mapper.PurchaseTendrOrderMapper;
import com.by4cloud.platformx.device.mapper.PurchaseWinningLetterMapper;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
@@ -25,7 +27,13 @@
    @Override
    public boolean complete(Long id) {
        PurchaseTendrOrderEntity orderEntity = purchaseTendrOrderMapper.selectById(id);
        return false;
        PurchaseWinningLetterEntity entity = BeanUtil.copyProperties(orderEntity, PurchaseWinningLetterEntity.class);
        entity.setWinningPrice(orderEntity.getEstimatePrice());
        entity.setTotalWinningAmount(orderEntity.getTotalPlanndAmount());
        purchaseWinningLetterMapper.insert(entity);
        orderEntity.setStatus("2");
        purchaseTendrOrderMapper.updateById(orderEntity);
        return true;
    }
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteItemServiceImpl.java
@@ -1,6 +1,9 @@
package com.by4cloud.platformx.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.dto.ReceivingNoteItemQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNoteItem;
import com.by4cloud.platformx.device.mapper.ReceivingNoteItemMapper;
import com.by4cloud.platformx.device.service.ReceivingNoteItemService;
@@ -13,4 +16,8 @@
 */
@Service
public class ReceivingNoteItemServiceImpl extends ServiceImpl<ReceivingNoteItemMapper, ReceivingNoteItem> implements ReceivingNoteItemService {
    @Override
    public IPage pageNew(Page page, ReceivingNoteItemQueryDTO queryDTO) {
        return baseMapper.pageNew(page,queryDTO);
    }
}
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java
@@ -1,6 +1,9 @@
package com.by4cloud.platformx.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
import com.by4cloud.platformx.device.mapper.ReceivingNoteMapper;
import com.by4cloud.platformx.device.service.ReceivingNoteService;
@@ -13,4 +16,8 @@
 */
@Service
public class ReceivingNoteServiceImpl extends ServiceImpl<ReceivingNoteMapper, ReceivingNote> implements ReceivingNoteService {
    @Override
    public IPage pageNew(Page page, ReceivingNoteQueryDTO queryDTO) {
        return baseMapper.pageNew(page,queryDTO);
    }
}
platformx-device-biz/src/main/resources/mapper/ContractItemMapper.xml
@@ -21,4 +21,34 @@
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ContractItemPageVo">
        select
            ci.id,
            ci.amount,
            ci.month,
            ci.name,
            ci.num,
            ci.price,
            ci.specification,
            ci.unit,
            ci.contract_id,
            ci.device_id,
            d.name deviceName,
            c.name contractName
        from
            contract_item ci
                join contract c on ci.contract_id = c.id
                join device d on d.id = ci.device_id
        where
            ci.del_flag = '0'
        <if test="queryDTO.deviceId != null">
            and ci.device_id = #{queryDTO.deviceId}
        </if>
        <if test="queryDTO.contractId != null">
            and ci.contract_id = #{queryDTO.contractId}
        </if>
        <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
            and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
        </if>
    </select>
</mapper>
platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
@@ -16,4 +16,21 @@
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNoteItemPageVo">
        select
            rni.id,
            rni.num  ,
            rni.`output` ,
            ci.name contractItemName,
            rn.release_code
        from
            receiving_note_item rni
                join contract_item ci on rni.contract_item_id = ci.id
                join receiving_note rn on rn.id = rni.note_id
        where
            rni.del_flag = '0'
        <if test="queryDTO.contractItemName != null and queryDTO.contractItemName !=''">
            and c.name like CONCAT('%', #{queryDTO.contractItemName}, '%')
        </if>
    </select>
</mapper>
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -18,4 +18,20 @@
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
        select
            rn.id,
            rn.release_comp_name ,
            rn.release_person,
            rn.release_code,
            c.name contractName
        from
            receiving_note rn
                join contract c on rn.contract_id = c.id
        where
            rn.del_flag = '0'
        <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
            and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
        </if>
    </select>
</mapper>