From c16329fad94c7a783aae1fc204b9b9818dcf1d29 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 31 三月 2025 11:04:48 +0800
Subject: [PATCH] 合同新增添加中标单关联，根据选择的中标单赋值乙方 中标单中标厂家改成下拉 验收单来源类型根据合同类型，查询条件和结果新增合同名称
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java | 5 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java | 4 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java | 10 +++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java | 62 ++++++++------------
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java | 9 +++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceLeasingLedger.java | 9 +++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java | 8 ++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ContractItem.java | 4 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 10 +++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceTechnicalAgreemnt.java | 7 ++
platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml | 3
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 8 ++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java | 2
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java | 4 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceTechnicalAgreementPageVo.java | 2
15 files changed, 104 insertions(+), 43 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
index 38ef50a..1f72536 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
@@ -1,10 +1,15 @@
package com.by4cloud.platformx.device.dto;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ReceivingNoteQueryDTO {
+ @Schema(description = "楠屾敹鍗曠紪鍙�")
private String releaseCode;
+ @Schema(description = "鍚堝悓鍚嶇О")
+ private String contractName;
+
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java
index 6cf6324..cdfd3f3 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Contract.java
@@ -107,6 +107,10 @@
@Column(columnDefinition = "datetime comment '濉姤鏃堕棿'")
private Date releaseDate;
+ @Schema(description = "涓爣鍗旾D")
+ @Column(columnDefinition="bigint comment '涓爣鍗旾D'")
+ private Long winningLetterId;
+
@Transient
@TableField(exist = false)
private List<ContractItem> contractItemList;
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ContractItem.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ContractItem.java
index 3221398..2a568da 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ContractItem.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ContractItem.java
@@ -33,5 +33,7 @@
@Column(columnDefinition="long comment '璁惧ID'")
private Long deviceId;
-
+ @Schema(description = "鎶�鏈崗璁甀D")
+ @Column(columnDefinition="long comment '璁惧鎶�鏈崗璁甀D'")
+ private Long technicalAgreementId;
}
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 82736b0..e2ba23c 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
@@ -87,4 +87,13 @@
@Transient
@TableField(exist = false)
private List<DeviceLeasingLedgerItem> ledgerItemList;
+
+ /**
+ * 鍑虹鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鍑虹鏃ユ湡")
+ @Column(columnDefinition="datetime comment '鍒拌揣楠屾敹鏃ユ湡'")
+ private Date deliveryDate;
+
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceTechnicalAgreemnt.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceTechnicalAgreemnt.java
index 6b2c54a..a8a544b 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceTechnicalAgreemnt.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceTechnicalAgreemnt.java
@@ -20,6 +20,13 @@
public class DeviceTechnicalAgreemnt extends BaseModel<DeviceTechnicalAgreemnt> {
/**
+ * 鍗忚鍚嶇О
+ */
+ @Schema(description = "鍗忚鍚嶇О")
+ @Column(columnDefinition="VARCHAR(256) comment '鍗忚鍚嶇О'")
+ private String agreementName;
+
+ /**
* 鐢叉柟
*/
@Schema(description = "鐢叉柟")
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 3c6b7f0..5482de7 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
@@ -6,7 +6,10 @@
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.time.LocalDateTime;
/**
@@ -16,122 +19,107 @@
* @date 2025-03-24 17:13:08
*/
@Data
+@Entity
@TableName("purchase_winning_letter")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "涓爣閫氱煡涔�")
+@javax.persistence.Table(name = "purchase_winning_letter")
+@Table(appliesTo = "purchase_winning_letter", comment = "涓爣閫氱煡")
public class PurchaseWinningLetterEntity extends BaseModel<PurchaseWinningLetterEntity> {
/**
* 涓爣閫氱煡涔︾紪鐮�
*/
@Schema(description="涓爣閫氱煡涔︾紪鐮�")
+ @Column(columnDefinition="varchar(100) comment '涓爣閫氱煡涔︾紪鐮�'")
private String winningCode;
/**
* 閲囪喘璁″垝缂栧彿
*/
@Schema(description="閲囪喘璁″垝缂栧彿")
- private String purchasePlanCode;
+ @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="鍗曚綅")
+ @Column(columnDefinition="varchar(32) comment '鍗曚綅'")
private String unit;
/**
* 涓爣鍗曚环 /鍒�
*/
@Schema(description="涓爣鍗曚环 /鍒�")
+ @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鍗曚环 /鍒�'")
private Integer winningPrice;
/**
* 涓爣鎬婚 /鍒�
*/
@Schema(description="涓爣鎬婚 /鍒�")
+ @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鎬婚 /鍒�'")
private Integer totalWinningAmount;
/**
* 鎷熶娇鐢ㄥ湴鐐�
*/
@Schema(description="鎷熶娇鐢ㄥ湴鐐�")
+ @Column(columnDefinition="varchar(256) comment '鎷熶娇鐢ㄥ湴鐐�'")
private String locationUsed;
/**
* 涓爣鍘傚
*/
@Schema(description="涓爣鍘傚")
+ @Column(columnDefinition="varchar(100) comment '涓爣鍘傚'")
private String winningBidder;
/**
- * 鐢宠浜�
- */
- @TableField(fill = FieldFill.INSERT)
- @Schema(description="鐢宠浜�")
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @Schema(description="鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
- /**
- * 淇敼浜�
- */
- @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;
+ * 涓爣鍘傚ID
+ */
+ @Schema(description="涓爣鍘傚")
+ @Column(columnDefinition="bigint comment '浣跨敤鍏徃'")
+ private Long winningManufacturerId;
}
\ 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 b2b9af4..86aa69f 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
@@ -69,7 +69,7 @@
* 鏉ユ簮绫诲瀷
*/
@Schema(description = "鏉ユ簮绫诲瀷")
- @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷'")
+ @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷 0 绉熻祦 1 閲囪喘'")
private String resourceType;
/**
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceTechnicalAgreementPageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceTechnicalAgreementPageVo.java
index 6b371fa..c5790ed 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceTechnicalAgreementPageVo.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceTechnicalAgreementPageVo.java
@@ -11,7 +11,7 @@
private Long id;
- private String contractName;
+ private String agreementName;
private String partya;
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
index 986ce36..f178922 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
@@ -10,6 +10,14 @@
private Long id;
+ /**
+ * 鍚堝悓 鍚嶇О
+ */
+ private String contractName;
+
+ /**
+ * 楠屾敹鍗曞彿
+ */
private String releaseCode;
/**
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
index 32eb8b1..88389b9 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
@@ -120,4 +120,13 @@
public List<DeviceManufacturer> export(DeviceManufacturer deviceManufacturer,Long[] ids) {
return deviceManufacturerService.list(Wrappers.lambdaQuery(deviceManufacturer).in(ArrayUtil.isNotEmpty(ids), DeviceManufacturer::getId, ids));
}
+
+ /**
+ * 鑾峰彇涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDropdownnList")
+ public R<List<DeviceManufacturer>> getDropdownnList() {
+ return R.ok(deviceManufacturerService.list());
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
index 1d8ca5c..396aad7 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
@@ -10,6 +10,7 @@
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.device.dto.DeviceTechnicalAgreemntQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceTechnicalAgreemnt;
+import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
import com.by4cloud.platformx.device.service.DeviceTechnicalAgreementService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -117,4 +118,13 @@
public List<DeviceTechnicalAgreemnt> export(DeviceTechnicalAgreemnt deviceTechnicalAgreement,Long[] ids) {
return deviceTechnicalAgreementService.list(Wrappers.lambdaQuery(deviceTechnicalAgreement).in(ArrayUtil.isNotEmpty(ids), DeviceTechnicalAgreemnt::getId, ids));
}
+
+ /**
+ * 鑾峰彇涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDropdownnList")
+ public R<List<DeviceTechnicalAgreemnt>> getDropdownnList() {
+ return R.ok(deviceTechnicalAgreementService.list());
+ }
}
\ No newline at end of file
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 ed3d14f..db13e6d 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
@@ -10,6 +10,7 @@
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.service.JcMaxSizeService;
@@ -125,4 +126,13 @@
public List<PurchaseWinningLetterEntity> export(PurchaseWinningLetterEntity purchaseWinningLetter,Long[] ids) {
return purchaseWinningLetterService.list(Wrappers.lambdaQuery(purchaseWinningLetter).in(ArrayUtil.isNotEmpty(ids), PurchaseWinningLetterEntity::getId, ids));
}
+
+ /**
+ * 鑾峰彇涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDropdownnList")
+ public R<List<PurchaseWinningLetterEntity>> getDropdownnList() {
+ return R.ok(purchaseWinningLetterService.list());
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
index b5f7e54..db0e317 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
@@ -2,10 +2,12 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.device.constant.MaxSizeContant;
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.JcMaxSizeService;
import com.by4cloud.platformx.device.service.PurchaseTendrOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,12 +25,14 @@
public class PurchaseTendrOrderServiceImpl extends ServiceImpl<PurchaseTendrOrderMapper, PurchaseTendrOrderEntity> implements PurchaseTendrOrderService {
private final PurchaseWinningLetterMapper purchaseWinningLetterMapper;
+ private final JcMaxSizeService maxSizeService;
@Override
public boolean complete(Long id) {
PurchaseTendrOrderEntity orderEntity = baseMapper.selectById(id);
PurchaseWinningLetterEntity entity = BeanUtil.copyProperties(orderEntity, PurchaseWinningLetterEntity.class);
+ entity.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE));
entity.setWinningPrice(orderEntity.getEstimatePrice());
entity.setTotalWinningAmount(orderEntity.getTotalPlanndAmount());
purchaseWinningLetterMapper.insert(entity);
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
index 1c3ce2f..bd7e9db 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
@@ -29,7 +29,7 @@
<select id="page" resultType="com.by4cloud.platformx.device.entity.vo.DeviceTechnicalAgreementPageVo">
select
dta.id,
- c.name contractName,
+ dta.agreement_name,
dta.partya ,
dta.partyb ,
dta.partyc ,
@@ -38,7 +38,6 @@
dta.device_code
from
device_technical_agreement dta
- join contract c on dta.contract_id = c.id
join device d on d.id = dta.device_id
where
dta.del_flag = '0'
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 456c1da..e75ca39 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -25,18 +25,24 @@
rn.release_date ,
rn.release_code,
dm.manufacturer_name,
- sd.name deptName
+ sd.name deptName,
+ c.name contractName
from
receiving_note rn
join device_manufacturer dm on
rn.manufacturer_id = dm.id
join platformxx_boot.sys_dept sd on
rn.dept_id = sd.dept_id
+ join contract c on
+ c.id = rn.contract_id
where
rn.del_flag = '0'
<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
+ <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
+ and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
order by
rn.create_time
desc
--
Gitblit v1.9.1