bug修改

certificate-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessLicenseServiceImpl.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateQuery;
 import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
+import com.mortals.xhx.module.record.model.ApplyLogEntity;
+import com.mortals.xhx.module.record.model.ApplyLogQuery;
 import com.mortals.xhx.module.record.service.ApplyLogService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.checkerframework.checker.units.qual.C;
@@ -66,6 +68,13 @@ public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<Business
 
     @Override
     public void doConversion(BusinessLicenseEntity businessLicenseEntity) {
+        if(StringUtils.isEmpty(businessLicenseEntity.getBusinessLicense())){
+            throw new AppException("执照编码businessLicense不能为空");
+        }
+        List<ApplyLogEntity> applyLogEntities = applyLogService.find(new ApplyLogQuery().certificateCode(businessLicenseEntity.getBusinessLicense()));
+        if(CollectionUtils.isNotEmpty(applyLogEntities)){
+            throw new AppException("执照编码"+businessLicenseEntity.getBusinessLicense()+"已生成过文件，请勿重复生成");
+        }
         CertificateCatalogEntity catalogEntity = certificateCatalogService.selectOne(new CertificateCatalogQuery().catalogName("营业执照"));
         if(catalogEntity==null){
             throw new AppException("当前系统没有设置营业执照目录");
@@ -101,7 +110,7 @@ public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<Business
             }
             applyLogPdu.setCatalogId(catalogEntity.getId());
             applyLogPdu.setTemplateId(templateEntity.getId());
-            applyLogPdu.setCertificateCode(businessLicenseEntity.getCredentialsCode());
+            applyLogPdu.setCertificateCode(businessLicenseEntity.getBusinessLicense());
             //applyLogPdu.setCertificateName(businessLicenseEntity.getTypeSizeName());
 
             JSONObject formContent = new JSONObject();
@@ -163,9 +172,9 @@ public class BusinessLicenseServiceImpl extends AbstractCRUDServiceImpl<Business
             }
             if(templateEntity.getTemplateType()==2) {
                 //正本
-                formContent.put("@image_1_二维码", businessLicenseEntity.getQrCodeOriginalBase64());
+                formContent.put("@image_1_二维码", baseurlPhotos(businessLicenseEntity.getQrCodeOriginalBase64()));
             }else {
-                formContent.put("@image_1_二维码", businessLicenseEntity.getQrCodeDuplicateBase64());
+                formContent.put("@image_1_二维码", baseurlPhotos(businessLicenseEntity.getQrCodeDuplicateBase64()));
             }
             if(log.isDebugEnabled()){
                 log.debug("证照转化表单json:"+formContent.toJSONString());

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

@@ -84,6 +84,15 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
     @Autowired
     private CertificateClassifyService certificateClassifyService;
 
+    @Override
+    protected void removeAfter(Long[] ids, Context context,int result) throws AppException {
+        for (Long id:ids){
+            PrintWaitQueueEntity condition = new PrintWaitQueueEntity();
+            condition.setApplyId(id);
+            printWaitQueueService.remove(condition,context);
+        }
+    }
+
     @Override
     protected ApplyLogEntity findBefore(ApplyLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
         ApplyLogQuery query = new ApplyLogQuery();