From 50921bdc2d06ebf2c0302f2b3f8383bd729edacc Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 14 九月 2026 15:31:41 +0800
Subject: [PATCH] feat: 付款申请创建采购付款分栏与财务审核人、工资表银行账号及校验、库存详情按更新时间降序
---
src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java | 30 +++++++++++++++
src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java | 3 +
doc/20260914_add_purchase_payment_fields_to_account_payment_application.sql | 7 +++
src/main/resources/mapper/stock/StockInventoryMapper.xml | 2
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 37 ++++++++++++++++++
doc/20260914_move_bank_account_to_staff_salary_main.sql | 5 ++
doc/20260914_add_finance_auditor_id_to_account_payment_application.sql | 4 ++
7 files changed, 87 insertions(+), 1 deletions(-)
diff --git a/doc/20260914_add_finance_auditor_id_to_account_payment_application.sql b/doc/20260914_add_finance_auditor_id_to_account_payment_application.sql
new file mode 100644
index 0000000..2b9c711
--- /dev/null
+++ b/doc/20260914_add_finance_auditor_id_to_account_payment_application.sql
@@ -0,0 +1,4 @@
+-- 浠樻鐢宠"璐㈠姟瀹℃牳"瀛楁鏀逛负閫夋嫨瀹℃牳浜哄憳锛氭柊澧炲鏍镐汉ID鍒楋紙finance_auditor 瀛樺鍚嶏級
+-- 鎵ц搴擄細product-inventory-management锛堝悇绉熸埛搴撳悓锛�
+ALTER TABLE `account_payment_application`
+ ADD COLUMN `finance_auditor_id` bigint DEFAULT NULL COMMENT '璐㈠姟瀹℃牳浜篒D锛坰ys_user.user_id锛�' AFTER `finance_auditor`;
diff --git a/doc/20260914_add_purchase_payment_fields_to_account_payment_application.sql b/doc/20260914_add_purchase_payment_fields_to_account_payment_application.sql
new file mode 100644
index 0000000..373d6c3
--- /dev/null
+++ b/doc/20260914_add_purchase_payment_fields_to_account_payment_application.sql
@@ -0,0 +1,7 @@
+-- 浠樻鐢宠鏂板"鍒涘缓閲囪喘浠樻"鍒嗘爮瀛楁
+-- 鎵ц搴擄細product-inventory-management锛堝悇绉熸埛搴撳悓锛�
+ALTER TABLE `account_payment_application`
+ ADD COLUMN `payment_purpose` varchar(255) DEFAULT NULL COMMENT '娆鹃」鐢ㄩ��' AFTER `payment_content`,
+ ADD COLUMN `project_name` varchar(255) DEFAULT NULL COMMENT '椤圭洰鍚嶇О' AFTER `payment_purpose`,
+ ADD COLUMN `operator_name` varchar(100) DEFAULT NULL COMMENT '缁忓姙浜�' AFTER `project_name`,
+ ADD COLUMN `finance_auditor` varchar(100) DEFAULT NULL COMMENT '璐㈠姟瀹℃牳' AFTER `operator_name`;
diff --git a/doc/20260914_move_bank_account_to_staff_salary_main.sql b/doc/20260914_move_bank_account_to_staff_salary_main.sql
new file mode 100644
index 0000000..0893618
--- /dev/null
+++ b/doc/20260914_move_bank_account_to_staff_salary_main.sql
@@ -0,0 +1,5 @@
+-- 閾惰璐﹀彿瀛楁璋冩暣锛氫粠宸ヨ祫鏄庣粏琛ㄧЩ鍒板伐璧勪富琛紙鍩虹璧勬枡鍒嗘爮锛�
+-- 鎵ц搴擄細product-inventory-management锛堝悇绉熸埛搴撳悓锛�
+ALTER TABLE `staff_salary_detail` DROP COLUMN `bank_account`;
+ALTER TABLE `staff_salary_main`
+ ADD COLUMN `bank_account` varchar(19) DEFAULT NULL COMMENT '閾惰璐﹀彿锛�16-19浣嶇函鏁板瓧锛�' AFTER `pay_bank`;
diff --git a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
index 9a01df7..9c3d330 100644
--- a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
+++ b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
@@ -110,6 +110,36 @@
private String paymentContent;
/**
+ * 娆鹃」鐢ㄩ��
+ */
+ @ApiModelProperty("娆鹃」鐢ㄩ��")
+ private String paymentPurpose;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ private String projectName;
+
+ /**
+ * 缁忓姙浜�
+ */
+ @ApiModelProperty("缁忓姙浜�")
+ private String operatorName;
+
+ /**
+ * 璐㈠姟瀹℃牳
+ */
+ @ApiModelProperty("璐㈠姟瀹℃牳")
+ private String financeAuditor;
+
+ /**
+ * 璐㈠姟瀹℃牳浜篒D锛坰ys_user.user_id锛�
+ */
+ @ApiModelProperty("璐㈠姟瀹℃牳浜篒D")
+ private Long financeAuditorId;
+
+ /**
* 鐢宠鏃ユ湡
*/
@ApiModelProperty("鐢宠鏃ユ湡")
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
index c85c61c..bfe1ff5 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
@@ -65,6 +65,9 @@
@Schema(description = "鏀粯閾惰")
private String payBank;
+ @Schema(description = "閾惰璐﹀彿锛�16-19浣嶇函鏁板瓧锛�")
+ private String bankAccount;
+
@TableField(exist = false)
@Schema(description = "鍒涘缓浜�")
private String createUserName;
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 41f8af3..540c978 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -22,6 +22,7 @@
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -43,6 +44,7 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
private final StaffSalaryMainMapper staffSalaryMainMapper;
@@ -81,6 +83,7 @@
if (staffSalaryMain == null || StringUtils.isEmpty(staffSalaryMain.getSalaryMonth())) {
return AjaxResult.error("鍙傛暟閿欒");
}
+ validateBankAccount(staffSalaryMain.getBankAccount());
Integer status = staffSalaryMain.getStatus();
if (status != null && status == 5) {
@@ -111,6 +114,7 @@
if(staffSalaryMain == null){
return AjaxResult.error("鍙傛暟閿欒");
}
+ validateBankAccount(staffSalaryMain.getBankAccount());
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
return AjaxResult.error("鍙傛暟閿欒");
@@ -154,6 +158,39 @@
return AjaxResult.success("淇敼鎴愬姛");
}
+ /**
+ * 閾惰璐﹀彿鍏滃簳鏍￠獙锛氫粎绾暟瀛� + 闀垮害16-19浣嶏紙涓嶇鐩存帴鎷︽埅锛夛紱
+ * Luhn 鏍￠獙浠呬綔鍛婅锛屼笉闃绘柇鎻愪氦锛堜釜鍒�佸崱/鐗规畩鍗″彲鑳戒笉閫氳繃锛�
+ */
+ private void validateBankAccount(String account) {
+ if (account == null || account.isBlank()) {
+ return;
+ }
+ if (!account.matches("\\d{16,19}")) {
+ throw new com.ruoyi.common.exception.ServiceException("閾惰璐﹀彿鏍煎紡涓嶆纭細闇�涓�16-19浣嶇函鏁板瓧");
+ }
+ if (!luhnValid(account)) {
+ log.warn("閾惰璐﹀彿 Luhn 鏍￠獙鏈�氳繃锛堜粎鍛婅锛屼笉闃绘柇锛�");
+ }
+ }
+
+ private boolean luhnValid(String account) {
+ int sum = 0;
+ boolean alternate = false;
+ for (int i = account.length() - 1; i >= 0; i--) {
+ int n = account.charAt(i) - '0';
+ if (alternate) {
+ n *= 2;
+ if (n > 9) {
+ n -= 9;
+ }
+ }
+ sum += n;
+ alternate = !alternate;
+ }
+ return sum % 10 == 0;
+ }
+
@Override
public AjaxResult delete(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index fac5842..5acee04 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -1126,7 +1126,7 @@
product_name,
product_id
order by
- batch_no
+ MAX(update_time) desc
</select>
</mapper>
--
Gitblit v1.9.3