增加E_LICENSE_NULLIFY_REG视图内容的写入

src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/RevokeServiceImpl.java

@@ -3,29 +3,27 @@ package com.chinaweal.aiccs.aiccs.revoke.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAttachment;
-import com.chinaweal.aiccs.aiccs.abnormal.service.IGzaiccodeService;
-import com.chinaweal.aiccs.aiccs.asyncTask.RevokeAsyncTask;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
-import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSAttachmentService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
+import com.chinaweal.aiccs.aiccs.asyncTask.RevokeAsyncTask;
 import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion;
 import com.chinaweal.aiccs.aiccs.auditing.service.TSOpinionService;
 import com.chinaweal.aiccs.aiccs.business.entity.TSTwfProcessNode;
 import com.chinaweal.aiccs.aiccs.business.service.WorkFlowService;
 import com.chinaweal.aiccs.aiccs.dict.entity.CmsDictCode;
 import com.chinaweal.aiccs.aiccs.dict.service.CmsDictCodeService;
+import com.chinaweal.aiccs.aiccs.force.entity.XrLiccanRec;
+import com.chinaweal.aiccs.aiccs.force.entity.XrLiccanRecTask;
+import com.chinaweal.aiccs.aiccs.force.service.IXrLiccanRecService;
+import com.chinaweal.aiccs.aiccs.force.service.IXrLiccanRecTaskService;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.ForceLogoutNotice;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.ForceLogoutNoticeDetail;
-import com.chinaweal.aiccs.aiccs.force.entity.XrLiccanRec;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.service.ForceLogoutNoticeDetailService;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.service.ForceLogoutNoticeService;
-import com.chinaweal.aiccs.aiccs.force.service.IXrLiccanRecService;
 import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
 import com.chinaweal.aiccs.aiccs.revoke.entity.*;
-import com.chinaweal.aiccs.aiccs.revoke.entity.dto.BizRevEntAttachDto;
 import com.chinaweal.aiccs.aiccs.revoke.entity.dto.RevokeProcessDto;
 import com.chinaweal.aiccs.aiccs.revoke.service.*;
 import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
@@ -45,12 +43,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 /**
  * @author Lee
@@ -100,6 +96,8 @@ public class RevokeServiceImpl implements IRevokeProcessService {
     private ForceLogoutNoticeService forceLogoutNoticeService;
     @Autowired
     private IXrLiccanRecService xrLiccanRecService;
+    @Autowired
+    private IXrLiccanRecTaskService xrLiccanRecTaskService;
 
     @Override
     public void processControl(RevokeProcessDto revokeProcessDto, Tsrevtasklist taskList, Tsbizrevlist tsbizrevlist,
@@ -590,25 +588,29 @@ public class RevokeServiceImpl implements IRevokeProcessService {
         forceLogoutNoticeService.deactivationNotice(bizseq, loginUser, tsbizrevlist, taskList);
 
         // 生成营业执照作废声明数据
+        LocalDate now = LocalDate.now();
         for (ForceLogoutNoticeDetail detail : forceLogoutNoticeDetailList) {
             // 跳过已剔除的企业
             if ("1".equals(detail.getIsRemove())) {
                 continue;
             }
 
+            XrLiccanRecTask entnameEntity = new XrLiccanRecTask();
+            entnameEntity.setEntName(detail.getEntName());
+            String liccanSta = xrLiccanRecTaskService.generateLiccanSta(handler, entnameEntity);
+
             XrLiccanRec liccanRec = new XrLiccanRec();
-            liccanRec.setRecId(UUID.randomUUID().toString());
             liccanRec.setPripId(detail.getPripid());
             liccanRec.setEntName(detail.getEntName());
             liccanRec.setUniscId(detail.getUniscid());
             liccanRec.setRegno(detail.getRegNo());
             liccanRec.setRegOrg(detail.getRegOrg());
             liccanRec.setRegOrgCn(detail.getRegOrgCn());
-            liccanRec.setRegType("FORCE_LOGOUT");
+            liccanRec.setRegType("51"); //强制注销
             liccanRec.setLiccanReason("1");
             liccanRec.setIsoricop("1");
-            liccanRec.setLiccanSta("营业执照因强制注销公告作废");
+            liccanRec.setLiccanSta(liccanSta);
-            liccanRec.setLiccanDate(LocalDate.now());
+            liccanRec.setLiccanDate(now);
 
             xrLiccanRecService.save(liccanRec);
         }