教研分析 启动bug

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

@@ -44,6 +44,9 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
         String namePrimary = gradePaperDimensionParam.getNamePrimary();
         this.checkCodePrimaryParams(id,paperNumber,paperType,codePrimary,namePrimary,schoolId);
 
+        // 二级维度
+
+
 
         return null;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicSemesterMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicSemesterMapper.java

@@ -1,12 +1,14 @@
-package com.qmth.distributed.print.business.mapper;
+package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.BasicSemester;
 import com.qmth.teachcloud.common.bean.result.BasicSemesterResult;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -20,12 +22,21 @@ import java.util.Set;
 public interface BasicSemesterMapper extends BaseMapper<BasicSemester> {
     /**
      * 基础学期分页查询
-     * @param iPage 分页参数
+     *
+     * @param iPage    分页参数
      * @param schoolId 学校id
-     * @param orgIds 权限id
+     * @param orgIds   权限id
      * @return 分页结果
      */
     IPage<BasicSemesterResult> findBasicSemesterPage(@Param("iPage") Page<BasicSemesterResult> iPage,
-                                                    @Param("schoolId") Long schoolId,
-                                                    @Param("orgIds") Set<Long> orgIds);
+                                                     @Param("schoolId") Long schoolId,
+                                                     @Param("orgIds") Set<Long> orgIds);
+
+    /**
+     * 根据学期id查询分布式印刷考试数量
+     *
+     * @param semesterId 学期id
+     * @return 数量
+     */
+    int countBasicExamBySemesterId(@Param("semesterId") Long semesterId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicSemesterServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicSemesterServiceImpl.java

@@ -1,27 +1,23 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.mapper.BasicSemesterMapper;
-import com.qmth.distributed.print.business.service.BasicExamService;
-import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
 import com.qmth.teachcloud.common.bean.result.BasicSemesterResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.BasicSemester;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.mapper.BasicSemesterMapper;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -36,9 +32,6 @@ import java.util.stream.Collectors;
  */
 @Service
 public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, BasicSemester> implements BasicSemesterService {
-    @Resource
-    BasicExamService basicExamService;
-
     @Override
     public IPage<BasicSemesterResult> basicSemesterPage(Long schoolId, int pageNumber, int pageSize) {
         return this.baseMapper.findBasicSemesterPage(new Page<>(pageNumber, pageSize), schoolId, null);
@@ -100,11 +93,14 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
     @Transactional
     @Override
     public boolean deleteBasicSemesterById(Long id) {
-        List<BasicExam> examList = basicExamService.list(new QueryWrapper<BasicExam>().lambda().eq(BasicExam::getSemesterId, id));
-        if (examList.size() > 0) {
-            throw ExceptionResultEnum.ERROR.exception("所选学期中包含考试 不能被删除");
+        if (SystemConstant.longNotNull(id)) {
+            if (this.baseMapper.countBasicExamBySemesterId(id) > 0) {
+                throw ExceptionResultEnum.ERROR.exception("所选学期中包含考试 不能被删除");
+            }
+            return this.removeById(id);
+        } else {
+            return true;
         }
-        return this.removeById(id);
     }
 
     @Override

teachcloud-common/src/main/resources/mapper/BasicSemesterMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.BasicSemesterMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicSemesterMapper">
 
     <select id="findBasicSemesterPage" resultType="com.qmth.teachcloud.common.bean.result.BasicSemesterResult">
         SELECT
@@ -27,4 +27,15 @@
         </where>
         ORDER BY bs.create_time DESC
     </select>
+    <select id="countBasicExamBySemesterId" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            basic_exam
+        <where>
+            <if test="semesterId != null and semesterId != ''">
+                AND semester_id = #{semesterId}
+            </if>
+        </where>
+    </select>
 </mapper>