修改方案查询

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeMapper.java

@@ -34,4 +34,6 @@ public interface SchemeMapper extends BaseMapper<SchemeInfo> {
      * @return 方案信息
      */
     SchemeInfo getById(@Param("id") Integer id);
+
+    int getByType(@Param("type") Integer type);
 }

wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml

@@ -103,4 +103,14 @@
         </where>
     </select>
 
+    <select id="getByType" resultType="int">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            type=#{type}
+            and is_delete=0
+        </where>
+    </select>
+
 </mapper>

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java

@@ -65,7 +65,7 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
         VolunteerListener excelListener = new VolunteerListener();
 
         //2.读取数据进行入库操作
-        EasyExcel.read(file.getInputStream(), Volunteer.class,excelListener).sheet().doRead();
+        EasyExcel.read(file.getInputStream(), Volunteer.class, excelListener).sheet().doRead();
         List<Volunteer> list = excelListener.getList();
         if (CollectionUtils.isEmpty(list)) {
             throw new BaseException("写入方案数据失败!");
@@ -78,6 +78,10 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
         schemeInfo.setFileUrl(fileUrl);
         schemeInfo.setUploadTime(new Date());
         schemeInfo.setIsDelete(0);
+        int scheme = schemeMapper.getByType(type);
+        if (scheme > 0) {
+            throw new RuntimeException("该类型方案已经存在!");
+        }
 
         volunteerManager.saveSchemeAndVolunteer(schemeInfo, list);
     }

wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java

@@ -14,12 +14,15 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 
+/**
+ * @author 86187
+ */
 @Component
 @Slf4j
 public class RefillCardManager {
 
     @Autowired
-    RefillCardMapper refillCardMapper;
+    private RefillCardMapper refillCardMapper;
 
     @Autowired
     private CardMapper cardMapper;

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java

 package cn.wisenergy.service.common;
 
 import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.service.app.VolunteerService;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.metadata.Head;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Excel批量添加社区居民  监听器

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -11,12 +11,10 @@ import cn.wisenergy.model.vo.UserInfoVo;
 import cn.wisenergy.service.app.UserLimitService;
 import cn.wisenergy.service.app.UserVolunteerService;
 import cn.wisenergy.service.app.VolunteerService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;