更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolImportParam.java

@@ -24,6 +24,7 @@ public class CardInfoPoolImportParam {
     private String name;
 
     @Schema(description = "卡片类型")
+    @Excel(name = "卡片类型")
     private String cardType;
 
     @Excel(name = "uid")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoPoolService.java

@@ -164,6 +164,7 @@ public class CardInfoPoolService extends SuperService {
      * @return
      */
     public ResultContent<ImportResultModel> importCardPool(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
+        // 当前的学校
         String oid = getCurrentOid();
         Assert.hasText(oid, "oid不能为空");
 
@@ -209,7 +210,9 @@ public class CardInfoPoolService extends SuperService {
                         BeanUtils.copyProperties(param1, pool, "cardType");
                         pool.setSchoolOid(schoolOid);
                         pool.setProjectOid(projectOid);
+                        // 初始状态为  未使用
                         pool.setIsUsed(Boolean.FALSE);
+                        // 对比出卡片类型
                         CardType cardType = CommonUtil.getCardTypeByStr(param1.getCardType());
                         pool.setCardType(cardType);
                         cardInfoPools.add(pool);

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/CommonUtil.java

@@ -498,9 +498,9 @@ public class CommonUtil {
     public static CardType getCardTypeByStr(String str) {
         if (StringUtils.isNotEmpty(str)) {
             str = str.trim();
-            for (CardType sex : CardType.values()) {
-                if (sex.getRemark().equals(str)) {
-                    return sex;
+            for (CardType cardType : CardType.values()) {
+                if (cardType.getRemark().equals(str)) {
+                    return cardType;
                 }
             }
         }