证照申请修改后删除历史数据;营业执照数据对接接口修改;营业执照多模板处理逻辑修改

certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java

@@ -227,6 +227,8 @@ public class CertificateApi extends BaseJsonBodyController {
                     printWaitQueueVO.setCatalogId(printWaitQueueEntity.getCatalogId());
                     printWaitQueueVO.setCatalogCode(printWaitQueueEntity.getCatalogCode());
                     printWaitQueueVO.setCatalogName(printWaitQueueEntity.getCatalogName());
+                    printWaitQueueVO.setTemplateId(printWaitQueueEntity.getTemplateId());
+                    printWaitQueueVO.setTemplateName(printWaitQueueEntity.getTemplateName());
                     printWaitQueueVO.setWaitQueueId(printWaitQueueEntity.getId());
                     printWaitQueueVO.setCertificateCode(printWaitQueueEntity.getCertificateCode());
                     printWaitQueueVO.setCertificateName(printWaitQueueEntity.getCertificateName());

certificate-manager/src/main/java/com/mortals/xhx/module/api/PrintWaitQueueVO.java

@@ -18,6 +18,14 @@ public class PrintWaitQueueVO {
      * 目录名称
      */
     private String catalogName;
+    /**
+     * 证照目录模板ID
+     */
+    private Long templateId;
+    /**
+     * 证照模板名称
+     */
+    private String templateName;
     /**
      * 证照名称
      */

certificate-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessLicenseController.java

@@ -61,7 +61,7 @@ public class BusinessLicenseController extends BaseCRUDJsonBodyMappingController
         String busiDesc = "API接口存入营业执照信息";
         int code = 200;
         try {
-            service.apiSave(businessLicense);
+            service.doConversion(businessLicense);
             model.put("message_info", "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         }catch (Exception e){

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

@@ -28,9 +28,7 @@ import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
 import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
 import com.mortals.xhx.module.record.dao.RecordDao;
-import com.mortals.xhx.module.record.model.ApplyLogQuery;
-import com.mortals.xhx.module.record.model.DocTemplateVO;
-import com.mortals.xhx.module.record.model.RecordEntity;
+import com.mortals.xhx.module.record.model.*;
 import com.mortals.xhx.module.record.service.PrintWaitQueueService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.entity.ContentType;
@@ -43,7 +41,6 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.record.dao.ApplyLogDao;
-import com.mortals.xhx.module.record.model.ApplyLogEntity;
 import com.mortals.xhx.module.record.service.ApplyLogService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -103,7 +100,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
             orConditionList.add(condition2);
             query.setOrConditionList(orConditionList);
         }
-        query.setRecordStatus(YesNoEnum.NO.getValue());
+        query.setRecordStatus(YesNoEnum.NO.getValue());        //已归档的不显示
         return query;
     }
 
@@ -268,6 +265,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
             updata.setRecordStatus(YesNoEnum.YES.getValue());
             updata.setUpdateTime(new Date());
             dao.update(updata);
+            PrintWaitQueueEntity condition = new PrintWaitQueueEntity();
+            condition.setApplyId(oldId);
+            printWaitQueueService.remove(condition,context);
         }
         printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
     }
@@ -537,6 +537,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
             throw new AppException("目录模板ID不正确");
         }
         ApplyLogEntity entity = new ApplyLogEntity();
+        entity.setSiteId(pdu.getSiteId());
         entity.setCatalogId(catalog.getId());
         entity.setCatalogCode(catalog.getCatalogCode());
         entity.setCatalogName(catalog.getCatalogName());