去掉模版机构

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

@@ -1,83 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院）
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("basic_template_org")
-public class BasicTemplateOrg extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    /**
-     * 模板类型：GENERIC-通卡模板，VARIABLE-变量印品模板，ORDINARY-普通印品模板，CARD_RULE-题卡规则
-     */
-    private TemplateTypeEnum type;
-    /**
-     * 通卡模板ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("rule_id")
-    private Long ruleId;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public TemplateTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TemplateTypeEnum type) {
-        this.type = type;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicTemplateOrgMapper extends BaseMapper<BasicTemplateOrg> {
-
-    List<SysOrg> listByTypeAndTemplateId(@Param("type") String type, @Param("templateId") Long templateId);
-
-    /**
-     * 查询机构集合所使用的印品模板信息
-     * @param orgIds 机构集合
-     * @return 模板信息
-     */
-    List<TemplatePrintInfoResult> templateListByOrgIds(@Param("orgIds")List<Long> orgIds);
-}

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

@@ -1,34 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.entity.SysOrg;
-
-import java.util.List;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicTemplateOrgService extends IService<BasicTemplateOrg> {
-
-    List<SysOrg> listByTypeAndTemplateId(String type, Long templateId);
-
-    void removeByRuleId(Long id);
-
-    void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
-
-    /**
-     * 根据机构id查询所有机构集合下所使用的的模板信息
-     *
-     * @param ids 机构id集合
-     * @return 模板信息集合
-     */
-    List<TemplatePrintInfoResult> findTemplateInfoByOrgIds(List<Long> ids);
-}

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

@@ -7,18 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicCardRuleMapper;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
-import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
-import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,35 +33,18 @@ import java.util.Set;
 @Service
 public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, BasicCardRule> implements BasicCardRuleService {
 
-    @Autowired
-    private BasicTemplateOrgService basicTemplateOrgService;
-
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
     @Override
     public IPage<CardRuleDto> list(Boolean enable, String name, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<CardRuleDto> page = new Page<>(pageNumber, pageSize);
-        IPage<CardRuleDto> cardRuleDtoIPage = this.baseMapper.listPage(page, schoolId, enable, SystemConstant.translateSpecificSign(name), createStartTime, createEndTime);
-        if (cardRuleDtoIPage.getRecords().size() > 0) {
-            cardRuleDtoIPage.getRecords().forEach(m -> {
-                //查询适用学院
-                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.CARD_RULE.name(), Long.valueOf(m.getId()));
-                m.setOrgs(sysOrgs);
-            });
-        }
-        return cardRuleDtoIPage;
+        return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, enable, SystemConstant.translateSpecificSign(name), createStartTime, createEndTime);
     }
 
     @Override
     public List<BasicCardRule> list(String param) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-//        QueryWrapper<BasicCardRule> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.lambda().eq(BasicCardRule::getSchoolId, schoolId).eq(BasicCardRule::getEnable, true);
-//        if (StringUtils.isNotBlank(param)) {
-//            queryWrapper.lambda().like(BasicCardRule::getName, ConvertUtil.translateSpecificSign(param));
-//        }
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         return this.baseMapper.list(schoolId, param, orgIds);
     }
@@ -115,16 +93,12 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
             cardRule.setUpdateTime(System.currentTimeMillis());
 
             //删除权限
-            basicTemplateOrgService.removeByRuleId(cardRule.getId());
+//            basicTemplateOrgService.removeByRuleId(cardRule.getId());
             isSuccess = this.updateById(cardRule);
-
         }
 
-        // 新增权限
-        basicTemplateOrgService.saveBatch(schoolId,TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
-
+//         新增权限
+//        basicTemplateOrgService.saveBatch(schoolId, TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
         return isSuccess;
     }
-
-
 }

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

@@ -6,13 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicPrintConfigMapper;
 import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.distributed.print.business.service.BasicPrintConfigService;
