From 61747a14819075bf6da2c1597b6c22e22e026686 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 15 四月 2024 14:25:11 +0800
Subject: [PATCH] 4-15修改提交
---
src/main/java/com/flow/service/impl/CardServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 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..f06d07d 100644
--- a/src/main/java/com/flow/service/impl/CardServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CardServiceImpl.java
@@ -9,7 +9,9 @@
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.SimpleDateFormat;
@@ -18,12 +20,15 @@
import java.util.List;
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() {
}
@@ -41,24 +46,42 @@
return info;
}
- public PageInfo<Card> FindCardaZi(String company, Integer page, Integer limit) {
+ public PageInfo<Card> FindCardaZi(Card card, Integer page, Integer limit) {
PageHelper.startPage(page, limit);
- List<Card> cardList = this.cardMapper.findAllUsersZi(company);
+ 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 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);
}
@@ -69,6 +92,38 @@
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
card.setEnterdate(formatter.format(date));
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();
+ queryWrapper.eq("cardnumber", card.getCardnumber().split(",")[i]);
+ 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) {
@@ -109,6 +164,14 @@
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");
+ OperationLog operationLog = new OperationLog();
+ operationLog.setCaozuotype("鏂板");
+ operationLog.setCaozuocontent("鏂板鍗″彿锛�"+card.getCardnumber());
+ operationLog.setCaozuoname(card.getCaozuoname());
+ operationLogService.addOperationLog(operationLog);
return ((CardMapper)this.baseMapper).insert(card);
}
@@ -119,6 +182,9 @@
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()));
@@ -126,7 +192,10 @@
} else if (card.getCompany() != "") {
if (card.getCompany().equals("鍗庢槦鏅烘帶")) {
info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
- } else {
+ } else if (card.getCompany().equals("璁垮")){
+ info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
+
+ }else {
queryWrapper.like("company", card.getCompany());
queryWrapper.eq("none", 0);
info = new PageInfo(((CardMapper)this.baseMapper).selectList(queryWrapper));
--
Gitblit v1.9.3