From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
index 14d50af..ee61c06 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
@@ -1,6 +1,7 @@
package com.example.erp.service.sd;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
import org.springframework.stereotype.Service;
@@ -25,9 +26,43 @@
return basicOtherMoneyMapper.deleteById(id);
}
- public int save(String alias) {
- BasicOtherMoney basicOtherMoney = new BasicOtherMoney();
- basicOtherMoney.setAlias(alias);
- return basicOtherMoneyMapper.insert(basicOtherMoney);
+ public boolean save(String alias) {
+ //鍒ゆ柇鏄惁宸茬粡瀛樺湪
+ QueryWrapper<BasicOtherMoney> queryWrapperByName = new QueryWrapper<>();
+ queryWrapperByName.eq("alias", alias);
+ int count = Math.toIntExact(basicOtherMoneyMapper.selectCount(queryWrapperByName));
+ if(count>0){
+ return false;
+ }
+
+ //鏌ヨ鏈�澶х殑鍒楀悕
+ QueryWrapper<BasicOtherMoney> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByDesc("id");
+ List<BasicOtherMoney> basicOtherMoneyList = basicOtherMoneyMapper.selectList(queryWrapper);
+ //瓒呰繃100鏉′笉鎵ц
+ if(basicOtherMoneyList.size()==100){
+ return false;
+ }
+
+ BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
+ String getColumn = basicOtherMoney.getColumn()==null?
+ "0":
+ String.valueOf(basicOtherMoney.getId());
+// basicOtherMoney.getColumn().
+// replace("M","").
+// replace("S","");
+ int columnNum = Integer.parseInt(getColumn)+1;
+ BasicOtherMoney newBasicOtherMoney = new BasicOtherMoney();
+ newBasicOtherMoney.setColumn("M"+String.format("%02d", columnNum));
+ newBasicOtherMoney.setAlias(alias);
+ basicOtherMoneyMapper.insert(newBasicOtherMoney);
+ return true;
+ }
+
+ public List<BasicOtherMoney> findAllByState() {
+ return basicOtherMoneyMapper.selectList(
+ new QueryWrapper<BasicOtherMoney>().
+ eq("state",1).
+ like("`column`","S"));
}
}
--
Gitblit v1.8.0