-import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
-import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
@@ -30,7 +27,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -43,12 +39,6 @@ import java.util.stream.Collectors;
 @Service
 public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMapper, BasicPrintConfig> implements BasicPrintConfigService {
 
-    @Resource
-    private BasicTemplateOrgService basicTemplateOrgService;
-
-    @Resource
-    private ExamTaskService examTaskService;
-
     @Resource
     private BasicCourseService basicCourseService;
 
@@ -61,20 +51,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
     @Override
     public IPage<BasicPrintConfigDto> listPage(Long examId, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<BasicPrintConfigDto> page = new Page<>(pageNumber, pageSize);
-        IPage<BasicPrintConfigDto> printConfigDtoIPage = this.baseMapper.listPage(page, schoolId, examId, enable, createStartTime, createEndTime);
-        if (printConfigDtoIPage.getRecords().size() > 0) {
-            printConfigDtoIPage.getRecords().forEach(m -> {
-                //查询适用学院
-                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.PRINT_CONFIG.name(), Long.valueOf(m.getId()));
-                if (sysOrgs != null && sysOrgs.size() > 0) {
-                    String orgNames = sysOrgs.stream().map(SysOrg::getName).collect(Collectors.joining(","));
-                    m.setOrgNames(orgNames);
-                }
-                m.setOrgs(sysOrgs);
-            });
-        }
-        return printConfigDtoIPage;
+        return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, examId, enable, createStartTime, createEndTime);
     }
 
     @Override
@@ -95,21 +72,21 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
         // 新增
         if (Objects.isNull(basicPrintConfig.getId())) {
-            QueryWrapper<BasicPrintConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BasicPrintConfig::getSchoolId, schoolId).eq(BasicPrintConfig::getExamId, basicPrintConfig.getExamId());
-            List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
+//            QueryWrapper<BasicPrintConfig> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.lambda().eq(BasicPrintConfig::getSchoolId, schoolId).eq(BasicPrintConfig::getExamId, basicPrintConfig.getExamId());
+//            List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
             // 同一个考试下，一个学院只能对应一个印品配置方案
-            Long[] orgIds = basicPrintConfig.getOrgIds();
-            if (basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
-                List<Long> printConfigIds = basicPrintConfigs.stream().map(BasicPrintConfig::getId).collect(Collectors.toList());
-                QueryWrapper<BasicTemplateOrg> basicTemplateOrgQueryWrapper = new QueryWrapper<>();
-                basicTemplateOrgQueryWrapper.lambda().in(BasicTemplateOrg::getRuleId, printConfigIds).eq(BasicTemplateOrg::getType, TemplateTypeEnum.PRINT_CONFIG)
-                        .in(BasicTemplateOrg::getOrgId, orgIds);
-                List<BasicTemplateOrg> basicTemplateOrgList = basicTemplateOrgService.list(basicTemplateOrgQueryWrapper);
-                if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
-                    throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
-                }
-            }
+//            Long[] orgIds = basicPrintConfig.getOrgIds();
+//            if (basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
+//                List<Long> printConfigIds = basicPrintConfigs.stream().map(BasicPrintConfig::getId).collect(Collectors.toList());
+//                QueryWrapper<BasicTemplateOrg> basicTemplateOrgQueryWrapper = new QueryWrapper<>();
+//                basicTemplateOrgQueryWrapper.lambda().in(BasicTemplateOrg::getRuleId, printConfigIds).eq(BasicTemplateOrg::getType, TemplateTypeEnum.PRINT_CONFIG)
+//                        .in(BasicTemplateOrg::getOrgId, orgIds);
+//                List<BasicTemplateOrg> basicTemplateOrgList = basicTemplateOrgService.list(basicTemplateOrgQueryWrapper);
+//                if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
+//                    throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
+//                }
+//            }
 
             basicPrintConfig.setId(SystemConstant.getDbUuid());
             basicPrintConfig.setCreateId(sysUser.getId());
@@ -118,37 +95,35 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         }
         // 修改
         else {
-            QueryWrapper<BasicPrintConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BasicPrintConfig::getSchoolId, schoolId)
-                    .eq(BasicPrintConfig::getExamId, basicPrintConfig.getExamId())
-                    .ne(BasicPrintConfig::getId, basicPrintConfig.getId());
-            List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
+//            QueryWrapper<BasicPrintConfig> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.lambda().eq(BasicPrintConfig::getSchoolId, schoolId)
+//                    .eq(BasicPrintConfig::getExamId, basicPrintConfig.getExamId())
+//                    .ne(BasicPrintConfig::getId, basicPrintConfig.getId());
+//            List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
             // 一个学院只能对应一个印品配置方案
