From d9d8b1eb440d455252e9859b2294b8a55366baba Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 10:48:29 +0800
Subject: [PATCH] 招标 中标 台账 验收 新增名称字段对应表单列表调整
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java | 71 ++++++-------
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/PurchaseWinningLetterMapper.java | 6 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java | 42 ++++++--
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/PurchaseWinningLetterPageVo.java | 30 ++++++
platformx-device-biz/src/main/resources/mapper/PurchaseWinningLetterMapper.xml | 31 ++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java | 7 +
platformx-device-biz/src/main/resources/mapper/DeviceMapper.xml | 17 +++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceMapper.java | 2
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 25 ++--
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java | 10 ++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java | 24 ++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 1
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java | 7 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/PurchaseWinningLetterQueryDTO.java | 14 ++
14 files changed, 226 insertions(+), 61 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/PurchaseWinningLetterQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/PurchaseWinningLetterQueryDTO.java
new file mode 100644
index 0000000..2da2b75
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/PurchaseWinningLetterQueryDTO.java
@@ -0,0 +1,14 @@
+package com.by4cloud.platformx.device.dto;
+
+import lombok.Data;
+
+@Data
+public class PurchaseWinningLetterQueryDTO {
+
+ private String winningName;
+
+ private String orderName;
+
+ private String winningCode;
+
+}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
index cb36b9a..5c75834 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java
@@ -103,4 +103,11 @@
@Schema(description = "鍚堝悓id")
@Column(columnDefinition="bigint comment '鍚堝悓id'")
private Long contractId;
+
+ /**
+ * 鍙拌处鍚嶇О
+ */
+ @Schema(description = "鍙拌处鍚嶇О")
+ @Column(columnDefinition="VARCHAR(256) comment '鍙拌处鍚嶇О'")
+ private String ledgerName;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java
index 2c66fcd..e763eab 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java
@@ -5,6 +5,11 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Table;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -14,116 +19,108 @@
* @date 2025-03-24 15:45:03
*/
@Data
+@Entity
@TableName("purchase_tendr_order")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "鎷涙爣閲囪喘鍗�")
+@javax.persistence.Table(name = "purchase_tendr_order")
+@Table(appliesTo = "purchase_tendr_order", comment = "鎷涙爣閲囪喘鍗�")
public class PurchaseTendrOrderEntity extends BaseModel<PurchaseTendrOrderEntity> {
/**
* 閲囪喘璁″垝缂栧彿
*/
@Schema(description="閲囪喘璁″垝缂栧彿")
+ @Column(columnDefinition="varchar(100) comment '閲囪喘璁″垝缂栧彿'")
private String purchasePlanCode;
/**
* 璁惧缂栫爜
*/
@Schema(description="璁惧缂栫爜")
+ @Column(columnDefinition="varchar(256) comment '璁惧缂栫爜'")
private String deviceCode;
/**
* 璁惧鍚嶇О
*/
@Schema(description="璁惧鍚嶇О")
+ @Column(columnDefinition="varchar(256) comment '璁惧鍚嶇О'")
private String deviceName;
/**
* 瑙勬牸鍨嬪彿
*/
@Schema(description="瑙勬牸鍨嬪彿")
+ @Column(columnDefinition="varchar(256) comment '瑙勬牸鍨嬪彿'")
private String deviceModels;
/**
* 鍏抽敭鍙傛暟
*/
@Schema(description="鍏抽敭鍙傛暟")
+ @Column(columnDefinition="varchar(256) comment '鍏抽敭鍙傛暟'")
private String keyParameter;
/**
* 鍒拌揣鏈堜唤
*/
@Schema(description="鍒拌揣鏈堜唤")
+ @Column(columnDefinition="int comment '鍒拌揣鏈堜唤'")
private Integer arrivalMonth;
/**
* 鏁伴噺
*/
@Schema(description="鏁伴噺")
+ @Column(columnDefinition="int comment '鏁伴噺'")
private Integer quantity;
/**
- * 鍗曚綅
+ * 璁￠噺鍗曚綅
*/
- @Schema(description="鍗曚綅")
+ @Schema(description="璁￠噺鍗曚綅")
+ @Column(columnDefinition="varchar(20) comment '璁￠噺鍗曚綅'")
private String unit;
/**
* 棰勪及鍗曚环 /鍒�
*/
@Schema(description="棰勪及鍗曚环 /鍒�")
- private Integer estimatePrice;
+ @Column(columnDefinition="decimal(10,2) comment '棰勪及鍗曚环'")
+ private BigDecimal estimatePrice;
/**
* 璁″垝鎬婚 /鍒�
*/
@Schema(description="璁″垝鎬婚 /鍒�")
- private Integer totalPlanndAmount;
+ @Column(columnDefinition="decimal(10,2) comment '璁″垝鎬婚'")
+ private BigDecimal totalPlanndAmount;
/**
* 鎷熶娇鐢ㄥ湴鐐�
*/
@Schema(description="鎷熶娇鐢ㄥ湴鐐�")
+ @Column(columnDefinition="varchar(256) comment '鎷熶娇鐢ㄥ湴鐐�'")
private String locationUsed;
/**
* 鐘舵��
*/
@Schema(description="鐘舵��")
+ @Column(columnDefinition="varchar(32) comment '鐘舵��'")
private String status;
/**
- * 鐢宠浜�
- */
- @TableField(fill = FieldFill.INSERT)
- @Schema(description="鐢宠浜�")
- private String createBy;
+ * 鎷涙爣閲囪喘璁″垝鍚嶇О
+ */
+ @Schema(description="鎷涙爣閲囪喘璁″垝鍚嶇О")
+ @Column(columnDefinition="varchar(256) comment '鎷涙爣閲囪喘璁″垝鍚嶇О'")
+ private String orderName;
/**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @Schema(description="鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
+ * 璁惧ID
+ */
+ @Schema(description="璁惧ID")
+ @Column(columnDefinition="bigint comment '璁惧ID'")
+ private Long deviceId;
- /**
- * 淇敼浜�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @Schema(description="淇敼浜�")
- private String updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @Schema(description="淇敼鏃堕棿")
- private LocalDateTime updateTime;
-
- /**
- * delFlag
- */
- @TableLogic
- @TableField(fill = FieldFill.INSERT)
- @Schema(description="delFlag")
- private String delFlag;
}
\ No newline at end of file
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java
index 5482de7..be8a98b 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java
@@ -10,6 +10,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -89,18 +90,18 @@
private String unit;
/**
- * 涓爣鍗曚环 /鍒�
+ * 涓爣鍗曚环
*/
- @Schema(description="涓爣鍗曚环 /鍒�")
- @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鍗曚环 /鍒�'")
- private Integer winningPrice;
+ @Schema(description="涓爣鍗曚环")
+ @Column(columnDefinition="DECIMAL(10,2) comment '涓爣鍗曚环'")
+ private BigDecimal winningPrice;
/**
- * 涓爣鎬婚 /鍒�
+ * 涓爣鎬婚
*/
- @Schema(description="涓爣鎬婚 /鍒�")
- @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鎬婚 /鍒�'")
- private Integer totalWinningAmount;
+ @Schema(description="涓爣鎬婚")
+ @Column(columnDefinition="DECIMAL(10,2) comment '涓爣鎬婚'")
+ private BigDecimal totalWinningAmount;
/**
* 鎷熶娇鐢ㄥ湴鐐�
@@ -119,7 +120,28 @@
/**
* 涓爣鍘傚ID
*/
- @Schema(description="涓爣鍘傚")
- @Column(columnDefinition="bigint comment '浣跨敤鍏徃'")
+ @Schema(description="涓爣鍘傚ID")
+ @Column(columnDefinition="bigint comment '涓爣鍘傚ID'")
private Long winningManufacturerId;
+
+ /**
+ * 涓爣閫氱煡鍚嶇О
+ */
+ @Schema(description="涓爣閫氱煡")
+ @Column(columnDefinition="varchar(256) comment '涓爣閫氱煡'")
+ private String winningName;
+
+ /**
+ * 璁惧ID
+ */
+ @Schema(description="璁惧ID")
+ @Column(columnDefinition="bigint comment '璁惧ID'")
+ private Long deviceId;
+
+ /**
+ * 鎷涙爣璁″垝ID
+ */
+ @Schema(description="鎷涙爣璁″垝ID")
+ @Column(columnDefinition="bigint comment '鎷涙爣璁″垝ID'")
+ private Long orderId;
}
\ No newline at end of file
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
index 86aa69f..55518a6 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
@@ -133,4 +133,11 @@
@Transient
@TableField(exist = false)
private List<ReceivingNoteItem> noteItemList;
+
+ /**
+ * 楠屾敹鍗曞悕绉�
+ */
+ @Schema(description = "楠屾敹鍗曞悕绉�")
+ @Column(columnDefinition="VARCHAR(256) comment '楠屾敹鍗曞悕绉�'")
+ private String noteName;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/PurchaseWinningLetterPageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/PurchaseWinningLetterPageVo.java
new file mode 100644
index 0000000..c42c217
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/PurchaseWinningLetterPageVo.java
@@ -0,0 +1,30 @@
+package com.by4cloud.platformx.device.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class PurchaseWinningLetterPageVo {
+
+ private Long id;
+
+ private String winningName;
+
+ private String winningCode;
+
+ private String orderName;
+
+ private String deviceName;
+
+ private String deviceCode;
+
+ private String winningBidder;
+
+ private String arrivalMonth;
+
+ private String quantity;
+
+ private String totalWinningAmount;
+
+ private String locationUsed;
+
+}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index 85732b8..cd1bcaa 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -54,6 +54,7 @@
@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.getOrderName()),PurchaseTendrOrderEntity::getOrderName,purchaseTendrOrder.getOrderName());
wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
wrapper.orderByDesc(PurchaseTendrOrderEntity::getCreateTime);
return R.ok(purchaseTendrOrderService.page(page, wrapper));
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
index 9b2fe48..e790780 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
+++ b/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));
}
@@ -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));
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceMapper.java
index 6eed404..5c06f67 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceMapper.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceMapper.java
@@ -14,4 +14,6 @@
List<Device> getDeviceSelectListByLedgerId(@Param("ledgerId") Long ledgerId);
List<Device> getDeviceListByContractId(@Param("contractId")Long contractId);
+
+ List<Device> getDropdownnByWinningId(@Param("id") Long id);
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/PurchaseWinningLetterMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/PurchaseWinningLetterMapper.java
index b590b83..5243a6e 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/PurchaseWinningLetterMapper.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/PurchaseWinningLetterMapper.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.PurchaseWinningLetterQueryDTO;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
+import com.by4cloud.platformx.device.entity.vo.PurchaseWinningLetterPageVo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface PurchaseWinningLetterMapper extends PlatformxBaseMapper<PurchaseWinningLetterEntity> {
+ IPage<PurchaseWinningLetterPageVo> pageNew(Page page,@Param("queryDTO") PurchaseWinningLetterQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
index 571d764..2958063 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
@@ -1,10 +1,20 @@
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.common.core.util.R;
+import com.by4cloud.platformx.device.dto.PurchaseWinningLetterQueryDTO;
+import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
+
+import java.util.List;
public interface PurchaseWinningLetterService extends IService<PurchaseWinningLetterEntity> {
R saveNew(PurchaseWinningLetterEntity purchaseWinningLetter);
+
+ IPage pageNew(Page page, PurchaseWinningLetterQueryDTO queryDTO);
+
+ List<Device> getDropdownnByWinningId(Long id);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
index 3804eec..61bcee2 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
@@ -1,15 +1,23 @@
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;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.dto.PurchaseWinningLetterQueryDTO;
+import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
+import com.by4cloud.platformx.device.mapper.DeviceMapper;
import com.by4cloud.platformx.device.mapper.PurchaseTendrOrderMapper;
import com.by4cloud.platformx.device.mapper.PurchaseWinningLetterMapper;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+
/**
* 涓爣閫氱煡涔�
*
@@ -21,17 +29,27 @@
public class PurchaseWinningLetterServiceImpl extends ServiceImpl<PurchaseWinningLetterMapper, PurchaseWinningLetterEntity> implements PurchaseWinningLetterService {
private final PurchaseTendrOrderMapper orderMapper;
+ private final DeviceMapper deviceMapper;
@Override
public R saveNew(PurchaseWinningLetterEntity purchaseWinningLetter) {
baseMapper.insert(purchaseWinningLetter);
- QueryWrapper<PurchaseTendrOrderEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("purchase_plan_code",purchaseWinningLetter.getPurchasePlanCode());
- PurchaseTendrOrderEntity orderEntity = orderMapper.selectOne(queryWrapper);
+ PurchaseTendrOrderEntity orderEntity = orderMapper.selectById(purchaseWinningLetter.getOrderId());
if (orderEntity!=null){
orderEntity.setStatus("2");
orderMapper.updateById(orderEntity);
}
return R.ok();
}
+
+ @Override
+ public IPage pageNew(Page page, PurchaseWinningLetterQueryDTO queryDTO) {
+ return baseMapper.pageNew(page,queryDTO);
+ }
+
+ @Override
+ public List<Device> getDropdownnByWinningId(Long id) {
+ List<Device> list = deviceMapper.getDropdownnByWinningId(id);
+ return list;
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceMapper.xml
index 635bf6f..c3a261f 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceMapper.xml
@@ -66,4 +66,21 @@
and ci.contract_id = #{contractId}
and ci.device_id = d.id )
</select>
+ <select id="getDropdownnByWinningId" resultType="com.by4cloud.platformx.device.entity.Device">
+ select
+ *
+ from
+ device d
+ where
+ d.del_flag = '0'
+ and exists (
+ select
+ pwl.device_id
+ from
+ purchase_winning_letter pwl
+ where
+ pwl.del_flag = '0'
+ and pwl.id = #{id}
+ and pwl.device_id = d.id )
+ </select>
</mapper>
diff --git a/platformx-device-biz/src/main/resources/mapper/PurchaseWinningLetterMapper.xml b/platformx-device-biz/src/main/resources/mapper/PurchaseWinningLetterMapper.xml
index 45fe136..944dec1 100644
--- a/platformx-device-biz/src/main/resources/mapper/PurchaseWinningLetterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/PurchaseWinningLetterMapper.xml
@@ -24,4 +24,35 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
+ <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.PurchaseWinningLetterPageVo">
+ select
+ pwl.id,
+ pto.order_name,
+ pwl.winning_code,
+ pwl.purchase_plan_code ,
+ pwl.device_code,
+ pwl.device_name,
+ pwl.arrival_month,
+ pwl.quantity,
+ pwl.total_winning_amount,
+ pwl.location_used,
+ pwl.winning_bidder,
+ pwl.winning_name
+ from
+ purchase_winning_letter pwl
+ join purchase_tendr_order pto on
+ pwl.order_id = pto.id
+ where
+ pwl.del_flag = '0'
+ <if test="queryDTO.orderName != null and queryDTO.orderName !=''">
+ and pto.order_name like CONCAT('%', #{queryDTO.orderName}, '%')
+ </if>
+ <if test="queryDTO.winningName != null and queryDTO.winningName !=''">
+ and pwl.winning_name like CONCAT('%', #{queryDTO.winningName}, '%')
+ </if>
+ <if test="queryDTO.winningCode != null and queryDTO.winningCode !=''">
+ and pwl.winning_code like CONCAT('%', #{queryDTO.winningCode}, '%')
+ </if>
+ order by pwl.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1