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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.module.common.api.entity.BaseEnterpriseCert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +25,6 @@ public class BaseEnterpriseCertDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "单位编码")
     private String unitCode;
 
@@ -55,8 +55,8 @@ public class BaseEnterpriseCertDto extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    @ApiModelProperty(value = "许可项目信息code")
-    List<String> itemCodes;
+    @ApiModelProperty(value = "许可项目信息")
+    List<DataDictionaryDto> itemCodes;
 
     @ApiModelProperty(value = "机构类别")
     private String agencyType;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -26,7 +26,7 @@
                 and a.apply_time >=#{applyStartTime}
             </if>
             <if test="jyjcOpeningApplicationRequstDto.type == 'supervision'">
-                and (workflow_prostance_id <![CDATA[<>]]> OR a.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%' ))
+                and (a.workflow_prostance_id <![CDATA[<>]]> '' OR a.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%' ))
             </if>
             <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
                 and (a.unit_code = #{jyjcOpeningApplicationRequstDto.unitCode} OR a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -549,10 +550,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         jyjcOpeningApplicationModel.setBaseUnitLicences(certDtos);
     }
 
-    private List<String> getBuildItemCode(Long sequenceNbr) {
+    private List<DataDictionaryDto> getBuildItemCode(Long sequenceNbr) {
         List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>()
                 .eq(BaseUnitLicence::getEnterpriseCertSeq, sequenceNbr).select(BaseUnitLicence::getItemCode, BaseEntity::getSequenceNbr));
-        return baseUnitLicences.stream().map(BaseUnitLicence::getItemCode).filter(Objects::nonNull).collect(Collectors.toList());
+        return baseUnitLicences.stream().map(l->{
+            DataDictionaryDto dto = new DataDictionaryDto();
+            dto.setCode(l.getItemCode());
+            dto.setName(l.getItemCodeName());
+            dto.setSequenceNbr(l.getDictSeq());
+            return dto;
+        }).collect(Collectors.toList());
     }
 
 
@@ -836,11 +843,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             Optional.ofNullable(e.getItemCodes())
                     .orElseGet(Collections::emptyList)
                     .stream()
-                    .filter(Objects::nonNull).forEach(itemCode -> {
+                    .filter(Objects::nonNull).forEach(item -> {
                         BaseUnitLicence licence = new BaseUnitLicence();
                         BeanUtils.copyProperties(e, licence);
                         licence.setSequenceNbr(sequence.nextId());
-                        licence.setItemCode(itemCode);
+                        licence.setQualificationCertificateAttachment(cert.getQualificationCertificateAttachment());
+                        licence.setItemCode(item.getCode());
+                        licence.setItemCodeName(item.getName());
+                        licence.setDictSeq(item.getSequenceNbr());
+                        licence.setRecDate(new Date());
                         licence.setUnitCode(jyjcOpeningApplication.getUnitCode());
                         licence.setUnitName(jyjcOpeningApplication.getUnitCodeName());
                         licence.setEnterpriseCertSeq(cert.getSequenceNbr().toString());

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

@@ -182,4 +182,21 @@ public class BaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;
 
+    /**
+     * 所属证书
+     */
+    @TableField("enterprise_cert_seq")
+    private String enterpriseCertSeq;
+
+    /**
+     * 字典表id
+     */
+    @TableField("dict_seq")
+    private Long dictSeq;
+
+    /**
+     * 企业资质证书照片
+     */
+    @TableField("qualification_certificate_attachment")
+    private String qualificationCertificateAttachment;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

 package com.yeejoin.amos.boot.module.tcm.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
@@ -110,4 +111,24 @@ public class TzBaseUnitLicence extends BaseEntity {
     private String licenceType;
 
 
+    /**
+     * 所属证书
+     */
+    @TableField("enterprise_cert_seq")
+    private String enterpriseCertSeq;
+
+
+
+    /**
+     * 字典表id
+     */
+    @TableField("dict_seq")
+    private Long dictSeq;
+
+    /**
+     * 企业资质证书照片
+     */
+    @TableField("qualification_certificate_attachment")
+    private String qualificationCertificateAttachment;
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/TzBaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -105,4 +106,15 @@ public class TzBaseUnitLicenceDto extends BaseDto {
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;
+
+
+    @ApiModelProperty(value = " 所属证书id")
+    private String enterpriseCertSeq;
+
+
+    @ApiModelProperty(value = "字典表id")
+    private Long dictSeq;
+
+    @ApiModelProperty(value = "企业资质证书照片")
+    private String qualificationCertificateAttachment;
 }

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

@@ -187,6 +187,19 @@ public class BaseUnitLicence extends BaseEntity {
     /**
      * 所属证书ID
      */
+    @TableField("enterprise_cert_seq")
     private String enterpriseCertSeq;
 
+    /**
+     * 字典表id
+     */
+    @TableField("dict_seq")
+    private Long dictSeq;
+
+    /**
+     * 企业资质证书照片
+     */
+    @TableField("qualification_certificate_attachment")
+    private String qualificationCertificateAttachment;
+
 }

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

 package com.yeejoin.amos.boot.module.ymt.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
@@ -111,6 +112,20 @@ public class TzBaseUnitLicence extends BaseEntity {
     /**
      * 所属证书
      */
+    @TableField("enterprise_cert_seq")
     private String enterpriseCertSeq;
 
+
+
+    /**
+     * 字典表id
+     */
+    @TableField("dict_seq")
+    private Long dictSeq;
+
+    /**
+     * 企业资质证书照片
+     */
+    @TableField("qualification_certificate_attachment")
+    private String qualificationCertificateAttachment;
 }