-            Long[] orgIds = basicPrintConfig.getOrgIds();
-            if (basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
-                List<Long> printConfigIds = basicPrintConfigs.stream().map(BasicPrintConfig::getId).collect(Collectors.toList());
-                QueryWrapper<BasicTemplateOrg> basicTemplateOrgQueryWrapper = new QueryWrapper<>();
-                basicTemplateOrgQueryWrapper.lambda().in(BasicTemplateOrg::getRuleId, printConfigIds)
-                        .eq(BasicTemplateOrg::getType, TemplateTypeEnum.PRINT_CONFIG)
-                        .in(BasicTemplateOrg::getOrgId, orgIds);
-                List<BasicTemplateOrg> basicTemplateOrgList = basicTemplateOrgService.list(basicTemplateOrgQueryWrapper);
-                if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
-                    throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
-                }
-            }
+//            Long[] orgIds = basicPrintConfig.getOrgIds();
+//            if (basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
+//                List<Long> printConfigIds = basicPrintConfigs.stream().map(BasicPrintConfig::getId).collect(Collectors.toList());
+//                QueryWrapper<BasicTemplateOrg> basicTemplateOrgQueryWrapper = new QueryWrapper<>();
+//                basicTemplateOrgQueryWrapper.lambda().in(BasicTemplateOrg::getRuleId, printConfigIds)
+//                        .eq(BasicTemplateOrg::getType, TemplateTypeEnum.PRINT_CONFIG)
+//                        .in(BasicTemplateOrg::getOrgId, orgIds);
+//                List<BasicTemplateOrg> basicTemplateOrgList = basicTemplateOrgService.list(basicTemplateOrgQueryWrapper);
+//                if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
+//                    throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
+//                }
+//            }
 
             basicPrintConfig.setUpdateId(sysUser.getId());
             basicPrintConfig.setUpdateTime(System.currentTimeMillis());
 
             //删除权限
-            basicTemplateOrgService.removeByRuleId(basicPrintConfig.getId());
+//            basicTemplateOrgService.removeByRuleId(basicPrintConfig.getId());
             isSuccess = this.updateById(basicPrintConfig);
-
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(schoolId, TemplateTypeEnum.PRINT_CONFIG, basicPrintConfig.getId(), basicPrintConfig.getOrgIds(), basicPrintConfig.getCreateId());
-
+//        basicTemplateOrgService.saveBatch(schoolId, TemplateTypeEnum.PRINT_CONFIG, basicPrintConfig.getId(), basicPrintConfig.getOrgIds(), basicPrintConfig.getCreateId());
         return isSuccess;
     }
 
@@ -204,14 +179,14 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         if (id != null) {
             queryWrapper.lambda().ne(BasicPrintConfig::getId, id);
         }
-        List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
+//        List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
         List<String> orgIds = new ArrayList<>();
-        for (BasicPrintConfig basicPrintConfig : basicPrintConfigs) {
-            List<SysOrg> sysOrgList = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.PRINT_CONFIG.name(), basicPrintConfig.getId());
-            for (SysOrg sysOrg : sysOrgList) {
-                orgIds.add(String.valueOf(sysOrg.getId()));
-            }
-        }
+//        for (BasicPrintConfig basicPrintConfig : basicPrintConfigs) {
+//            List<SysOrg> sysOrgList = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.PRINT_CONFIG.name(), basicPrintConfig.getId());
+//            for (SysOrg sysOrg : sysOrgList) {
+//                orgIds.add(String.valueOf(sysOrg.getId()));
+//            }
+//        }
         return orgIds;
     }
 
@@ -220,7 +195,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
     public boolean delete(Long id) {
         this.removeById(id);
         // 删除适用学院
-        basicTemplateOrgService.removeByRuleId(id);
+//        basicTemplateOrgService.removeByRuleId(id);
         return true;
     }
 }

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

