台账 验收 新增名称字段对应 列表及条件搜索调整

shiyunteng

2025-04-02 7ed65656296a198162b91cdf311c197aebcff0e8

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

@@ -9,10 +9,8 @@
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.entity.DeviceManufacturer;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
import com.by4cloud.platformx.device.dto.PurchaseWinningLetterQueryDTO;
import com.by4cloud.platformx.device.entity.*;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,18 +44,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param purchaseWinningLetter 中标通知书
     * @param queryDTO 中标通知书
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @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.orderByDesc(PurchaseWinningLetterEntity::getCreateTime);
        return R.ok(purchaseWinningLetterService.page(page, wrapper));
    public R getPurchaseWinningLetterPage(@ParameterObject Page page, PurchaseWinningLetterQueryDTO queryDTO) {
        return R.ok(purchaseWinningLetterService.pageNew(page, queryDTO));
    }


@@ -84,7 +78,7 @@
    @PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_add')" )
    public R save(@RequestBody PurchaseWinningLetterEntity purchaseWinningLetter) {
      purchaseWinningLetter.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE));
        return R.ok(purchaseWinningLetterService.save(purchaseWinningLetter));
        return purchaseWinningLetterService.saveNew(purchaseWinningLetter);
    }

    /**
@@ -135,4 +129,13 @@
   public R<List<PurchaseWinningLetterEntity>> getDropdownnList() {
      return R.ok(purchaseWinningLetterService.list());
   }

   /**
    * 根据验收查询设备下拉
    * @return
    */
   @GetMapping("/getDropdownnById/{id}")
   public R<List<Device>> getDropdownnByWinningId(@PathVariable("id")Long id) {
      return R.ok(purchaseWinningLetterService.getDropdownnByWinningId(id));
   }
}