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 | 133 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/flow/service/impl/CardServiceImpl.java b/src/main/java/com/flow/service/impl/CardServiceImpl.java
index d48cd14..a8d0296 100644
--- a/src/main/java/com/flow/service/impl/CardServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CardServiceImpl.java
@@ -9,21 +9,30 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.flow.mapper.CardMapper;
import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
import com.flow.service.CardService;
+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;
@Service
public class CardServiceImpl extends ServiceImpl<CardMapper, Card> implements CardService {
@Autowired
CardMapper cardMapper;
+ @Autowired
+ OperationLogService operationLogService;
public CardServiceImpl() {
}
@@ -34,31 +43,77 @@
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(String company, Integer page, Integer limit) {
- PageHelper.startPage(page, limit);
- List<Card> cardList = this.cardMapper.findAllUsersZi(company);
- 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) {
+ public int DeleteCard(String num,String caozuoname) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("num", num);
+ Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
Card card = new Card();
card.setNone("1");
+ OperationLog operationLog = new OperationLog();
+ operationLog.setCaozuotype("鍒犻櫎");
+ operationLog.setCaozuocontent("鍒犻櫎鍗″彿锛�"+card1.getCardnumber());
+ operationLog.setCaozuoname(caozuoname);
+ operationLogService.addOperationLog(operationLog);
+
return ((CardMapper)this.baseMapper).update(card, queryWrapper);
}
public int UpdateCard(Card card) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("num", card.getNum());
+// Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
+// OperationLog operationLog = new OperationLog();
+// operationLog.setCaozuotype("淇敼");
+// operationLog.setCaozuocontent("淇敼鍗″彿锛�"+card1.getCardnumber());
+// operationLog.setCaozuoname(card1.getCaozuoname());
+// operationLogService.addOperationLog(operationLog);
return ((CardMapper)this.baseMapper).update(card, queryWrapper);
}
@@ -71,6 +126,40 @@
return ((CardMapper)this.baseMapper).update(card, queryWrapper);
}
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public boolean updateBatchById(Card card) {
+ List<Card> list = new ArrayList<>();
+
+ 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());
+ card1.setEnddate(card.getEnddate());
+// Date date = new Date();
+// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ card1.setEnterdate(formatter.format(date));
+// operationLog.setCaozuodate(formatter.format(date));
+ list.add(card1);
+
+ }
+
+ cardMapper.updateBatchById(list);
+// QueryWrapper queryWrapper = new QueryWrapper();
+// queryWrapper.eq("cardnumber", card.getCardnumber());
+// Date date = new Date();
+// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// card.setEnterdate(formatter.format(date));
+ return true;
+ }
+
public int UpdateCardNum(Card card) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("cardnumber", card.getCardnumber());
@@ -79,6 +168,7 @@
public Card findnum(String num) {
QueryWrapper queryWrapper = new QueryWrapper();
+
queryWrapper.eq("cardnumber", num);
return (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
}
@@ -109,6 +199,10 @@
Date date = new Date();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
card.setEnterdate(formatter.format(date));
+// Card card1 = (Card)((CardMapper)this.baseMapper).selectOne(queryWrapper);
+// Card card = new Card();
+// card.setNone("1");
+
return ((CardMapper)this.baseMapper).insert(card);
}
@@ -119,20 +213,27 @@
if (card.getCardnumber() != "" && card.getCompany() != "") {
if (card.getCompany().equals("鍗庢槦鏅烘帶")){
info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
+ }else if (card.getCompany().equals("璁垮")){
+ 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()));
- } else {
- queryWrapper.like("company", 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().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