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

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

@@ -69,9 +69,10 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
                 this.update(oldChildList);
             }
             if(isAdd) {
-                List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId()));
-                List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList());
-                List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(new CertificateDocumentQuery().idList(documentIdList).status(StatusEnum.ENABLE.getValue()));
+//                List<CertificateChildEntity> childEntityList = certificateChildService.find(new CertificateChildQuery().catalogId(applyLogEntity.getCatalogId()));
+//                List<Long> documentIdList = childEntityList.stream().map(CertificateChildEntity::getDocumentId).collect(Collectors.toList());
+//
+                List<CertificateDocumentEntity> documentEntityList = certificateDocumentService.find(new CertificateDocumentQuery().status(StatusEnum.ENABLE.getValue()));
                 if (CollectionUtils.isNotEmpty(documentEntityList)) {
                     List<ChildLicenseEntity> childLicense = new ArrayList<>();
                     for (CertificateDocumentEntity item : documentEntityList) {
@@ -96,6 +97,7 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
                         entity.setLicensedItems(applyLogEntity.getLicenseProject());
                         entity.setFormStyleContent(item.getTemplateContent());
                         entity.setFormContent(item.getFormContent());
+                        entity.setShortName(item.getShortName());
                         entity.setProcessStatus(ProcessStatusEnum.未处理.getValue());
                         entity.setCreateTime(applyLogEntity.getCreateTime());
                         entity.setCreateUserId(applyLogEntity.getCreateUserId());

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

@@ -183,9 +183,10 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
 //        if(StringUtils.isEmpty(entity.getAuthority())){
 //            throw new AppException("制证机关不能为空");
 //        }
-//        if(StringUtils.isEmpty(entity.getSocialCode())){
-//            throw new AppException("统一社会信用代码不能为空");
-//        }
+        if(StringUtils.isEmpty(entity.getSocialCode())){
+            entity.setSocialCode(DateUtils.getCurrDateTime("yyyyMMddHHmmss")+RandomUtil.randomNumbers(4));
+            //throw new AppException("统一社会信用代码不能为空");
+        }
 //        if(StringUtils.isEmpty(entity.getLicenseProject())){
 //            throw new AppException("许可项目不能为空");
 //        }
@@ -237,7 +238,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
         try {
             String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
             String filePath = rootPath + "certificate/qrcode/";
-            String qrcodeName =  applyLogEntity.getCertificateCode() + ".png";
+            String qrcodeName =  applyLogEntity.getSocialCode() + ".png";
             File pathDir = new File(filePath);
             if (!pathDir.exists()) {
                 pathDir.mkdirs();

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

@@ -175,7 +175,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
     public String get(@PathVariable(value="socialCode") String socialCode) {
         Map<String, Object> model = new HashMap();
         if (StringUtils.isEmpty(socialCode)) {
-            return this.createFailJsonResp("许可证编码不正确");
+            return this.createFailJsonResp("信用编码不正确");
         } else {
             JSONObject ret = new JSONObject();
             String busiDesc = "扫码查看" + this.getModuleDesc();
@@ -199,6 +199,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
 
             this.init(model, context);
             ret.put("code", 1);
+            ret.put("systemDate", new Date());
             ret.put("msg", model.remove("message_info"));
             ret.put("dict", model.remove("dict"));
             return ret.toJSONString();