MERGE

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

@@ -999,7 +999,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 180, 180);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 1213, 155, 180, 180, null);
+            g.drawImage(qrImage, 1205, 145, 180, 180, null);
             // 完成模板修改
             g.dispose();
             // 获取新文件的地址
@@ -1094,7 +1094,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 180, 180);
             BufferedImage qrImage = toBufferedImage(bitMatrix);
             // 在模板上添加用户二维码(地址,左边距,上边距,图片宽度,图片高度,未知)
-            g.drawImage(qrImage, 1213, 155, 180, 180, null);
+            g.drawImage(qrImage, 1205, 145, 180, 180, null);
             // 完成模板修改
             g.dispose();
             // 获取新文件的地址

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java

@@ -54,9 +54,12 @@ private static final long serialVersionUID=1L;
     /** 公共标识：1公共章 0非公共章 */
     private String commonSign;
     /** 证书类型ID */
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Long certificateTypeId;
     /** 证书ID */
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Long certificateId;
     /** 证书模板ID */
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Long certificateTpId;
 }

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

@@ -106,6 +106,47 @@ public class UserCertificateServiceImpl extends ServiceImpl<UserCertificateMappe
             chapterVo.setTotalTime(secTotalTime);
         }
         userCertificateVo.setChapterList(chapterList);
+        if(userCertificateVo.getKeyValue().equals("certificate01")){
+            userCertificateVo.setMajorType("继续教育（专业）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate02")){
+            userCertificateVo.setMajorType("继续教育（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate03")){
+            userCertificateVo.setMajorType("一级注册建造师（必修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate04")){
+            userCertificateVo.setMajorType("一级注册建造师（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate05")){
+            userCertificateVo.setMajorType("一级注册建造师（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate06")){
+            userCertificateVo.setMajorType("一级注册建造师（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate07")){
+            userCertificateVo.setMajorType("一级注册建造师（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate08")){
+            userCertificateVo.setMajorType("一级注册建造师（选修）");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate10")){
+            userCertificateVo.setMajorType("施工现场专业人员继续教育");
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate11")){
+            if(Validator.isNotEmpty(userCertificateVo.getMajor())&&userCertificateVo.getMajor().equals("必修")){
+                userCertificateVo.setMajorType("二级注册造价师（必修）");
+            }else{
+                userCertificateVo.setMajorType("二级注册造价师（选修）");
+            }
+        }
+        else if(userCertificateVo.getKeyValue().equals("certificate12")){
+            if(Validator.isNotEmpty(userCertificateVo.getMajor())&&userCertificateVo.getMajor().equals("必修")){
+                userCertificateVo.setMajorType("二级注册建造师（必修）");
+            }else{
+                userCertificateVo.setMajorType("二级注册建造师（选修）");
+            }
+        }
         return userCertificateVo;
     }
 

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

@@ -129,4 +129,7 @@ public class UserCertificateVo {
 	private String major;
 
 	private String tenantId;
+
+	@ApiModelProperty("专业类型")
+	private String majorType;
 }