3.3.4 update

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

@@ -24,4 +24,6 @@ public interface ObeCultureProgramTargetService extends IService<ObeCultureProgr
     void removeByCultureProgramId(Long id);
 
     Map<Long, Long> copyByCultureProgramId(Long id, Long obeCultureProgramNewId);
+
+    ObeCultureProgramTarget getByCultureProgramIdAndName(Long cultureProgramId, String name);
 }

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

@@ -60,7 +60,7 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     public boolean saveData(ObeCultureProgram obeCultureProgram) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-        ObeCultureProgram checkObeCultureProgram = this.getBySchoolIdAndName(obeCultureProgram.getProfessionalId(), obeCultureProgram.getName());
+        ObeCultureProgram checkObeCultureProgram = this.getBySchoolIdAndName(sysUser.getSchoolId(), obeCultureProgram.getName());
         if (obeCultureProgram.getId() == null) {
             if (checkObeCultureProgram != null) {
                 throw ExceptionResultEnum.ERROR.exception("培养方案名称已存在");

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.service.ObeRequirementTargetMatrixService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.ExcelUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -50,7 +52,11 @@ public class ObeCultureProgramTargetServiceImpl extends ServiceImpl<ObeCulturePr
     @Override
     public boolean saveData(ObeCultureProgramTarget obeCultureProgramTarget) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        ObeCultureProgramTarget cultureProgramTarget = this.getByCultureProgramIdAndName(obeCultureProgramTarget.getCultureProgramId(), obeCultureProgramTarget.getName());
         if (obeCultureProgramTarget.getId() == null) {
+            if (cultureProgramTarget != null) {
+                throw ExceptionResultEnum.ERROR.exception("培养目标名称[" + obeCultureProgramTarget.getName() + "]已存在");
+            }
             obeCultureProgramTarget.insertInfo(sysUser.getId());
 
             // 同时生成培养目标与毕业要求关系矩阵数据
@@ -62,6 +68,9 @@ public class ObeCultureProgramTargetServiceImpl extends ServiceImpl<ObeCulturePr
             }
             return true;
         } else {
+            if (cultureProgramTarget != null && !cultureProgramTarget.getId().equals(obeCultureProgramTarget.getId())) {
+                throw ExceptionResultEnum.ERROR.exception("培养目标名称[" + obeCultureProgramTarget.getName() + "]已存在");
+            }
             obeCultureProgramTarget.updateInfo(sysUser.getId());
             return this.updateById(obeCultureProgramTarget);
         }
@@ -100,4 +109,12 @@ public class ObeCultureProgramTargetServiceImpl extends ServiceImpl<ObeCulturePr
         }
         return idMap;
     }
+
+    @Override
+    public ObeCultureProgramTarget getByCultureProgramIdAndName(Long cultureProgramId, String name) {
+        QueryWrapper<ObeCultureProgramTarget> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ObeCultureProgramTarget::getCultureProgramId, cultureProgramId)
+                .eq(ObeCultureProgramTarget::getName, name);
+        return this.getOne(queryWrapper);
+    }
 }

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

@@ -35,7 +35,7 @@
             es.college_name collegeName,
             es.major_name majorName
         FROM
-            t_r_exam_student res
+            (select * from t_r_exam_student where student_code not in ('目标分','平均分','各课程目标平均分')) res
                 LEFT JOIN
             t_r_basic_info rbi ON res.r_basic_info_id = rbi.id
                 LEFT JOIN