Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

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

@@ -14,6 +14,7 @@ import com.ruoyi.dz.domain.DzAgent;
 import com.ruoyi.dz.domain.DzSchool;
 import com.ruoyi.dz.mapper.DzAgentMapper;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
+import com.ruoyi.enums.CardType;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.dz.service.IDzCardsService;
 import com.ruoyi.enums.CardAudit;
@@ -122,6 +123,7 @@ public class DzCardsOpenController extends BaseController
         
         // 填充schoolName、agentName和deptName
         for (DzCardsOpen item : list) {
+            item.setCardType(CardType.getNewVal(item.getCardType()));
             if (item.getSchoolId() != null && schoolMap.containsKey(item.getSchoolId())) {
                 item.setSchoolName(schoolMap.get(item.getSchoolId()));
             }

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

@@ -243,6 +243,20 @@ public class DzCardsServiceImpl implements IDzCardsService
         cond.setStartNo(beginNo);
         cond.setEndNo(endNo);
         DzCards dzCards = new DzCards();
+
+        DzCardsOpen newOpen = new DzCardsOpen();
+        newOpen.setAgentId(leafAgentId);
+        newOpen.setCardType(cardType.getVal());
+        newOpen.setStartNo(beginNo);
+        newOpen.setEndNo(endNo);
+        newOpen.setEndDate(DateUtils.addDays(DateUtils.getNowDate(), null == days ? 14 : days)); // TODO MF 卡默认有效期
+        newOpen.setSchoolId(schoolId);
+        newOpen.setLocation(location);
+        newOpen.setSender(SecurityUtils.getLoginUser().getUser().getNickName());
+        newOpen.setIsReopen(0);
+        newOpen.setStatus(RequestStatus.Accept.getVal());
+        dzCardsOpenMapper.insertDzCardsOpen(newOpen);
+
         dzCardsMapper.selectListByCond(cond).stream().forEach(c -> {
             dzCards.setCardId(c.getCardId());
             if(null != c.getAgentId() && !c.getAgentId().equals(agentId)) {