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/entity/ObeCultureProgramRequirement.java

@@ -1,9 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -41,6 +38,7 @@ public class ObeCultureProgramRequirement extends BaseEntity implements Serializ
     private String name;
 
     @ApiModelProperty(value = "内容")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String content;
 
     @ApiModelProperty(value = "预期值")

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

@@ -76,16 +76,17 @@ public class ObeCultureProgramRequirementServiceImpl extends ServiceImpl<ObeCult
             return this.updateById(obeCultureProgramRequirement);
         }
         // 新增
-        else {
-            ObeCultureProgramRequirement obeCultureProgramRequirementParent = this.getById(obeCultureProgramRequirement.getParentId());
-            obeCultureProgramRequirement.setSortNum(this.getMaxSortNum(obeCultureProgramRequirement.getCultureProgramId(), obeCultureProgramRequirement.getParentId()) + 1);
-            obeCultureProgramRequirement.setName(concatRequirementName(obeCultureProgramRequirementParent.getSortNum(), obeCultureProgramRequirement.getSortNum()));
-            obeCultureProgramRequirement.insertInfo(sysUser.getId());
-            if (this.save(obeCultureProgramRequirement)) {
-                obeCourseRequirementMatrixService.updateMatrix(obeCultureProgramRequirement.getCultureProgramId(), Arrays.asList(obeCultureProgramRequirement), null);
-            }
-            return true;
-        }
+//        else {
+//            ObeCultureProgramRequirement obeCultureProgramRequirementParent = this.getById(obeCultureProgramRequirement.getParentId());
+//            obeCultureProgramRequirement.setSortNum(this.getMaxSortNum(obeCultureProgramRequirement.getCultureProgramId(), obeCultureProgramRequirement.getParentId()) + 1);
+//            obeCultureProgramRequirement.setName(concatRequirementName(obeCultureProgramRequirementParent.getSortNum(), obeCultureProgramRequirement.getSortNum()));
+//            obeCultureProgramRequirement.insertInfo(sysUser.getId());
+//            if (this.save(obeCultureProgramRequirement)) {
+//                obeCourseRequirementMatrixService.updateMatrix(obeCultureProgramRequirement.getCultureProgramId(), Arrays.asList(obeCultureProgramRequirement), null);
+//            }
+//            return true;
+//        }
+        return true;
     }
 
     @Override

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

@@ -57,6 +57,7 @@
                 LEFT JOIN
             basic_course bc ON ocpc.course_id = bc.id
         where ocpc.culture_program_id = #{cultureProgramId}
+        order by ocpc.sort_num
     </select>
 
 </mapper>