From a461d5fc184fd0129a0eb5a5b3e34f67d75cc6a2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 04 六月 2025 16:51:59 +0800
Subject: [PATCH] 联调基础信息
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java | 40 +++++++++----
main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java | 2
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java | 14 ++++
basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java | 14 ++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java | 8 ++
basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql | 18 +++---
basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java | 18 ++++--
basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java | 4 -
basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java | 4 +
pom.xml | 13 ++++
basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java | 12 ++-
11 files changed, 109 insertions(+), 38 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java
index dfadf62..4e15628 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java
@@ -45,10 +45,8 @@
/**
* 鍒犻櫎
*/
- @DeleteMapping("/delSupply")
+ @DeleteMapping("/delCoalQuality")
public R remove(@RequestBody Long[] ids) {
return R.ok(coalQualityService.delCoalQualityByIds(ids));
}
-
-
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
index f80b8f7..ac4b428 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
@@ -9,6 +9,8 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* <p>
* 渚涘簲鍟嗕俊鎭〃 鍓嶇鎺у埗鍣�
@@ -29,12 +31,20 @@
* 鏌ヨ
*/
@GetMapping("/list")
- public R<IPage<Supply>> list(Page page,SupplyDto supplyDto) {
- IPage<Supply> list = supplyService.selectSupplyList(page,supplyDto);
+ public R<IPage<Supply>> list(Page page, SupplyDto supplyDto) {
+ IPage<Supply> list = supplyService.selectSupplyList(page, supplyDto);
return R.ok(list);
}
/**
+ * 渚涘簲鍟�
+ */
+ @GetMapping("/supplyList")
+ public R<List<Supply>> list() {
+ return R.ok(supplyService.supplyList());
+ }
+
+ /**
* 鏂板淇敼
*/
@PostMapping("/addOrEditSupply")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java
index 2c2d085..b044e12 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SupplyDto.java
@@ -3,6 +3,20 @@
import com.ruoyi.basic.entity.Supply;
import lombok.Data;
+import java.util.List;
+
@Data
public class SupplyDto extends Supply {
+
+ /**
+ * 缁忚惀鍦板潃鐪佸競鍖篿ds
+ */
+ private List<Long> bids;
+
+ /**
+ * 鑱旂郴鍦板潃鐪佸競鍖篿ds
+ */
+ private List<Long> cids;
+
+ private String searchAll;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
index dd86849..934495c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalInfo.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.core.domain.MyBaseEntity;
@@ -22,20 +23,21 @@
* 涓婚敭ID
*/
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鐓ょ鍚嶇О
*/
- @TableField(value = "coal_name")
- private String coalName;
+ @TableField(value = "coal")
+ private String coal;
/**
* 缁存姢浜哄鍚�
*/
- @TableField(value = "maintainer")
- private String maintainer;
+ @TableField(value = "maintainer_id")
+ private Long maintainerId;
/**
* 缁存姢鏃ユ湡
*/
@TableField(value = "maintenance_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDate;
}
\ No newline at end of file
diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
index 1cb47fa..556a7dc 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
@@ -56,35 +56,41 @@
*/
@TableField(value = "contact_address")
private String contactAddress;
+
+ /**
+ * 鑱旂郴浜虹殑鐢佃瘽
+ */
+ @TableField(value = "contact_phone")
+ private String contactPhone;
/**
* 渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
*/
- @TableField(value = "province_id")
+ @TableField(value = "b_province_id")
private Long BProvinceId;
/**
* 渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
*/
- @TableField(value = "city_id")
+ @TableField(value = "b_city_id")
private Long BCityId;
/**
* 渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎
*/
- @TableField(value = "district_id")
+ @TableField(value = "b_district_id")
private Long BDistrictId;
/**
* 鑱旂郴鍦板潃 鐪佷唤鐨処D
*/
- @TableField(value = "province_id")
+ @TableField(value = "c_province_id")
private Long CProvinceId;
/**
* 鑱旂郴鍦板潃鎵�鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
*/
- @TableField(value = "city_id")
+ @TableField(value = "c_city_id")
private Long CCityId;
/**
* 鑱旂郴鍦板潃鎵�鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎
*/
- @TableField(value = "district_id")
+ @TableField(value = "c_district_id")
private Long CDistrictId;
}
\ No newline at end of file
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java b/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
index 5165bde..77cfe64 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
@@ -6,6 +6,8 @@
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
+import java.util.List;
+
/**
* <p>
* 渚涘簲鍟嗕俊鎭〃 鏈嶅姟绫�
@@ -21,4 +23,6 @@
int addOrEditSupply(SupplyDto supplyDto);
int delSupplyByIds(Long[] ids);
+
+ List<Supply> supplyList();
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
index 9f0a72f..4b38b0e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
@@ -9,9 +9,12 @@
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.service.CoalInfoService;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.Objects;
@@ -32,6 +35,9 @@
@Override
public IPage<CoalInfo> selectCoalInfoList(Page page, CoalInfoDto coalInfoDto) {
LambdaQueryWrapper<CoalInfo> queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.hasText(coalInfoDto.getCoal())) {
+ queryWrapper.like(CoalInfo::getCoal,coalInfoDto.getCoal());
+ }
queryWrapper.orderByDesc(CoalInfo::getCreateTime);
return coalInfoMapper.selectPage(page, queryWrapper);
}
@@ -40,6 +46,8 @@
public int addOrEditCoalInfo(CoalInfoDto coalInfoDto) {
CoalInfo coalInfo = new CoalInfo();
BeanUtils.copyProperties(coalInfoDto, coalInfo);
+ coalInfo.setMaintainerId(SecurityUtils.getUserId());
+ coalInfo.setMaintenanceDate(DateUtils.getNowDate());
if (Objects.isNull(coalInfo.getId())) {
return coalInfoMapper.insert(coalInfo);
} else {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
index b885fe7..3f406b0 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import java.util.List;
import java.util.Objects;
/**
@@ -33,17 +34,29 @@
@Override
public IPage<Supply> selectSupplyList(Page page, SupplyDto supplyDto) {
LambdaQueryWrapper<Supply> queryWrapper = new LambdaQueryWrapper<>();
-
- // 渚涘簲鍟嗗悕绉版ā绯婃煡璇�
- if (StringUtils.hasText(supplyDto.getSupplierName())) {
- queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
+ // 鍏ㄥ眬妯＄硦鎼滅储瀛楁
+ if (StringUtils.hasText(supplyDto.getSearchAll())) {
+ String keyword = supplyDto.getSearchAll();
+ queryWrapper.and(wrapper -> wrapper
+ .like(Supply::getSupplierName, keyword)
+ .or()
+ .like(Supply::getTaxpayerId, keyword)
+ .or()
+ .like(Supply::getBusinessAddress, keyword)
+ );
+ } else {
+ // 鍗曠嫭鏉′欢鏌ヨ
+ if (StringUtils.hasText(supplyDto.getSupplierName())) {
+ queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
+ }
+ if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
+ queryWrapper.like(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
+ }
+ if (StringUtils.hasText(supplyDto.getBusinessAddress())) {
+ queryWrapper.like(Supply::getBusinessAddress, supplyDto.getBusinessAddress());
+ }
}
-
- // 绾崇◣浜鸿瘑鍒彿绮剧‘鏌ヨ
- if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
- queryWrapper.eq(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
- }
-
+ // 榛樿鎸夊垱寤烘椂闂村�掑簭鎺掑垪
queryWrapper.orderByDesc(Supply::getCreateTime);
return supplyMapper.selectPage(page, queryWrapper);
}
@@ -65,13 +78,16 @@
if (ids == null || ids.length == 0) {
return 0;
}
-
// 鏋勯�犳洿鏂版潯浠�
UpdateWrapper<Supply> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", ids)
.set("deleted", 1); // 璁剧疆 deleted 涓� 1 琛ㄧず宸插垹闄�
-
// 鎵ц鎵归噺閫昏緫鍒犻櫎
return supplyMapper.update(null, updateWrapper);
}
+
+ @Override
+ public List<Supply> supplyList() {
+ return supplyMapper.selectList(null);
+ }
}
diff --git a/basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql b/basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql
index e1274a7..a59dcd0 100644
--- a/basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql
+++ b/basic-server/src/main/resources/db/migration/postgresql/V20250603102701__create_table_coal_info.sql
@@ -1,16 +1,16 @@
-- 鍒涘缓 coal_info 琛�
CREATE TABLE coal_info
(
- id SERIAL PRIMARY KEY, -- 涓婚敭锛岃嚜鍔ㄩ�掑
- coal_name VARCHAR(255) NOT NULL, -- 鐓ょ鍚嶇О锛屼笉鍏佽涓虹┖
- maintainer VARCHAR(255) NOT NULL, -- 缁存姢浜猴紝涓嶅厑璁镐负绌�
- maintenance_date DATE NOT NULL, -- 缁存姢鏃ユ湡锛屼笉鍏佽涓虹┖
+ id SERIAL PRIMARY KEY, -- 涓婚敭锛岃嚜鍔ㄩ�掑
+ coal VARCHAR(255) NOT NULL, -- 鐓ょ鍚嶇О锛屼笉鍏佽涓虹┖
+ maintainer_id int4 NOT NULL DEFAULT 0, -- 缁存姢浜猴紝涓嶅厑璁镐负绌�
+ maintenance_date DATE NOT NULL, -- 缁存姢鏃ユ湡锛屼笉鍏佽涓虹┖
-- 鏂板瀛楁
- deleted int4 NOT NULL DEFAULT 0, -- 鏄惁鍒犻櫎锛堣蒋鍒犻櫎鏍囧織锛�
- create_by VARCHAR(255), -- 鍒涘缓浜�
+ deleted int4 NOT NULL DEFAULT 0, -- 鏄惁鍒犻櫎锛堣蒋鍒犻櫎鏍囧織锛�
+ create_by VARCHAR(255), -- 鍒涘缓浜�
create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, -- 鍒涘缓鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
- update_by VARCHAR(255), -- 鏈�鍚庢洿鏂颁汉
+ update_by VARCHAR(255), -- 鏈�鍚庢洿鏂颁汉
update_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -- 鏈�鍚庢洿鏂版椂闂达紝榛樿褰撳墠鏃堕棿
);
@@ -19,8 +19,8 @@
-- 涓哄瓧娈垫坊鍔犳敞閲�
COMMENT ON COLUMN coal_info.id IS '涓婚敭ID';
-COMMENT ON COLUMN coal_info.coal_name IS '鐓ょ鍚嶇О';
-COMMENT ON COLUMN coal_info.maintainer IS '缁存姢浜哄鍚�';
+COMMENT ON COLUMN coal_info.coal IS '鐓ょ鍚嶇О';
+COMMENT ON COLUMN coal_info.maintainer_id IS '缁存姢浜哄鍚�';
COMMENT ON COLUMN coal_info.maintenance_date IS '缁存姢鏃ユ湡';
-- 鏂板瀛楁鐨勬敞閲�
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
index 2bd1370..1857da2 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
@@ -28,7 +28,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- *
+ * 渚涘簲鍟唅d
*/
@TableField(value = "supplier_id")
private Long supplierId;
diff --git a/pom.xml b/pom.xml
index 8fabd26..da9aa5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,6 +226,19 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- pom.xml -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct</artifactId>
+ <version>1.5.5.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>1.5.5.Final</version>
+ <scope>provided</scope>
+ </dependency>
<!-- MyBatis-Plus 鏍稿績渚濊禆 -->
<dependency>
--
Gitblit v1.9.3