3.3.2 update

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

@@ -96,7 +96,12 @@ public class TPMatrixServiceImpl extends ServiceImpl<TPMatrixMapper, TPMatrix> i
                     TPRequirement tpRequirement = tpRequirementService.getById(requirementEntry.getKey());
                     MatrixRequirementDto matrixRequirementDto = new MatrixRequirementDto();
                     matrixRequirementDto.setName(tpRequirement.getName());
-                    List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementEntry.getValue().stream().sorted(Comparator.comparing(TPMatrix::getSubName)).map(tpMatrix -> {
+                    List<TPMatrix> requirementList = requirementEntry.getValue();
+                    // 排序，解决字符串1和10排序问题
+                    if (requirementList.size() > 1) {
+                        requirementList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getSubName())));
+                    }
+                    List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementList.stream().map(tpMatrix -> {
                         MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
                         matrixSubRequirementDto.setId(tpMatrix.getId());
                         matrixSubRequirementDto.setName(StringUtils.isNotBlank(tpMatrix.getSubName()) ? tpMatrix.getRequirementSortNum() + "-" + tpMatrix.getSubName() : tpMatrix.getSubName());

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

@@ -52,6 +52,7 @@ public class TPRequirementServiceImpl extends ServiceImpl<TPRequirementMapper, T
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 修改
         if (tpRequirement.getId() != null) {
+            tpRequirement.setNodeCount(tpRequirement.getNodeCount() == 0 ? null : tpRequirement.getNodeCount());
             tpRequirement.updateInfo(sysUser.getId());
         }
         // 新增
@@ -60,7 +61,7 @@ public class TPRequirementServiceImpl extends ServiceImpl<TPRequirementMapper, T
             tpRequirement.insertInfo(sysUser.getId());
         }
         this.saveOrUpdate(tpRequirement);
-        // todo 节点数变动后，修改矩阵数据
+        // 节点数变动后，修改矩阵数据
         List<TPCourse> tpCourseList = tpCourseService.listCourse(tpRequirement.getProfessionalId());
         if (CollectionUtils.isNotEmpty(tpCourseList)) {
             for (TPCourse tpCourse : tpCourseList) {

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -3332,6 +3332,29 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (2032, '试卷结构-导入模版', '/api/admin/course/degree/final_score/paper_struct/import', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (2033, '同步试卷蓝图结构', '/api/admin/course/degree/final_score/paper_struct_dimension/sync', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (2034, '同步期末成绩选择试卷', '/api/admin/course/degree/final_score/choose_paper', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `enable`, `default_auth`, `front_display`) VALUES ('2035', '专业认证管理', 'ProfessionalCertificationManage', 'MENU', '2000', '1', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `enable`, `default_auth`, `front_display`) VALUES ('2036', '专业认证', 'ProfessionalCertification', 'MENU', '2035', '1', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('2037', '列表', 'List', 'LIST', '2036', '1', 'AUTH', '2042', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('2038', '查询条件', 'Condition', 'CONDITION', '2036', '2', 'AUTH', '2042', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('2039', '查询', 'Select', 'BUTTON', '2036', '3', 'AUTH', '2042', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('2040', '新增', 'Add', 'BUTTON', '2036', '4', 'AUTH', '2043', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('2041', '管理', 'CertificationManage', 'LINK', '2036', '5', 'AUTH', '2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2042', '查询', '/api/admin/professional/certification/page', 'URL', '2036', '1', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2043', '新增', '/api/admin/professional/certification/save', 'URL', '2036', '2', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2044', '课程管理-选择课程', '/api/admin/professional/certification/course/query_list', 'URL', '2036', '3', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2045', '课程管理-查询列表', '/api/admin/professional/certification/course/list', 'URL', '2036', '4', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2046', '课程管理-新增', '/api/admin/professional/certification/course/save', 'URL', '2036', '5', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2047', '课程管理-排序', '/api/admin/professional/certification/course/sort', 'URL', '2036', '6', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2048', '课程管理-删除', '/api/admin/professional/certification/course/remove', 'URL', '2036', '7', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2049', '毕业要求管理-查询', '/api/admin/professional/certification/requirement/list', 'URL', '2036', '8', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2050', '毕业要求管理-新增/编辑', '/api/admin/professional/certification/requirement/save', 'URL', '2036', '9', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2051', '毕业要求管理-排序', '/api/admin/professional/certification/requirement/sort', 'URL', '2036', '10', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2052', '毕业要求管理-删除', '/api/admin/professional/certification/requirement/remove', 'URL', '2036', '11', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2053', '毕业支撑矩阵-查询', '/api/admin/professional/certification/matrix/get', 'URL', '2036', '12', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2054', '毕业支撑矩阵-提交', '/api/admin/professional/certification/matrix/save', 'URL', '2036', '13', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2055', '毕业支撑矩阵-下载', '/api/admin/professional/certification/matrix/download', 'URL', '2036', '14', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2056', '是否可编辑（课程）', 'canEditCourse', 'LINK', '2036', '6', 'AUTH', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2057', '是否可编辑（毕业要求）', 'canEditRequirement', 'LINK', '2036', '7', 'AUTH', '1', '0', '1');
 COMMIT;
 
 -- ----------------------------
@@ -5109,6 +5132,75 @@ CREATE TABLE IF NOT EXISTS `t_m_mq_message` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='mq消息';
 
+-- ----------------------------
+-- Table structure for t_p_professional
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_p_professional` (
+    `id` BIGINT(20) NOT NULL,
+    `school_id` BIGINT(20) NULL COMMENT '学校ID',
+    `name` VARCHAR(80) NULL COMMENT '专业名称',
+    `org_id` BIGINT(20) NULL COMMENT '所属学院ID',
+    `create_id` BIGINT(20) NULL COMMENT '创建人ID',
+    `create_time` BIGINT(20) NULL COMMENT '创建时间',
+    `update_id` BIGINT(20) NULL COMMENT '更新人ID',
+    `update_time` BIGINT(20) NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`))
+    COMMENT = '专业认证专业表';
+
+-- ----------------------------
+-- Table structure for t_p_course
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_p_course` (
+      `id` BIGINT(20) NOT NULL,
+      `professional_id` BIGINT(20) NOT NULL COMMENT '专业ID',
+      `course_code` VARCHAR(45) NOT NULL COMMENT '课程代码',
+      `course_name` VARCHAR(100) NOT NULL COMMENT '课程名称',
+      `sort_num` INT NULL COMMENT '排序值',
+      `create_id` BIGINT(20) NULL COMMENT '创建人ID',
+      `create_time` BIGINT(20) NULL COMMENT '创建时间',
+      `update_id` BIGINT(20) NULL COMMENT '更新人ID',
+      `update_time` BIGINT(20) NULL COMMENT '更新时间',
+      PRIMARY KEY (`id`),
+     KEY `uq_professional_id` (`professional_id`))
+    COMMENT = '专业认证课程';
+
+-- ----------------------------
+-- Table structure for t_p_requirement
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_p_requirement` (
+   `id` BIGINT(20) NOT NULL,
+   `professional_id` BIGINT(20) NOT NULL COMMENT '专业ID',
+   `code` VARCHAR(50) NULL COMMENT '毕业要求code',
+   `name` VARCHAR(50) NOT NULL COMMENT '毕业要求',
+   `node_count` INT NULL COMMENT '节点数量',
+   `sort_num` INT NULL COMMENT '排序值',
+   `create_id` BIGINT(20) NULL COMMENT '创建人ID',
+   `create_time` BIGINT(20) NULL COMMENT '创建时间',
+   `update_id` BIGINT(20) NULL COMMENT '更新人ID',
+   `update_time` BIGINT(20) NULL COMMENT '更新时间',
+   PRIMARY KEY (`id`),
+     KEY `uq_professional_id` (`professional_id`))
+    COMMENT = '专业认证毕业要求';
+
+-- ----------------------------
+-- Table structure for t_p_matrix
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_p_matrix` (
+  `id` BIGINT(20) NOT NULL,
+  `professional_id` BIGINT(20) NOT NULL COMMENT '专业ID',
+  `course_id` BIGINT(20) NOT NULL COMMENT '专业认证课程ID',
+  `requirement_id` BIGINT(20) NOT NULL COMMENT '专业认证毕业要求ID',
+  `sub_name` VARCHAR(45) NULL COMMENT '子节点名称',
+  `content` DOUBLE NULL COMMENT '指标值',
+  `create_id` BIGINT(20) NULL COMMENT '创建人ID',
+  `create_time` BIGINT(20) NULL COMMENT '创建时间',
+  `update_id` BIGINT(20) NULL COMMENT '更新人ID',
+  `update_time` BIGINT(20) NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+     KEY `uq_professional_id` (`professional_id`))
+    COMMENT = '专业认证毕业要求支撑矩阵';
+
+
 -- ----------------------------
 -- Table structure for t_r_basic_info
 -- ----------------------------

distributed-print/install/mysql/upgrade/3.3.2.sql

@@ -28,7 +28,7 @@ CREATE TABLE `t_p_course` (
 CREATE TABLE `t_p_requirement` (
       `id` BIGINT(20) NOT NULL,
       `professional_id` BIGINT(20) NOT NULL COMMENT '专业ID',
-      `code` VARCHAR(50) NOT NULL COMMENT '毕业要求code',
+      `code` VARCHAR(50) NULL COMMENT '毕业要求code',
       `name` VARCHAR(50) NOT NULL COMMENT '毕业要求',
       `node_count` INT NULL COMMENT '节点数量',
       `sort_num` INT NULL COMMENT '排序值',