Merge branch 'dev_v2.2.0' into release_v2.2.0

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

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.entity.ExamCard;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -25,7 +26,7 @@ public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
     CardDetailDto getCardDetail(Long cardId);
 
-    List<ExamCard> listGenericCard(@Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("type") String type);
+    List<ExamCard> listGenericCard(@Param("schoolId") Long schoolId, @Param("orgIds") Set<Long> orgIds, @Param("type") String type);
 
     List<ExamCard> listCustom(@Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("courseCode") String courseCode, @Param("type") String type);
 

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

@@ -212,10 +212,10 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     public List<ExamCard> listSelectCard(String courseCode, Long cardRuleId, String paperType) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
+        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         // 通用题卡
         List<ExamCard> list = new ArrayList<>();
-        List<ExamCard> genericCards = this.baseMapper.listGenericCard(schoolId, sysUser.getOrgId(), CardTypeEnum.GENERIC.name());
+        List<ExamCard> genericCards = this.baseMapper.listGenericCard(schoolId, orgIds, CardTypeEnum.GENERIC.name());
         if (!genericCards.isEmpty()) {
             list.addAll(genericCards);
         }

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

@@ -167,7 +167,6 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             List<Long> ids = new ArrayList<>();
             ids.add(orgId);
             orgIds = this.dp(ids, schoolId, new ArrayList<>());
-            System.out.println("ordIds = " + orgIds);
         }
 
         //3.关联template和template_org表 查询出来orgIds所包含的所有模板并组装

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

@@ -100,7 +100,7 @@
     </select>
     <select id="listGenericCard" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT
-            a.id, a.title, a.type
+            distinct a.id, a.title, a.type
         FROM
             exam_card a
                 JOIN
@@ -116,7 +116,12 @@
             a.school_id = #{schoolId}
             AND a.type = #{type}
             AND b.enable = TRUE
-            AND c.org_id = #{orgId}
+            <if test="orgIds != null">
+                AND c.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         order by a.create_time desc
     </select>
     <select id="listCustom" resultType="com.qmth.distributed.print.business.entity.ExamCard">

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/TaskPrintClassDto.java

@@ -7,6 +7,8 @@ public class TaskPrintClassDto {
 
     private String classId;
     private String className;
+    private String printHouseId;
+    private String printHouseName;
     private Integer studentCount;
 
     public String getClassId() {
@@ -25,6 +27,22 @@ public class TaskPrintClassDto {
         this.className = className;
     }
 
+    public String getPrintHouseId() {
+        return printHouseId;
+    }
+
+    public void setPrintHouseId(String printHouseId) {
+        this.printHouseId = printHouseId;
+    }
+
+    public String getPrintHouseName() {
+        return printHouseName;
+    }
+
+    public void setPrintHouseName(String printHouseName) {
+        this.printHouseName = printHouseName;
+    }
+
     public Integer getStudentCount() {
         return studentCount;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -302,16 +302,17 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum) {
-
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = null;
-        if (OrgTypeEnum.TEACHING_ROOM.equals(orgTypeEnum)){
+        if (OrgTypeEnum.TEACHING_ROOM.equals(orgTypeEnum)) {
             orgIds = teachcloudCommonService.listSubOrgIds(null);
         }
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrg::getType, orgTypeEnum)
+        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId)
+                .eq(SysOrg::getType, orgTypeEnum)
                 .eq(SysOrg::getEnable, true);
-        if (Objects.nonNull(orgIds)){
-            queryWrapper.lambda().in(SysOrg::getId,orgIds);
+        if (Objects.nonNull(orgIds)) {
+            queryWrapper.lambda().in(SysOrg::getId, orgIds);
         }
 
         return this.list(queryWrapper);

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -6,11 +6,17 @@
         SELECT
             s.clazz_id classId,
             clz.clazz_name className,
+            bc.print_house_id printHouseId,
+            so.name printHouseName,
             COUNT(1) studentCount
         FROM
             basic_student s
                 LEFT JOIN
             basic_clazz clz ON s.clazz_id = clz.id and clz.enable = true
+                LEFT JOIN
+            basic_campus bc ON clz.campus_id = bc.id
+                LEFT JOIN
+            sys_org so ON bc.print_house_id = so.id
         WHERE
             s.school_id = #{schoolId}
             <if test="stringList != null and stringList != ''">
@@ -19,7 +25,7 @@
                     #{cla}
                 </foreach>
             </if>
-        GROUP BY s.clazz_id
+        GROUP BY s.clazz_id, clz.clazz_name, bc.print_house_id
     </select>
 
     <select id="findBasicStudentPage"