From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index 1d6cfb7..3a4c5e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -30,9 +31,6 @@
@Resource
private SpecialCardMapper specialCardMapper;
-
- @Resource
- private BusinessSystemService businessSystemService;
@Resource
private SpecialService specialService;
@@ -156,7 +154,6 @@
/**
* 鍒犻櫎鍥剧墖-涓嶆洿鏂版暟鎹簱
- * @param record
* @throws Exception
*/
public void removePicture(String picture) throws Exception {
@@ -174,9 +171,9 @@
}
@Override
- public List<SpecialCard> listQuery(long start, int count, String key, Integer sort) {
+ public List<SpecialCard> listQuery(long start, int count, String key, Integer sort, List<Long> listPid, SystemEnum system) {
- List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key);
+ List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key, listPid,system);
if (listObj == null || listObj.size() == 0) {
return null;
}
@@ -184,6 +181,14 @@
for (SpecialCard specialCard: listObj) {
long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null, null);
specialCard.setTotalSpecial(totalSpecial);
+
+ // 灏嗙姸鎬佸彉鍖�
+ if (specialCard.getState() != null && specialCard.getState() == 0) {
+ specialCard.setState(1);
+ } else {
+ specialCard.setState(0);
+ }
+
Date startTime = specialCard.getStartTime();
Date endTime = specialCard.getEndTime();
@@ -217,16 +222,39 @@
}
@Override
- public long countlistQuery(String key) {
- return specialCardMapper.countlistQuery(key);
+ public long countlistQuery(String key, List<Long> listPid, SystemEnum system) {
+ return specialCardMapper.countlistQuery(key, listPid,system);
}
@Override
- public String getbottomPicture(String placeKey) {
- return specialCardMapper.getbottomPicture(placeKey);
+ public String getbottomPicture(String placeKey, SystemEnum system) {
+ return specialCardMapper.getbottomPicture(placeKey,system);
}
+ @Override
+ public void switchState(Long id) throws SpecialCardException {
+ if (id == null) {
+ throw new SpecialCardException(1, "璇蜂紶閫掓纭弬鏁�");
+ }
+
+ SpecialCard resultObj = specialCardMapper.selectByPrimaryKey(id);
+ if (resultObj == null) {
+ throw new SpecialCardException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
+ }
+
+ Integer state = resultObj.getState();
+ if (state == null || state == 0) {
+ state = 1;
+ } else {
+ state = 0;
+ }
+
+ SpecialCard updateObj = new SpecialCard();
+ updateObj.setId(id);
+ updateObj.setState(state);
+ specialCardMapper.updateByPrimaryKeySelective(updateObj);
+ }
}
--
Gitblit v1.8.0