@@ -1,67 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper;
-import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.service.BasicCourseService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class BasicTemplateOrgServiceImpl extends ServiceImpl<BasicTemplateOrgMapper, BasicTemplateOrg> implements BasicTemplateOrgService {
-
-    @Resource
-    private BasicTemplateOrgMapper basicTemplateOrgMapper;
-    @Resource
-    private BasicCourseService basicCourseService;
-
-    @Override
-    public List<SysOrg> listByTypeAndTemplateId(String type, Long templateId) {
-        return this.baseMapper.listByTypeAndTemplateId(type, templateId);
-    }
-
-    @Override
-    public void removeByRuleId(Long id) {
-        UpdateWrapper<BasicTemplateOrg> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(BasicTemplateOrg::getRuleId, id);
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
-        List<BasicTemplateOrg> list = new ArrayList<>();
-        for (Long orgId : orgIds) {
-            BasicTemplateOrg basicTemplateOrg = new BasicTemplateOrg();
-            basicTemplateOrg.setSchoolId(schoolId);
-            basicTemplateOrg.setType(type);
-            basicTemplateOrg.setRuleId(ruleId);
-            basicTemplateOrg.setOrgId(orgId);
-            basicTemplateOrg.insertInfo(createId);
-            list.add(basicTemplateOrg);
-        }
-        this.saveBatch(list);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public List<TemplatePrintInfoResult> findTemplateInfoByOrgIds(List<Long> ids) {
-        return basicTemplateOrgMapper.templateListByOrgIds(ids);
-    }
-}

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

@@ -7,29 +7,29 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
-import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.entity.BasicTemplate;
+import com.qmth.distributed.print.business.entity.ExamCard;
+import com.qmth.distributed.print.business.entity.ExamCardDetail;
 import com.qmth.distributed.print.business.enums.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicTemplateMapper;
-import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.service.BasicTemplateService;
+import com.qmth.distributed.print.business.service.ExamCardDetailService;
+import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
-import com.qmth.teachcloud.common.util.ConvertUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -43,9 +43,6 @@ import java.util.Objects;
 @Service
 public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, BasicTemplate> implements BasicTemplateService {
 
-    @Autowired
-    private BasicTemplateOrgService basicTemplateOrgService;
-
     @Autowired
     private BasicAttachmentService basicAttachmentService;
 
@@ -60,26 +57,8 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
 
     @Override
     public IPage<TemplateDto> list(Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
-        Page<TemplateDto> page = new Page<>(pageNumber, pageSize);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        IPage<TemplateDto> templateDtoIPage = this.baseMapper.listPage(page, schoolId, enable, type, SystemConstant.translateSpecificSign(name), startTime, endTime);
-        if (templateDtoIPage.getRecords().size() > 0) {
-            templateDtoIPage.getRecords().forEach(m -> {
-                //查询适用学院
-                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
-                m.setOrgs(sysOrgs);
-
-                /*if (type.equals(TemplateTypeEnum.GENERIC.name())) {
-                    QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.lambda().eq(ExamCard::getTemplateId, m.getId());
-                    List<ExamCard> examCards = examCardService.list(queryWrapper);
-                    if (!CollectionUtils.isEmpty(examCards)) {
-                        m.setCardId(examCards.get(0).getId().toString());
-                    }
-                }*/
-            });
-        }
-        return templateDtoIPage;
+        return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, enable, type, SystemConstant.translateSpecificSign(name), startTime, endTime);
     }
 
     @Transactional
@@ -109,12 +88,12 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
 
             template.updateInfo(sysUser.getId());
             //删除权限
-            basicTemplateOrgService.removeByRuleId(template.getId());
+//            basicTemplateOrgService.removeByRuleId(template.getId());
             isSuccess = this.updateById(template);
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(schoolId, template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
+//        basicTemplateOrgService.saveBatch(schoolId, template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
 
         if (TemplateTypeEnum.GENERIC.name().equals(template.getType().name())) {
             // 通用题卡，同步更新exam_card

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

@@ -15,14 +15,12 @@ import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.ExamCardMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.HtmlToJpgUtil;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.CardCreateMethodEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -73,18 +71,9 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     @Resource
     BasicCourseService basicCourseService;
 
-    @Resource
-    BasicTemplateOrgService basicTemplateOrgService;
-
     @Resource
     HtmlToJpgUtil htmlToJpgUtil;
 
-    @Resource
-    BasicPrintConfigService basicPrintConfigService;
-
-    @Resource
-    BasicCardRuleService basicCardRuleService;
-
     @Transactional
     @Override
     public String saveExamCard(ExamCardParams examCardParams) throws Exception {
@@ -124,8 +113,8 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCardDetail.setCardId(examCard.getId());
             examCardDetail.setContent(examCardParams.getContent());
             String htmlContent = examCardParams.getHtmlContent();
-            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(),htmlContent,PageSizeEnum.A3);
-            if (convertJpgStorageList.size() > 0){
+            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(), htmlContent, PageSizeEnum.A3);
+            if (convertJpgStorageList.size() > 0) {
                 examCardDetail.setJpgAttachmentInfo(JSON.toJSONString(convertJpgStorageList));
             }
             examCardDetail.setHtmlContent(htmlContent);
@@ -154,8 +143,8 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             }
             examCardDetail.setContent(examCardParams.getContent());
             String htmlContent = examCardParams.getHtmlContent();
-            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(),htmlContent,PageSizeEnum.A3);
-            if (convertJpgStorageList.size() > 0){
+            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(), htmlContent, PageSizeEnum.A3);
+            if (convertJpgStorageList.size() > 0) {
                 examCardDetail.setJpgAttachmentInfo(JSON.toJSONString(convertJpgStorageList));
             }
             examCardDetail.setHtmlContent(htmlContent);
@@ -298,17 +287,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     @Override
     public IPage<ExamCard> listPage(String type, String title, String createMethod, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<ExamCard> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamCard> iPage = this.baseMapper.listPage(page, schoolId, type, title, createMethod, enable, createStartTime, createEndTime);
-
-        if (iPage.getRecords().size() > 0) {
-            iPage.getRecords().forEach(m -> {
-                //查询适用学院
-                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
-                m.setOrgs(sysOrgs);
-            });
-        }
-        return iPage;
+        return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, type, title, createMethod, enable, createStartTime, createEndTime);
     }
 
     @Transactional
