From e15f561a1f9eddfde503d59baf45a860b131928e Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期三, 13 八月 2025 14:22:50 +0800
Subject: [PATCH] 更新最新版代码
---
src/main/java/com/flow/service/impl/CardServiceImpl.java | 80 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/flow/service/impl/CardServiceImpl.java b/src/main/java/com/flow/service/impl/CardServiceImpl.java
index f06d07d..a8d0296 100644
--- a/src/main/java/com/flow/service/impl/CardServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CardServiceImpl.java
@@ -14,10 +14,14 @@
import com.flow.service.OperationLogService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -39,23 +43,51 @@
return cardList;
}
- public PageInfo<Card> FindCarda(Integer page, Integer limit) {
- PageHelper.startPage(page, limit);
- List<Card> cardList = this.cardMapper.findAllUsers();
- PageInfo<Card> info = new PageInfo(cardList);
- return info;
+ public PageInfo<Card> FindCarda(Integer page, Integer limit,String daoqi,String entry) throws ParseException {
+ if (entry!=null && entry!=""){
+ if (Objects.equals(daoqi, "yes")){
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsersdaoqi(entry);
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }else{
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsers(entry);
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }
+ }else{
+ if (Objects.equals(daoqi, "yes")){
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsersdaoqi1();
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }else{
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsers2();
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }
+ }
+
+
+
}
- public PageInfo<Card> FindCardaZi(Card card, Integer page, Integer limit) {
- PageHelper.startPage(page, limit);
- String n = null;
- System.out.println(n);
- System.out.println("鍖楁瀬鏄熶簯绌洪棿鎶�鏈偂浠芥湁闄愬叕鍙�");
- System.out.println(card.getCompany());
- List<Card> cardList = this.cardMapper.findAllUsersZi(card.getCompany());
- System.out.println(cardList);
- PageInfo<Card> info = new PageInfo(cardList);
- return info;
+
+
+ public PageInfo<Card> FindCardaZi(Card card, Integer page, Integer limit,String daoqi) {
+ if (Objects.equals(daoqi, "yes")){
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsersdaoqizi(card.getCompany());
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }else{
+ PageHelper.startPage(page, limit);
+ List<Card> cardList = this.cardMapper.findAllUsersZi(card.getCompany());
+ PageInfo<Card> info = new PageInfo(cardList);
+ return info;
+ }
}
public int DeleteCard(String num,String caozuoname) {
@@ -101,7 +133,9 @@
for (int i=0;i<card.getCardnumber().split(",").length;i++){
QueryWrapper queryWrapper = new QueryWrapper();
+ System.out.println(card.getCardnumber().split(",")[i]);
queryWrapper.eq("cardnumber", card.getCardnumber().split(",")[i]);
+ queryWrapper.eq("none","0");
Card card1 = cardMapper.selectOne(queryWrapper);
card1.setCarddate(card.getCarddate());
card1.setUnitprice(card.getUnitprice());
@@ -134,6 +168,7 @@
public Card findnum(String num) {
QueryWrapper queryWrapper = new QueryWrapper();
+
queryWrapper.eq("cardnumber", num);
return (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
}
@@ -167,11 +202,7 @@
// Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
// Card card = new Card();
// card.setNone("1");
- OperationLog operationLog = new OperationLog();
- operationLog.setCaozuotype("鏂板");
- operationLog.setCaozuocontent("鏂板鍗″彿锛�"+card.getCardnumber());
- operationLog.setCaozuoname(card.getCaozuoname());
- operationLogService.addOperationLog(operationLog);
+
return ((CardMapper)this.baseMapper).insert(card);
}
@@ -186,22 +217,23 @@
info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
}else{
- info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
+ info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany().replaceAll("\\s", "")));
}
} else if (card.getCompany() != "") {
if (card.getCompany().equals("鍗庢槦鏅烘帶")) {
- info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
+ info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany().replaceAll("\\s", "")));
} else if (card.getCompany().equals("璁垮")){
info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
}else {
- queryWrapper.like("company", card.getCompany());
+ queryWrapper.like("company", card.getCompany().replaceAll("\\s", ""));
queryWrapper.eq("none", 0);
info = new PageInfo(((CardMapper)this.baseMapper).selectList(queryWrapper));
}
} else {
- queryWrapper.eq("company", card.getCompany());
+
+ queryWrapper.eq("company", card.getCompany().replaceAll("\\s", ""));
queryWrapper.eq("none", 0);
info = new PageInfo(((CardMapper)this.baseMapper).selectList(queryWrapper));
}
--
Gitblit v1.9.3