bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamCardMapper.java

@@ -27,4 +27,6 @@ public interface ExamCardMapper extends BaseMapper<ExamCard> {
     List<ExamCard> listGenericCard(@Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("type") String type);
 
     List<ExamCard> listCustom(@Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("courseCode") String courseCode, @Param("type") String type);
+
+    CardDetailDto getCardDetailBySelect(Long cardId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java

@@ -119,7 +119,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 ExamCard examCard = examCardService.getOneByTemplateId(template.getId());
                 ExamCardParams examCardParams = new ExamCardParams();
                 examCardParams.setId(examCard == null ? null : examCard.getId());
-                examCardParams.setTitle(attachment.getName());
+                examCardParams.setTitle(template.getName());
                 examCardParams.setMakeMethod(MakeMethodEnum.SELECT);// 默认SELECT
                 examCardParams.setType(CardTypeEnum.GENERIC); // 默认GENERIC
                 examCardParams.setTemplateId(template.getId());
@@ -127,7 +127,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 examCardParams.setHtmlContent(commonService.readFileContent(attachment.getPath()));
                 examCardService.saveExamCard(examCardParams);
             } else {
-                examCard1.setTitle(attachment.getName());
+                examCard1.setTitle(template.getName());
                 examCardService.updateById(examCard1);
 
                 ExamCardDetail examCardDetail = examCardDetailService.getByCardId(examCard1.getId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
+import com.qmth.distributed.print.business.enums.ExamCardStatusEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.mapper.ExamCardMapper;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
@@ -168,7 +169,12 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
 
     @Override
     public CardDetailDto getCardDetail(Long cardId) {
-        return this.baseMapper.getCardDetail(cardId);
+        ExamCard examCard = this.getById(cardId);
+        if(!MakeMethodEnum.SELECT.equals(examCard.getMakeMethod())){
+            return this.baseMapper.getCardDetail(cardId);
+        } else {
+            return this.baseMapper.getCardDetailBySelect(cardId);
+        }
     }
 
     @Override

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -597,6 +597,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Transactional
     @Override
     public boolean saveExamTaskDetail(ExamTaskDetail examTaskDetail) throws IOException {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         if (examTaskDetail.getExamTaskId() == null) {
             throw ExceptionResultEnum.ERROR.exception("命题任务ID不能为空");
         }
@@ -634,7 +635,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(ExamTask::getStatus, ExamStatusEnum.valueOf(examTaskDetail.getOperateType())).set(ExamTask::getReviewStatus, null).eq(ExamTask::getId, examTask.getId());
+        updateWrapper.lambda()
+                .set(ExamTask::getStatus, ExamStatusEnum.valueOf(examTaskDetail.getOperateType()))
+                .set(ExamTask::getUpdateId, sysUser.getId())
+                .set(ExamTask::getUpdateTime, System.currentTimeMillis())
+                .set(ExamTask::getReviewStatus, null)
+                .eq(ExamTask::getId, examTask.getId());
         this.update(updateWrapper);
 
         QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
@@ -649,6 +655,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             // 已曝光试卷和未曝光试卷赋值（新增时，已曝光试卷为null，未曝光试卷为paper_type）
             examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
         }
+        examTaskDetail.setUpdateId(sysUser.getId());
+        examTaskDetail.setUpdateTime(System.currentTimeMillis());
 
         return examTaskDetailService.saveOrUpdate(examTaskDetail);
     }

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -133,4 +133,18 @@
                 a.id = b.card_id)
         order by a.create_time desc
     </select>
+    <select id="getCardDetailBySelect" resultType="com.qmth.distributed.print.business.bean.dto.CardDetailDto">
+        SELECT
+            a.id cardId,
+            a.title,
+            a.make_method makeMethod,
+            a.type,
+            b.content,
+            b.html_content htmlContent
+        FROM
+            exam_card a
+                LEFT JOIN
+            exam_card_detail b ON a.id = b.card_id
+        where a.id = #{cardId}
+    </select>
 </mapper>

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -331,7 +331,7 @@
             a.start_time startTime,
             a.end_time endTime,
             a.create_id createId,
-            a.create_time createTime,
+            ifnull(e.operate_time, a.update_time)  createTime,
             b.enable,
             b.paper_type paperType,
             b.exposed_paper_type exposedPaperType,
@@ -341,6 +341,8 @@
                 LEFT JOIN
             exam_task_detail b ON a.id = b.exam_task_id
                 LEFT JOIN
+            exam_task_review_log e ON e.exam_task_id = a.id
+                LEFT JOIN
             sys_user c ON a.user_id = c.id
                 LEFT JOIN
             sys_user d ON a.create_id = d.id

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -258,9 +258,15 @@ public class SysController {
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }
-            return ResultUtil.ok(Collections.singletonMap(SystemConstant.LOGO, basicSchool.getLogo()));
+            Map<String, String> map = new HashMap<>();
+            map.put(SystemConstant.LOGO, basicSchool.getLogo());
+            map.put("name", basicSchool.getName());
+            return ResultUtil.ok(map);
         } else {
-            return ResultUtil.ok(Collections.singletonMap(SystemConstant.LOGO, dictionaryConfig.sysDomain().getAdminLogoUrl()));
+            Map<String, String> map = new HashMap<>();
+            map.put(SystemConstant.LOGO, dictionaryConfig.sysDomain().getAdminLogoUrl());
+            map.put("name", null);
+            return ResultUtil.ok(map);
         }
     }