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

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

@@ -157,9 +157,17 @@ public class DzCardsController extends BaseController
         return AjaxResult.success(dzCardsService.openCard(schoolId, agentId, begin, end));
     }
 
+    @Log(title = "分配校区", businessType = BusinessType.INSERT)
+    @PostMapping("/changeCampus")
+    @ApiOperation("分配校区")
+    public AjaxResult changeCampus(@ApiParam("校区") Long campusId, @ApiParam("开始号") String begin, @ApiParam("结束号") String end)
+    {
+        return AjaxResult.success(dzCardsService.changeCampus(campusId, begin, end));
+    }
+
     @Log(title = "申请开卡", businessType = BusinessType.INSERT)
     @PostMapping("/requestOpenCard")
-    @ApiOperation("分配卡")
+    @ApiOperation("申请开卡")
     public AjaxResult requestOpenCard(@ApiParam("学校") Long schoolId, @ApiParam("开始号") String begin, @ApiParam("结束号") String end)
     {
         Long agentId = SecurityUtils.getLoginUser().getUser().getUserTypeId();

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

@@ -114,4 +114,13 @@ public interface IDzCardsService
      * @param cardIds
      */
     public void changeCard(CardAction action, Long[] cardIds);
+
+    /**
+     * 分配校区
+     * @param campusId
+     * @param beginNo
+     * @param endNo
+     * @return
+     */
+    public Boolean changeCampus(Long campusId, String beginNo, String endNo);
 }

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

@@ -219,6 +219,7 @@ public class DzCardsServiceImpl implements IDzCardsService
             dzCards.setAssignLocation(location);
             dzCards.setAssignExamType(null != examType ? examType.name() : null);
             dzCards.setAssignSchoolId(schoolId);
+            dzCards.setDistributeStatus(CardDistributeStatus.Assign.getVal());
             dzCardsMapper.updateDzCards(dzCards);
         });
     }
@@ -308,6 +309,7 @@ public class DzCardsServiceImpl implements IDzCardsService
                 throw new ValidationException("重复支付已支付卡: " + StringUtils.join(cardIds, ","));
             }
             up.setPayStatus(PayStatus.Paid.getVal());
+            up.setStatus(CardStatus.Paid.getVal());
             up.setPayTime(DateUtils.getNowDate());
         } else if(CardAction.Close.equals(action)) {
             if(cards.stream().filter(t -> t.getDistributeStatus().equals(CardDistributeStatus.Close.getVal())).count() > 0) {
@@ -334,4 +336,18 @@ public class DzCardsServiceImpl implements IDzCardsService
             dzCardsMapper.updateDzCards(up);
         }
     }
+
+    public Boolean changeCampus(Long campusId, String beginNo, String endNo) {
+        CardCriteria cond = new CardCriteria();
+        cond.setStartNo(beginNo);
+        cond.setEndNo(endNo);
+        List<DzCards> cards = dzCardsMapper.selectListByCond(cond);
+        DzCards dzCards = new DzCards();
+        cards.stream().forEach(c -> {
+            dzCards.setCardId(c.getCardId());
+            dzCards.setCampusId(campusId);
+            dzCardsMapper.updateDzCards(dzCards);
+        });
+        return true;
+    }
 }