@@ -376,8 +355,8 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             } else {
                 throw ExceptionResultEnum.ERROR.exception("题卡创建方式异常");
             }
-            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(),htmlContent,PageSizeEnum.A3);
-            if (convertJpgStorageList.size() > 0){
+            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(), htmlContent, PageSizeEnum.A3);
+            if (convertJpgStorageList.size() > 0) {
                 examCardDetail.setJpgAttachmentInfo(JSON.toJSONString(convertJpgStorageList));
             }
             examCardDetailService.save(examCardDetail);
@@ -427,22 +406,21 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             } else {
                 throw ExceptionResultEnum.ERROR.exception("题卡创建方式异常");
             }
-            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(),htmlContent,PageSizeEnum.A3);
-            if (convertJpgStorageList.size() > 0){
+            List<ConvertJpgStorage> convertJpgStorageList = htmlToJpgUtil.convertHtmlToJpgByCard(examCard.getTitle(), htmlContent, PageSizeEnum.A3);
+            if (convertJpgStorageList.size() > 0) {
                 examCardDetail.setJpgAttachmentInfo(JSON.toJSONString(convertJpgStorageList));
             }
             examCardDetailService.updateById(examCardDetail);
 
             //删除权限
-            basicTemplateOrgService.removeByRuleId(examCard.getId());
-
+//            basicTemplateOrgService.removeByRuleId(examCard.getId());
         }
 
         // 保存适用范围
         if (params.getOrgIds() == null || params.getOrgIds().length == 0) {
             throw ExceptionResultEnum.ERROR.exception("请选择适用范围");
         }
-        basicTemplateOrgService.saveBatch(schoolId, TemplateTypeEnum.GENERIC, examCard.getId(), params.getOrgIds(), examCard.getCreateId());
+//        basicTemplateOrgService.saveBatch(schoolId, TemplateTypeEnum.GENERIC, examCard.getId(), params.getOrgIds(), examCard.getCreateId());
         return examCard.getId();
     }
 

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

