Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/StudentRequirementInfoDto.java

@@ -1,7 +1,11 @@
 package com.qmth.distributed.print.business.bean.dto.report;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 public class StudentRequirementInfoDto {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long cultureProgramId;
     private String studentCode;
     private String studentName;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ObeCultureProgram.java

@@ -29,6 +29,10 @@ import javax.validation.constraints.NotNull;
 public class ObeCultureProgram extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "学校ID")
+    private Long schoolId;
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "专业ID")
     @NotNull(message = "请选择专业")
@@ -50,6 +54,15 @@ public class ObeCultureProgram extends BaseEntity implements Serializable {
     private String description;
     @ApiModelProperty(value = "总体描述")
     private Double expectValue;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public Long getProfessionalId() {
         return professionalId;
     }

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

@@ -25,7 +25,7 @@ public interface ObeCultureProgramService extends IService<ObeCultureProgram> {
 
     boolean copy(Long id);
 
-    ObeCultureProgram getByProfessionalIdAndName(Long professionalId, String name);
+    ObeCultureProgram getBySchoolIdAndName(Long schoolId, String name);
 
     void updateTargetCount(Long cultureProgramId);
     void updateRequirementCount(Long cultureProgramId);

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

@@ -60,11 +60,12 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     public boolean saveData(ObeCultureProgram obeCultureProgram) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-        ObeCultureProgram checkObeCultureProgram = this.getByProfessionalIdAndName(obeCultureProgram.getProfessionalId(), obeCultureProgram.getName());
+        ObeCultureProgram checkObeCultureProgram = this.getBySchoolIdAndName(obeCultureProgram.getProfessionalId(), obeCultureProgram.getName());
         if (obeCultureProgram.getId() == null) {
             if (checkObeCultureProgram != null) {
                 throw ExceptionResultEnum.ERROR.exception("培养方案名称已存在");
             }
+            obeCultureProgram.setSchoolId(sysUser.getSchoolId());
             obeCultureProgram.insertInfo(sysUser.getId());
             if (this.save(obeCultureProgram)) {
                 obeCultureProgramRequirementService.initRequirement(obeCultureProgram.getId());
@@ -117,9 +118,9 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     }
 
     @Override
-    public ObeCultureProgram getByProfessionalIdAndName(Long professionalId, String name) {
+    public ObeCultureProgram getBySchoolIdAndName(Long schoolId, String name) {
         QueryWrapper<ObeCultureProgram> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ObeCultureProgram::getProfessionalId, professionalId)
+        queryWrapper.lambda().eq(ObeCultureProgram::getSchoolId, schoolId)
                 .eq(ObeCultureProgram::getName, name);
         return this.getOne(queryWrapper);
     }
@@ -174,7 +175,7 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
         }
         AtomicInteger i = new AtomicInteger(1);
         String name = obeCultureProgram.getName() + "副本" + i.getAndIncrement();
-        while (this.getByProfessionalIdAndName(obeCultureProgram.getProfessionalId(), name) != null) {
+        while (this.getBySchoolIdAndName(obeCultureProgram.getProfessionalId(), name) != null) {
             name = obeCultureProgram.getName() + "副本" + i.getAndIncrement();
         }
         obeCultureProgram.setId(SystemConstant.getDbUuid());

distributed-print-business/src/main/resources/db/log/xiaofei.sql

@@ -1,5 +1,6 @@
 CREATE TABLE `obe_culture_program` (
           `id` BIGINT(20) NOT NULL,
+          `school_id` BIGINT(20) NULL COMMENT '学校ID',
           `professional_id` BIGINT(20) NULL COMMENT '专业ID',
           `name` VARCHAR(100) NULL COMMENT '培养方案名称',
           `target_count` INT NULL DEFAULT 0 COMMENT '培养目标数量',