修复bug

back-ui/src/views/dz/campus/index.vue

@@ -226,10 +226,10 @@
       status: null,
     },
     rules: {
-      status: [
-        { required: true, message: "状态不能为空", trigger: "change" },
-        { required: true, message: "机构不能为空", trigger: "change" }
-      ],
+      // status: [
+      //   { required: true, message: "状态不能为空", trigger: "change" },
+      //   { required: true, message: "机构不能为空", trigger: "change" }
+      // ],
     }
   })
 
@@ -318,7 +318,7 @@
       createTime: null,
       updateTime: null
     }
-    proxy.resetForm("CampusRef")
+    proxy.resetForm("campusRef")
   }
 
   /** 搜索按钮操作 */
@@ -369,7 +369,7 @@
 
   /** 提交按钮 */
   function submitForm() {
-    proxy.$refs["CampusRef"].validate(valid => {
+    proxy.$refs["campusRef"].validate(valid => {
       if (valid) {
         // 构建省市区对象
         let areaObj = {

back-ui/src/views/dz/cards/config/form.js

@@ -80,8 +80,8 @@ const info = [
     search: true,
   },
   {
-    label: "分配考生类别",
-    name: "studentCategory",
+    label: "分配考生类型",
+    name: "examType",
     value: "",
     type: "select",
     option: [],
@@ -123,13 +123,10 @@ const info = [
   },
   {
     label: "结算状态",
-    name: "isSettlement",
+    name: "payStatus",
     value: "",
     type: "select",
-    option: [
-      { label: "是", value: 1 },
-      { label: "否", value: 0 },
-    ],
+    option: [],
     optionLabel: "label",
     optionValue: "value",
     search: true,

back-ui/src/views/dz/cards/index.vue

@@ -175,7 +175,7 @@
       <template #studentInfo="{ row }">
         <div class="student-info">
           <div class="student-name">{{ row.nickName || "-" }}</div>
-          <div class="student-phone">{{ row.mobile || "-" }}</div>
+          <div class="student-phone">{{ row.phonenumber || "-" }}</div>
         </div>
       </template>
     </Table>
@@ -293,6 +293,7 @@ import { getClassesBySchoolId } from "@/api/dz/classes";
 
 const { proxy } = getCurrentInstance();
 const {
+  exam_type,
   card_status,
   card_distribute_status,
   card_time_status,
@@ -300,6 +301,7 @@ const {
   card_pay_status,
   card_type,
 } = proxy.useDict(
+  "exam_type",
   "card_status",
   "card_distribute_status",
   "card_time_status",
@@ -375,6 +377,9 @@ const searchConfig = computed(() => {
       case "campusId":
         item.option = campusList.value || [];
         break;
+      case "examType":
+        item.option = exam_type.value || [];
+        break;
     }
   });
 

back-ui/src/views/dz/school/index.vue

@@ -226,10 +226,10 @@
       status: null,
     },
     rules: {
-      status: [
-        { required: true, message: "状态不能为空", trigger: "change" },
-        { required: true, message: "机构不能为空", trigger: "change" }
-      ],
+      // status: [
+      //   { required: true, message: "状态不能为空", trigger: "change" },
+      //   { required: true, message: "机构不能为空", trigger: "change" }
+      // ],
     }
   })
 

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzSchoolController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.dz;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -174,9 +175,32 @@ public class DzSchoolController extends BaseController
             dzClass.setStatus(BoolValues.yes.getValue());
             classesService.insertDzClasses(dzClass);
         }
+//        generate();
         return toAjax(id);
     }
 
+    private void generate(){
+        List<Integer> schoolList = Arrays.asList(2,4,8,14,29,30,31,32,33,34,42,43,45,51,54,55,56,66,70,71,73,74,76,77,79,80,86,87,89,91,
+                92,93,94,95,97,98,108,110,111,112,114,115,117,118,119,121,122,124,126,127,130,131,132,133,134,135,136,137,138,139,140,142,143,145,146,149,151,153,173,174,175,176,182,183,184,185,186,187,188,189,204,205,206,207,250,251,252,253,254,255,257,262,263,264,265,266,273,274,275,284,358,359,360,361,362,363,364,365,366,376,377,427,428,440,441,452,453,454,455,456,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,480,481,482,483,484,485,486,487,488,489,527,528,555,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,591,592,593,594,595,596,
+                597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,668,669,670,671,672,673,674,675,679,680,681,682,683,688,689,690,691,692,723,724,725,726,727,728,732,733,734,735,736,747,748,749,760,761,762,763,764,765,766,784,785,786,787,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,832,833,834,835,836,837,838,839,840,
+                841,842,843,847,848,856,857,865,866,867,868,877,878,879,880,881,882,883,884,889,890,906,907,908,909,910,911,920,921,922,923,924,929,930,931,932,933,934,935,936,937,938,939,1000,1001,1002,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1071,1072,1073,1074,1075,1076,1077,1078,1083,1084,1085,1086,1087,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,
+                1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1208,1209,1210,1211,1212,1247,1248,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1285,1286,1287,1288,1289,1299,1300,1301,1302,1303,1304,1305,1306,1307,1317,1318,1319,1320,1326,1327,1328,1329,1330,1331,1332,1333,1343,1344,1345,1349,1350,1351,1361,1362,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,
+                1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1417,1430,1439,1440,1447,1448,1452,1453,1454,1455,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,1491,1492,1493,1494,1495,1595,1596,1597,1598,1599,1600,1601,1602,1603,1620,1621,1622,1623,1624,1625,1639,1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1683,1684,1685,1686,1687,1688,1689,1723,1724,1725,1727,1728
+                );
+        for (Integer id : schoolList) {
+            for (int i = 0; i < 30; i++) {
+                DzClasses dzClass = new DzClasses();
+                dzClass.setSchoolId(Long.valueOf(id));
+                dzClass.setName( String.valueOf(i + 1));
+                dzClass.setIsDefault(BoolValues.yes.getValue());
+                dzClass.setOnline(BoolValues.yes.getValue());
+                dzClass.setStatus(BoolValues.yes.getValue());
+                classesService.insertDzClasses(dzClass);
+            }
+        }
+
+    }
+
     /**
      * 修改机构校区
      */

ie-system/src/main/java/com/ruoyi/dz/domain/DzCards.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 学习卡对象 dz_cards
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
@@ -150,52 +150,71 @@ public class DzCards extends BaseEntity
     /** 校区班级ID */
     private String className;
 
-    public void setCardId(Long cardId) 
+    private String nickName;
+    private String phonenumber;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public void setCardId(Long cardId)
     {
         this.cardId = cardId;
     }
 
-    public Long getCardId() 
+    public Long getCardId()
     {
         return cardId;
     }
 
-    public void setCardNo(String cardNo) 
+    public void setCardNo(String cardNo)
     {
         this.cardNo = cardNo;
     }
 
-    public String getCardNo() 
+    public String getCardNo()
     {
         return cardNo;
     }
 
-    public void setPassword(String password) 
+    public void setPassword(String password)
     {
         this.password = password;
     }
 
-    public String getPassword() 
+    public String getPassword()
     {
         return password;
     }
 
-    public void setType(Integer type) 
+    public void setType(Integer type)
     {
         this.type = type;
     }
 
-    public Integer getType() 
+    public Integer getType()
     {
         return type;
     }
 
-    public void setStatus(Integer status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Integer getStatus() 
+    public Integer getStatus()
     {
         return status;
     }
@@ -213,17 +232,17 @@ public class DzCards extends BaseEntity
         this.distributeStatus = distributeStatus;
     }
 
-    public Integer getDistributeStatus() 
+    public Integer getDistributeStatus()
     {
         return distributeStatus;
     }
 
-    public void setTimeStatus(Integer timeStatus) 
+    public void setTimeStatus(Integer timeStatus)
     {
         this.timeStatus = timeStatus;
     }
 
-    public Integer getTimeStatus() 
+    public Integer getTimeStatus()
     {
         return timeStatus;
     }
@@ -238,32 +257,32 @@ public class DzCards extends BaseEntity
         return payStatus;
     }
 
-    public void setIsSettlement(Integer isSettlement) 
+    public void setIsSettlement(Integer isSettlement)
     {
         this.isSettlement = isSettlement;
     }
 
-    public Integer getIsSettlement() 
+    public Integer getIsSettlement()
     {
         return isSettlement;
     }
 
-    public void setDeptId(Long deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }
 
-    public void setAgentId(Long agentId) 
+    public void setAgentId(Long agentId)
     {
         this.agentId = agentId;
     }
 
-    public Long getAgentId() 
+    public Long getAgentId()
     {
         return agentId;
     }
@@ -278,32 +297,32 @@ public class DzCards extends BaseEntity
         return leafAgentId;
     }
 
-    public void setCampusId(Long campusId) 
+    public void setCampusId(Long campusId)
     {
         this.campusId = campusId;
     }
 
-    public Long getCampusId() 
+    public Long getCampusId()
     {
         return campusId;
     }
 
-    public void setAssignSchoolId(Long assignSchoolId) 
+    public void setAssignSchoolId(Long assignSchoolId)
     {
         this.assignSchoolId = assignSchoolId;
     }
 
-    public Long getAssignSchoolId() 
+    public Long getAssignSchoolId()
     {
         return assignSchoolId;
     }
 
-    public void setSchoolId(Long schoolId) 
+    public void setSchoolId(Long schoolId)
     {
         this.schoolId = schoolId;
     }
 
-    public Long getSchoolId() 
+    public Long getSchoolId()
     {
         return schoolId;
     }
@@ -338,92 +357,92 @@ public class DzCards extends BaseEntity
         return endYear;
     }
 
-    public void setOpenId(Long openId) 
+    public void setOpenId(Long openId)
     {
         this.openId = openId;
     }
 
-    public Long getOpenId() 
+    public Long getOpenId()
     {
         return openId;
     }
 
-    public void setDistributeTime(Date distributeTime) 
+    public void setDistributeTime(Date distributeTime)
     {
         this.distributeTime = distributeTime;
     }
 
-    public Date getDistributeTime() 
+    public Date getDistributeTime()
     {
         return distributeTime;
     }
 
-    public void setOutDate(Date outDate) 
+    public void setOutDate(Date outDate)
     {
         this.outDate = outDate;
     }
 
-    public Date getOutDate() 
+    public Date getOutDate()
     {
         return outDate;
     }
 
-    public void setOpenTime(Date openTime) 
+    public void setOpenTime(Date openTime)
     {
         this.openTime = openTime;
     }
 
-    public Date getOpenTime() 
+    public Date getOpenTime()
     {
         return openTime;
     }
 
-    public void setPayTime(Date payTime) 
+    public void setPayTime(Date payTime)
     {
         this.payTime = payTime;
     }
 
-    public Date getPayTime() 
+    public Date getPayTime()
     {
         return payTime;
     }
 
-    public void setActiveTime(Date activeTime) 
+    public void setActiveTime(Date activeTime)
     {
         this.activeTime = activeTime;
     }
 
-    public Date getActiveTime() 
+    public Date getActiveTime()
     {
         return activeTime;
     }
 
-    public void setSettlementTime(Date settlementTime) 
+    public void setSettlementTime(Date settlementTime)
     {
         this.settlementTime = settlementTime;
     }
 
-    public Date getSettlementTime() 
+    public Date getSettlementTime()
     {
         return settlementTime;
     }
 
-    public void setRefundTime(Date refundTime) 
+    public void setRefundTime(Date refundTime)
     {
         this.refundTime = refundTime;
     }
 
-    public Date getRefundTime() 
+    public Date getRefundTime()
     {
         return refundTime;
     }
 
-    public void setCloseTime(Date closeTime) 
+    public void setCloseTime(Date closeTime)
     {
         this.closeTime = closeTime;
     }
 
-    public Date getCloseTime() 
+    public Date getCloseTime()
     {
         return closeTime;
     }

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzCardsServiceImpl.java

@@ -19,6 +19,7 @@ import com.ruoyi.dz.domain.*;
 import com.ruoyi.dz.mapper.*;
 import com.ruoyi.enums.*;
 import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,12 +30,12 @@ import javax.validation.ValidationException;
 
 /**
  * 学习卡Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
 @Service
-public class DzCardsServiceImpl implements IDzCardsService 
+public class DzCardsServiceImpl implements IDzCardsService
 {
     @Autowired
     private DzCardsMapper dzCardsMapper;
@@ -48,12 +49,14 @@ public class DzCardsServiceImpl implements IDzCardsService
     private DzSchoolMapper dzSchoolMapper;
     @Autowired
     private DzClassesMapper dzClassesMapper;
+    @Autowired
+    private SysUserMapper userMapper;
 
     private final String format = "%d%08d";
 
     /**
      * 查询学习卡
-     * 
+     *
      * @param cardId 学习卡主键
      * @return 学习卡
      */
@@ -77,7 +80,11 @@ public class DzCardsServiceImpl implements IDzCardsService
         Set<Long> schoolIdSet = Sets.newHashSet();
         Set<Long> deptIdSet = Sets.newHashSet();
         Set<Long> agentIdSet = Sets.newHashSet();
+        Set<Long> cardIdSet = Sets.newHashSet();
         for(DzCards c : list) {
+            if(null != c.getCardId()) {
+                cardIdSet.add(c.getCardId());
+            }
             if(null != c.getClassId()) {
                 classIdSet.add(c.getClassId());
             }
@@ -104,6 +111,8 @@ public class DzCardsServiceImpl implements IDzCardsService
         Map<Long, String> schoolMap = !schoolIdSet.isEmpty() ? dzSchoolMapper.selectDzSchoolListByIds(schoolIdSet).stream().collect(Collectors.toMap(DzSchool::getId, DzSchool::getName)) : Maps.newHashMap();;
         Map<Long, String> agentMap = !agentIdSet.isEmpty() ? dzAgentMapper.selectDzAgentByAgentIds(agentIdSet).stream().collect(Collectors.toMap(DzAgent::getAgentId, DzAgent::getName)) : Maps.newHashMap();
         Map<Long, String> classesMap = !classIdSet.isEmpty() ? dzClassesMapper.selectClassesByIds(classIdSet).stream().collect(Collectors.toMap(DzClasses::getClassId, DzClasses::getName)) : Maps.newHashMap();
+        Map<Long, SysUser> userMap = !cardIdSet.isEmpty() ? userMapper.selectUserByCardIds(cardIdSet).stream() .collect(Collectors.toMap( SysUser::getCardId, user -> user, (existing, replacement) -> existing)) : new HashMap<>();
+
         for(DzCards c : list) {
             c.setClassName(classesMap.get(c.getClassId()));
             c.setAssignSchoolName(schoolMap.get(c.getAssignSchoolId()));
@@ -114,13 +123,17 @@ public class DzCardsServiceImpl implements IDzCardsService
                 String name = agentMap.get(c.getAgentId());
                 c.setAgentName(null != c.getLeafAgentId() && !c.getLeafAgentId().equals(c.getAgentId()) ? agentMap.get(c.getLeafAgentId()) + "(" + name + ")" : name);
             }
+            if (userMap.containsKey(c.getCardId())) {
+                c.setPhonenumber(userMap.get(c.getCardId()).getPhonenumber());
+                c.setNickName(userMap.get(c.getCardId()).getNickName());
+            }
         }
         return list;
     }
 
     /**
      * 查询学习卡列表
-     * 
+     *
      * @param dzCards 学习卡
      * @return 学习卡
      */
@@ -132,7 +145,7 @@ public class DzCardsServiceImpl implements IDzCardsService
 
     /**
      * 新增学习卡
-     * 
+     *
      * @param dzCards 学习卡
      * @return 结果
      */
@@ -145,7 +158,7 @@ public class DzCardsServiceImpl implements IDzCardsService
 
     /**
      * 修改学习卡
-     * 
+     *
      * @param dzCards 学习卡
      * @return 结果
      */
@@ -158,7 +171,7 @@ public class DzCardsServiceImpl implements IDzCardsService
 
     /**
      * 批量删除学习卡
-     * 
+     *
      * @param cardIds 需要删除的学习卡主键
      * @return 结果
      */
@@ -170,7 +183,7 @@ public class DzCardsServiceImpl implements IDzCardsService
 
     /**
      * 删除学习卡信息
-     * 
+     *
      * @param cardId 学习卡主键
      * @return 结果
      */

ie-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.mapper;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
@@ -7,14 +8,14 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 
 /**
  * 用户表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysUserMapper
 {
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
@@ -22,15 +23,16 @@ public interface SysUserMapper
 
     /**
      * 根据条件分页查询已配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
     public List<SysUser> selectAllocatedList(SysUser user);
+    public List<SysUser> selectUserByCardIds(@Param("ids")Collection<Long> cardIds);
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -38,7 +40,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -53,7 +55,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -61,7 +63,7 @@ public interface SysUserMapper
 
     /**
      * 新增用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -69,7 +71,7 @@ public interface SysUserMapper
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -77,7 +79,7 @@ public interface SysUserMapper
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userId 用户ID
      * @param avatar 头像地址
      * @return 结果
@@ -86,7 +88,7 @@ public interface SysUserMapper
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param userId 用户ID
      * @param status 状态
      * @return 结果
@@ -95,7 +97,7 @@ public interface SysUserMapper
 
     /**
      * 更新用户登录信息（IP和登录时间）
-     * 
+     *
      * @param userId 用户ID
      * @param loginIp 登录IP地址
      * @param loginDate 登录时间
@@ -105,7 +107,7 @@ public interface SysUserMapper
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userId 用户ID
      * @param password 密码
      * @return 结果
@@ -114,7 +116,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -122,7 +124,7 @@ public interface SysUserMapper
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -130,7 +132,7 @@ public interface SysUserMapper
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */

ie-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -35,7 +36,7 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUnallocatedList(SysUser user);
-
+    public List<SysUser> selectUserByCardIds(Collection<Long> cardIds);
     /**
      * 通过用户名查询用户
      *

ie-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -112,6 +113,11 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUnallocatedList(user);
     }
 
+    @Override
+    public List<SysUser> selectUserByCardIds(Collection<Long> cardIds) {
+        return userMapper.selectUserByCardIds(cardIds);
+    }
+
     /**
      * 通过用户名查询用户
      *

ie-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -148,6 +148,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.user_id = #{userId}
 	</select>
 
+	<select id="selectUserByCardIds" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.card_id in <foreach collection="ids" item="id" open="(" separator="," close=")">#{id}</foreach>
+	</select>
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>