@@ -12,9 +12,11 @@ import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
 import com.qmth.distributed.print.business.bean.params.SyncDataParam;
 import com.qmth.distributed.print.business.bean.result.PrintPlanBrief;
 import com.qmth.distributed.print.business.bean.result.PrintPlanResult;
-import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
 import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.*;
+import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
+import com.qmth.distributed.print.business.enums.ExamPrintPlanSyncStatusEnum;
+import com.qmth.distributed.print.business.enums.MessageEnum;
+import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamPrintPlanMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCloudMarkingTaskService;
@@ -49,14 +51,16 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, ExamPrintPlan> implements ExamPrintPlanService {
+
     @Resource
     private ExamPrintPlanMapper examPrintPlanMapper;
+
     @Resource
     private ExamDetailService examDetailService;
+
     @Resource
     private SysOrgService sysOrgService;
-    @Resource
-    private BasicTemplateOrgService basicTemplateOrgService;
+
     @Resource
     private BasicSchoolService basicSchoolService;
 
@@ -78,9 +82,6 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
     @Autowired
     private ClientPrintDataService clientPrintDataService;
 
-    @Autowired
-    private DataSyncService dataSyncService;
-
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
@@ -191,59 +192,59 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         }
 
         //3.关联template和template_org表 查询出来orgIds所包含的所有模板并组装
-        List<TemplatePrintInfoResult> templateInfoList = basicTemplateOrgService.findTemplateInfoByOrgIds(orgIds);
-        templateInfoList = templateInfoList.stream().distinct().collect(Collectors.toList());
-        System.out.println(JSONObject.toJSONString(templateInfoList));
+//        List<TemplatePrintInfoResult> templateInfoList = basicTemplateOrgService.findTemplateInfoByOrgIds(orgIds);
+//        templateInfoList = templateInfoList.stream().distinct().collect(Collectors.toList());
+//        System.out.println(JSONObject.toJSONString(templateInfoList));
         Map<String, Object> result = new HashMap<>();
 
