|
|
@@ -693,7 +693,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
Long id = iUserCertificateService.selectMaxId();
|
|
|
String nowId = Long.toString(id);
|
|
|
String result = "";
|
|
|
- result = String.format("%0" + 5 + "d", Integer.parseInt(nowId) + 1);
|
|
|
+ result = String.format("%05d", Integer.parseInt(nowId) + 1);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@@ -791,6 +791,15 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private Boolean haveStamp(){
|
|
|
+ String tenantId = ToolsUtils.getTenantId();
|
|
|
+ if(tenantId.equals("694515817698614")){
|
|
|
+ return false;
|
|
|
+ }else {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private String drawPic(CertificatePhotoVo entity){
|
|
|
Font font = new Font("微软雅黑", Font.PLAIN, 45);// 添加字体的属性设置
|
|
|
String projectUrl = "D:\\test\\";
|
|
|
@@ -974,7 +983,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
|
|
|
InputStream logoStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/001.png");
|
|
|
BufferedImage logoBuffered = ImageIO.read(logoStream);
|
|
|
- g.drawImage(logoBuffered, 1438, 2555, 529, 528, null);
|
|
|
+ if(haveStamp()){
|
|
|
+ g.drawImage(logoBuffered, 1438, 2555, 529, 528, null);
|
|
|
+ }
|
|
|
|
|
|
//二维码
|
|
|
String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
|
|
|
@@ -1070,7 +1081,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
|
|
|
InputStream logoStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/001.png");
|
|
|
BufferedImage logoBuffered = ImageIO.read(logoStream);
|
|
|
- g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
|
|
|
+ if(haveStamp()){
|
|
|
+ g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
|
|
|
+ }
|
|
|
|
|
|
//二维码
|
|
|
String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
|
|
|
@@ -1165,7 +1178,10 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
|
|
|
|
|
|
InputStream logoStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("static/001.png");
|
|
|
BufferedImage logoBuffered = ImageIO.read(logoStream);
|
|
|
- g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
|
|
|
+ if(haveStamp()){
|
|
|
+ g.drawImage(logoBuffered, 1012, 1666, 330, 330, null);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
//二维码
|
|
|
String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
|