3.3.4 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ConditionMapper.java

@@ -82,4 +82,6 @@ public interface ConditionMapper {
 
     List<BasicCourse> listCultureProgramCourse(@Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, @Param("cultureProgramId") Long cultureProgramId,
             @Param("semesterId") Long semesterId, @Param("dpr") DataPermissionRule dpr);
+
+    List<ObeCultureProgram> listCultureProgramForDegree(@Param("schoolId") Long schoolId, @Param("dpr") DataPermissionRule dpr);
 }

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

@@ -257,13 +257,13 @@ public class ConditionServiceImpl implements ConditionService {
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         String privilegeIdString = privilegeId == null ? null : String.valueOf(privilegeId);
-        // 课程大纲管理、课程考核设置、课程目标达成度统计
-        if ("3000".equals(privilegeIdString) || "3001".equals(privilegeIdString) || "2002".equals(privilegeIdString) || "2080".equals(privilegeIdString)) {
+        // 课程大纲管理、课程考核设置
+        if ("3000".equals(privilegeIdString) || "3001".equals(privilegeIdString) || "2080".equals(privilegeIdString)) {
             result = conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
         }
-        // 成绩管理
-        else if ("2001".equals(privilegeIdString)) {
-            result = conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
+        // 课程目标达成度统计、成绩管理
+        else if ("2002".equals(privilegeIdString) || "2001".equals(privilegeIdString)) {
+            result = conditionMapper.listCultureProgramForDegree(schoolId, dpr);
         }
         return result;
     }

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

@@ -1,7 +0,0 @@
--- 2024-06-20
-INSERT INTO sys_privilege
-(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2102, '毕业要求达成情况重新计算', '/api/admin/obe/requirements/again/calculate', 'URL', 2070, 4, 'AUTH', NULL, 1, 1, 1);
-INSERT INTO  sys_privilege
-(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2101, '重新计算', 'Calculate', 'LINK', 2070, 5, 'AUTH', '2076,2077', 1, 0, 1);

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

@@ -814,6 +814,8 @@
                     FROM
                         obe_course_outline oco
                             LEFT JOIN
+                        basic_course bc on oco.course_id = bc.id
+                            LEFT JOIN
                         sys_user su ON oco.user_id = su.id
                     WHERE
                         ocp.id = oco.culture_program_id
@@ -824,6 +826,9 @@
                             <if test="dpr.requestUserId != null">
                                 AND oco.user_id = #{dpr.requestUserId}
                             </if>
+                            <if test="dpr.courseUserId != null">
+                                AND EXISTS( SELECT 1 FROM (select course_code from teach_course where user_id = #{dpr.courseUserId}) tc WHERE tc.course_code = bc.code)
+                            </if>
                             <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
                                 AND su.org_id IN
                                 <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
@@ -920,4 +925,39 @@
             )
         </where>
     </select>
+    <select id="listCultureProgramForDegree"
+            resultType="com.qmth.distributed.print.business.entity.ObeCultureProgram">
+        SELECT
+            *
+        FROM
+            obe_culture_program ocp
+        WHERE
+            EXISTS( SELECT
+                        1
+                    FROM
+                        obe_course_outline oco
+                            LEFT JOIN
+                        basic_course bc ON oco.course_id = bc.id
+                            LEFT JOIN
+                        sys_user su ON oco.user_id = su.id
+                    WHERE
+                        ocp.id = oco.culture_program_id
+                        <if test="schoolId != null">
+                            AND oco.school_id = #{schoolId}
+                        </if>
+                        <if test="dpr != null">
+                            <if test="dpr.requestUserId != null">
+                                AND oco.user_id = #{dpr.requestUserId}
+                            </if>
+                            <if test="dpr.courseUserId != null">
+                                AND EXISTS( SELECT 1 FROM (select course_code from teach_course where user_id = #{dpr.courseUserId}) tc WHERE tc.course_code = bc.code)
+                            </if>
+                            <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                                AND su.org_id IN
+                                <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                                    #{item}
+                                </foreach>
+                            </if>
+                        </if>)
+    </select>
 </mapper>

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

@@ -352,4 +352,11 @@ ALTER TABLE t_r_basic_info CHANGE requirement_points requirement_points MEDIUMTE
 ALTER TABLE t_r_basic_info ADD course_suggest MEDIUMTEXT NULL COMMENT '课程持续改进';
 ALTER TABLE t_r_basic_info CHANGE course_suggest course_suggest MEDIUMTEXT NULL COMMENT '课程持续改进' AFTER requirement_points;
 ALTER TABLE t_r_basic_info ADD course_en_name varchar(100) NULL COMMENT '课程英文名称';
-ALTER TABLE t_r_basic_info CHANGE course_en_name course_en_name varchar(100) NULL COMMENT '课程英文名称' AFTER course_name;
+ALTER TABLE t_r_basic_info CHANGE course_en_name course_en_name varchar(100) NULL COMMENT '课程英文名称' AFTER course_name;
+
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(2102, '毕业要求达成情况重新计算', '/api/admin/obe/requirements/again/calculate', 'URL', 2070, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO  sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(2101, '重新计算', 'Calculate', 'LINK', 2070, 5, 'AUTH', '2076,2077', 1, 0, 1);