-        // 变量印品
-        List<Map<String, Object>> variable = new ArrayList<>();
-        List<TemplatePrintInfoResult> variableList = templateInfoList.stream()
-                .filter(e -> TemplateTypeEnum.VARIABLE.equals(e.getTemplateType()))
-                .collect(Collectors.toList());
-        for (ClassifyEnum value : ClassifyEnum.values()) {
-            Map<String, Object> variableMap = new HashMap<>();
-            List<TemplatePrintInfoResult> sourceList = variableList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
-            List<Map<String, Object>> templateList = new ArrayList<>();
-            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
-                Map<String, Object> printMap = new HashMap<>();
-                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
-                printMap.put("name", templatePrintInfoResult.getTemplateName());
-                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
-                templateList.add(printMap);
-            }
-            if (templateList.size() > 0) {
-                variableMap.put("type", value);
-                variableMap.put("template", templateList);
-                variable.add(variableMap);
-            }
-        }
-
-        // 普通印品
-        List<Map<String, Object>> ordinary = new ArrayList<>();
-        List<TemplatePrintInfoResult> ordinaryList = templateInfoList.stream()
-                .filter(e -> TemplateTypeEnum.ORDINARY.equals(e.getTemplateType()))
-                .collect(Collectors.toList());
-        Map<String, Object> ordinaryMap = new HashMap<>();
-        for (ClassifyEnum value : ClassifyEnum.values()) {
-            List<TemplatePrintInfoResult> sourceList = ordinaryList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
-            List<Map<String, Object>> templateList = new ArrayList<>();
-            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
-                Map<String, Object> printMap = new HashMap<>();
-                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
-                printMap.put("name", templatePrintInfoResult.getTemplateName());
-                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
-                templateList.add(printMap);
-            }
-            if (templateList.size() > 0) {
-                ordinaryMap.put("type", value);
-                ordinaryMap.put("template", templateList);
-                ordinary.add(ordinaryMap);
-            }
-        }
-
-        result.put("variable", variable);
-        result.put("ordinary", ordinary);
+//        // 变量印品
+//        List<Map<String, Object>> variable = new ArrayList<>();
+//        List<TemplatePrintInfoResult> variableList = templateInfoList.stream()
+//                .filter(e -> TemplateTypeEnum.VARIABLE.equals(e.getTemplateType()))
+//                .collect(Collectors.toList());
+//        for (ClassifyEnum value : ClassifyEnum.values()) {
+//            Map<String, Object> variableMap = new HashMap<>();
+//            List<TemplatePrintInfoResult> sourceList = variableList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
+//            List<Map<String, Object>> templateList = new ArrayList<>();
+//            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
+//                Map<String, Object> printMap = new HashMap<>();
+//                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
+//                printMap.put("name", templatePrintInfoResult.getTemplateName());
+//                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
+//                templateList.add(printMap);
+//            }
+//            if (templateList.size() > 0) {
+//                variableMap.put("type", value);
+//                variableMap.put("template", templateList);
+//                variable.add(variableMap);
+//            }
+//        }
+//
+//        // 普通印品
+//        List<Map<String, Object>> ordinary = new ArrayList<>();
+//        List<TemplatePrintInfoResult> ordinaryList = templateInfoList.stream()
+//                .filter(e -> TemplateTypeEnum.ORDINARY.equals(e.getTemplateType()))
+//                .collect(Collectors.toList());
+//        Map<String, Object> ordinaryMap = new HashMap<>();
+//        for (ClassifyEnum value : ClassifyEnum.values()) {
+//            List<TemplatePrintInfoResult> sourceList = ordinaryList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
+//            List<Map<String, Object>> templateList = new ArrayList<>();
+//            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
+//                Map<String, Object> printMap = new HashMap<>();
+//                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
+//                printMap.put("name", templatePrintInfoResult.getTemplateName());
+//                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
+//                templateList.add(printMap);
+//            }
+//            if (templateList.size() > 0) {
+//                ordinaryMap.put("type", value);
+//                ordinaryMap.put("template", templateList);
+//                ordinary.add(ordinaryMap);
+//            }
+//        }
+//
+//        result.put("variable", variable);
+//        result.put("ordinary", ordinary);
         return result;
     }
 

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

@@ -90,9 +90,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     @Autowired
     private SysUserService sysUserService;
 
-    @Resource
-    BasicTemplateOrgService basicTemplateOrgService;
-
     @Resource
     TBTaskService tbTaskService;
 
@@ -730,12 +727,12 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             throw ExceptionResultEnum.ERROR.exception("该机构下有子机构，不能删除");
         }
 
