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

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/CommonServiceImpl.java

@@ -31,6 +31,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -348,5 +349,13 @@ public class CommonServiceImpl {
         return companyLevel;
     }
 
+    public String getDictName(List<String> dictTypes, String dictKey) {
+        if(StringUtils.isEmpty(dictKey)){
+            return "";
+        }
+        List<DataDictionary> dataDictionaries = dictionaryService.list(new LambdaQueryWrapper<DataDictionary>().in(DataDictionary::getType, dictTypes).select(BaseEntity::getSequenceNbr, DataDictionary::getName, DataDictionary::getCode));
+        return dataDictionaries.stream().filter(d->d.getCode().equals(dictKey)).findFirst().map(DataDictionary::getName).orElse("");
+    }
+
 
 }

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

@@ -859,6 +859,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         licence.setItemCodeName(item.getName());
                         licence.setDictSeq(item.getSequenceNbr());
                         licence.setRecDate(new Date());
+                        licence.setApprovedOrgan(commonService.getDictName(Collections.singletonList("DJJG"), licence.getApprovedOrganCode()));
+                        licence.setAgencyTypeName(commonService.getDictName(Arrays.asList("1233-1", "1233-2"), licence.getAgencyType()));
                         licence.setUnitCode(jyjcOpeningApplication.getUnitCode());
                         licence.setUnitName(jyjcOpeningApplication.getUnitCodeName());
                         licence.setEnterpriseCertSeq(cert.getSequenceNbr().toString());