Merge remote-tracking branch 'origin/first' into first

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java

@@ -168,9 +168,10 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
 
     @Override
     protected void validData(ApplyLogEntity entity, Context context) throws AppException {
-//        if(StringUtils.isEmpty(entity.getCertificateCode())){
-//            throw new AppException("许可证编号不能为空");
-//        }
+        if(StringUtils.isEmpty(entity.getCertificateCode())){
+            entity.setCertificateCode(DateUtils.getCurrDateTime("yyyyMMddHHmmss")+RandomUtil.randomNumbers(4));
+            //throw new AppException("许可证编号不能为空");
+        }
 //        if(entity.getIssueTime()==null){
 //            throw new AppException("制证时间不能为空");
 //        }
@@ -478,7 +479,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
 //                        QrCodeUtil.generateQrCodeFile(entry.getValue().toString(),imagepath);
                         String imagepath = rootPath + docTemplate.getQrCode();
                         PictureRenderData pictureRenderData = Pictures.ofStream(new FileInputStream(imagepath), PictureType.PNG)
-                                .size(150, 150).create();
+                                .size(100, 100).create();
                         addMap.put(StrUtil.removePrefixIgnoreCase(entry.getKey(),"@"),pictureRenderData);
                         //entry.setValue(pictureRenderData);
                     } catch (FileNotFoundException e) {