-        QueryWrapper<BasicTemplateOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BasicTemplateOrg::getOrgId, id);
-        List<BasicTemplateOrg> basicTemplateOrgs = basicTemplateOrgService.list(queryWrapper);
-        if (basicTemplateOrgs != null && basicTemplateOrgs.size() > 0) {
-            throw ExceptionResultEnum.ERROR.exception("机构已绑定，不能删除");
-        }
+//        QueryWrapper<BasicTemplateOrg> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.lambda().eq(BasicTemplateOrg::getOrgId, id);
+//        List<BasicTemplateOrg> basicTemplateOrgs = basicTemplateOrgService.list(queryWrapper);
+//        if (basicTemplateOrgs != null && basicTemplateOrgs.size() > 0) {
+//            throw ExceptionResultEnum.ERROR.exception("机构已绑定，不能删除");
+//        }
     }
 
     /**

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

@@ -51,6 +51,7 @@
         </where>
         order by create_time desc
     </select>
+
     <select id="list" resultMap="BaseResultMap">
         SELECT
             *
@@ -59,20 +60,6 @@
         WHERE
             a.school_id = #{schoolId}
             AND a.enable = true
-            AND EXISTS( SELECT
-                    1
-                FROM
-                    basic_template_org b
-                WHERE
-                    b.type = 'CARD_RULE'
-                        AND a.id = b.rule_id
-                <if test="orgIds != null and orgIds != '' and orgIds.size > 0">
-                    AND b.org_id IN
-                    <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-                )
         order by create_time desc
     </select>
 

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

@@ -52,13 +52,8 @@
             *
         FROM
             basic_print_config a
-                JOIN
-            basic_template_org b ON a.school_id = b.school_id
-                AND a.id = b.rule_id
         WHERE
             a.school_id = #{schoolId}
           AND a.exam_id = #{examId}
-          AND b.org_id = #{orgId}
-          AND b.type = #{type}
     </select>
 </mapper>

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

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.BasicTemplateOrg">
-    <result column="id" property="id" />
-        <result column="type" property="type" />
-        <result column="rule_id" property="ruleId" />
-        <result column="org_id" property="orgId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        type, rule_id, org_id
-    </sql>
-    <select id="listByTypeAndTemplateId" resultType="com.qmth.teachcloud.common.entity.SysOrg">
-        SELECT
-            a.id, a.code, a.name
-        FROM
-            sys_org a
-                JOIN
-            basic_template_org b ON a.id = b.org_id AND b.type = #{type}
-        WHERE
-            b.rule_id = #{templateId}
-    </select>
-
-    <select id="templateListByOrgIds" resultType="com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult">
-        SELECT
-            DISTINCT (tmp.id) as templateId,
-            tmp.school_id as schoolId,
-            tmp.name as templateName,
-            tmp.type as templateType,
-            tmp.classify as templateClassify,
-            tmp.attachment_id as attachmentId,
-            tmp.enable as enable,
-            tmp.remark as remark
-        FROM
-            basic_template_org org
-                INNER JOIN
-            basic_template tmp ON org.rule_id = tmp.id
-        <where>
-            and tmp.enable = true
-            AND (tmp.type = 'VARIABLE' OR tmp.type = 'ORDINARY')
-        <if test="orgIds.size() == 0">
-            AND org.org_id IN (null)
-        </if>
-            <if test="orgIds != null and orgIds != '' and orgIds.size() > 0">
-                AND org.org_id IN
-                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-</mapper>

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

@@ -113,13 +113,6 @@
             distinct a.id, a.title, a.type
         FROM
             exam_card a
-                JOIN
-            (SELECT
-                *
-            FROM
-                basic_template_org
-            WHERE
-                type = 'GENERIC') c ON a.id = c.rule_id
         WHERE
             a.school_id = #{schoolId}
             AND a.type = #{type}
@@ -127,12 +120,6 @@
             <if test="cardRuleId == '-1'">
                 AND a.create_method != 'STANDARD'
             </if>
-            <if test="orgIds != null and orgIds != '' and orgIds.size > 0">
-                AND c.org_id IN
-                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
         order by a.id desc
     </select>
     <select id="listCustom" resultType="com.qmth.distributed.print.business.entity.ExamCard">

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -39,32 +39,37 @@ import java.util.Map;
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class ServiceTest {
+
     @Resource
     private ExamPrintPlanService examPrintPlanService;
-    @Resource
-    private BasicTemplateOrgService basicTemplateOrgService;
+
     @Resource
     private ExamDetailService examDetailService;
-    @Resource
-    private BasicMessageService basicMessageService;
+
     @Resource
     private BasicVerifyCodeService basicVerifyCodeService;
+
     @Resource
     private BasicCourseService basicCourseService;
+
     @Resource
     private ExamTaskService examTaskService;
+
     @Resource
     private PrintCommonService printCommonService;
+
     @Resource
     private ExamCardDetailService examCardDetailService;
+
     @Resource
     private BasicPrintConfigService basicPrintConfigService;
+
     @Resource
     private ExamStudentMapper examStudentMapper;
+
     @Resource
     private ExamPaperStructureService examPaperStructureService;
 
-
     @Test
     public void printPlanTemplateDatasource() {
         examPrintPlanService.printPlanTemplateDatasource(1L, 2L);
@@ -72,13 +77,7 @@ public class ServiceTest {
 
     @Test
     public void mapper() {
-        List<Long> ids = new ArrayList<>();
-        ids.add(1L);
-        ids.add(9L);
-        List<TemplatePrintInfoResult> result = basicTemplateOrgService.findTemplateInfoByOrgIds(ids);
-        for (TemplatePrintInfoResult templatePrintInfoResult : result) {
-            System.out.println(templatePrintInfoResult);
-        }
+
     }
 
     @Test