he2802 1 年之前
父节点
当前提交
c047b4973c

+ 4 - 5
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -617,7 +617,6 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         }else{
         }else{
             addBo.setPublicClassHours(goodsVo.getPublicClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP ));
             addBo.setPublicClassHours(goodsVo.getPublicClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP ));
         }
         }
-
         return addBo;
         return addBo;
     }
     }
     private String getCertificateCode(){
     private String getCertificateCode(){
@@ -997,10 +996,10 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             //二维码
             //二维码
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 150, 150);
+            BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 180, 180);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 1233, 175, 150, 150, null);
+            g.drawImage(qrImage, 1213, 155, 180, 180, null);
             // 完成模板修改
             // 完成模板修改
             g.dispose();
             g.dispose();
             // 获取新文件的地址
             // 获取新文件的地址
@@ -1092,10 +1091,10 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             //二维码
             //二维码
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 150, 150);
+            BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 180, 180);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 1233, 175, 150, 150, null);
+            g.drawImage(qrImage, 1213, 155, 180, 180, null);
             // 完成模板修改
             // 完成模板修改
             g.dispose();
             g.dispose();
             // 获取新文件的地址
             // 获取新文件的地址

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserCertificateMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.mapper;
 package com.zhongzheng.modules.user.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.user.bo.UserCertificateQueryBo;
 import com.zhongzheng.modules.user.bo.UserCertificateQueryBo;
 import com.zhongzheng.modules.user.domain.UserCertificate;
 import com.zhongzheng.modules.user.domain.UserCertificate;
@@ -16,5 +17,6 @@ import java.util.List;
 public interface UserCertificateMapper extends BaseMapper<UserCertificate> {
 public interface UserCertificateMapper extends BaseMapper<UserCertificate> {
     Long selectMaxId();
     Long selectMaxId();
     List<UserCertificateVo> selectList(UserCertificateQueryBo bo);
     List<UserCertificateVo> selectList(UserCertificateQueryBo bo);
+    @InterceptorIgnore(tenantLine = "true")
     UserCertificateVo selectDetail(UserCertificateQueryBo code);
     UserCertificateVo selectDetail(UserCertificateQueryBo code);
 }
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserCertificateServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
 import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
@@ -85,6 +86,9 @@ public class UserCertificateServiceImpl extends ServiceImpl<UserCertificateMappe
         if(Validator.isEmpty(userCertificateVo)){
         if(Validator.isEmpty(userCertificateVo)){
             throw new CustomException("证书不存在");
             throw new CustomException("证书不存在");
         }
         }
+        if(Validator.isNotEmpty(userCertificateVo.getTenantId())){
+            ServletUtils.getResponse().setHeader("TenantId",userCertificateVo.getTenantId());
+        }
         MajorVo majorVo = iMajorService.queryById(userCertificateVo.getMajorId());
         MajorVo majorVo = iMajorService.queryById(userCertificateVo.getMajorId());
         if(Validator.isEmpty(majorVo)){
         if(Validator.isEmpty(majorVo)){
             throw new CustomException("专业不存在");
             throw new CustomException("专业不存在");

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -127,4 +127,6 @@ public class UserCertificateVo {
 
 
 	@ApiModelProperty("专业")
 	@ApiModelProperty("专业")
 	private String major;
 	private String major;
+
+	private String tenantId;
 }
 }

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserCertificateMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chapterStr" column="chapter_str"/>
         <result property="chapterStr" column="chapter_str"/>
         <result property="moduleId" column="module_id"/>
         <result property="moduleId" column="module_id"/>
         <result property="moreCertificateStatus" column="more_certificate_status"/>
         <result property="moreCertificateStatus" column="more_certificate_status"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
     </resultMap>
 
 
     <select id="selectMaxId"   resultType="Long">
     <select id="selectMaxId"   resultType="Long">