Преглед на файлове

3.2.4 客户端bug修改

xiaofei преди 2 години
родител
ревизия
d94b353bc9

+ 1 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -56,9 +56,7 @@ public class ConditionServiceImpl implements ConditionService {
     @Override
     public List<BasicExam> listExam(Long semesterId, Boolean enable) {
         QueryWrapper<BasicExam> queryWrapper = new QueryWrapper<>();
-        if (semesterId != null) {
-            queryWrapper.lambda().eq(BasicExam::getSemesterId, semesterId);
-        }
+        queryWrapper.lambda().eq(BasicExam::getSemesterId, semesterId);
         if (enable != null) {
             queryWrapper.lambda().eq(BasicExam::getEnable, enable);
         }

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -874,7 +874,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         examDetailService.deleteExaminationData(printPlanId, null);
 
         // 卷袋号生成规则
-        SerialNumberParams serialNumberParams = new SerialNumberParams("packageCode-" + schoolId + "-" + examPrintPlan.getExamId(), "1", 6);
+        SerialNumberParams serialNumberParams = new SerialNumberParams("packageCode-" + schoolId, "1", 6);
         String key = serialNumberParams.getModel() + serialNumberParams.getPrefix();
         RedisAtomicLong counter = new RedisAtomicLong(key, Objects.requireNonNull(redisTemplate.getConnectionFactory()));
         Long value = counter.get();