refact(注册开通)：流程调整

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BaseEnterpriseCertDto.java

@@ -58,4 +58,7 @@ public class BaseEnterpriseCertDto extends BaseDto {
     @ApiModelProperty(value = "许可项目信息code")
     List<String> itemCodes;
 
+    @ApiModelProperty(value = "机构类别")
+    private String agencyType;
+
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/BaseEnterpriseCert.java

@@ -82,4 +82,9 @@ public class BaseEnterpriseCert extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 机构类别
+     */
+    @TableField("agency_type")
+    private String agencyType;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -503,6 +503,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<BaseEnterpriseCertDto> certDtos = enterpriseCerts.parallelStream().map(c -> {
             BaseEnterpriseCertDto enterpriseCertDto = new BaseEnterpriseCertDto();
             BeanUtils.copyProperties(c, enterpriseCertDto);
+            enterpriseCertDto.setQualificationCertificateAttachment(JSONArray.parseArray(c.getQualificationCertificateAttachment()));
             enterpriseCertDto.setItemCodes(this.getBuildItemCode(c.getSequenceNbr()));
             return enterpriseCertDto;
         }).collect(Collectors.toList());
@@ -764,11 +765,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<BaseEnterpriseCertDto> certDtos = hisData.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
         List<BaseEnterpriseCert> certs = new ArrayList<>();
         List<BaseUnitLicence> licences = new ArrayList<>();
+        List<Long> enterpriseCertSeqs = new ArrayList<>();
         certDtos.forEach(e -> {
             BaseEnterpriseCert cert = new BaseEnterpriseCert();
             BeanUtils.copyProperties(e, cert);
+            cert.setQualificationCertificateAttachment(e.getQualificationCertificateAttachment().toJSONString());
+            cert.setUnitCode(jyjcOpeningApplication.getUnitCode());
             if (cert.getSequenceNbr() == null) {
                 cert.setSequenceNbr(sequence.nextId());
+            } else {
+                enterpriseCertSeqs.add(cert.getSequenceNbr());
             }
             Optional.ofNullable(e.getItemCodes())
                     .orElseGet(Collections::emptyList)
@@ -782,8 +788,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             });
             certs.add(cert);
         });
+        if(!enterpriseCertSeqs.isEmpty()){
+            baseUnitLicenceMapper.delete(new LambdaQueryWrapper<BaseUnitLicence>().in(BaseUnitLicence::getEnterpriseCertSeq, enterpriseCertSeqs));
+        }
         if (!certs.isEmpty()) {
-            enterpriseCertService.saveBatch(certs);
+            enterpriseCertService.saveOrUpdateBatch(certs);
         }
         if (!licences.isEmpty()) {
             licences.parallelStream().forEach(licence -> {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/BaseUnitLicence.java

@@ -185,7 +185,7 @@ public class BaseUnitLicence extends BaseEntity {
     private String licenceType;
 
     /**
-     * 所属证书
+     * 所属证书ID
      */
     private String enterpriseCertSeq;