diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java index 844aa9d6..33a9c927 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java @@ -11,6 +11,11 @@ import lombok.ToString; @ToString public class IamUserAcceptDto extends IamCommonAcceptDto { + + /** + * 飞书id + */ + private String id; /** * 用户的id,在删除或编辑的接口会传递 */ diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java index f7e2d010..80f65c6e 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java @@ -203,8 +203,8 @@ public class SyncIamService { sysUser.setActivitiSync(0); sysUser.setUserIdentity(0); - // todo 设置飞书id - // sysUser.setFeishuId(); + // 设置飞书id, IAM村的id就是飞书id + sysUser.setFeishuId(userAcceptDto.getId()); sysUser.setTypeId(userAcceptDto.getSrmsTypeId()); sysUser.setPost(userAcceptDto.getSrmsPost()); sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId()); @@ -300,8 +300,8 @@ public class SyncIamService { if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPostStatus())){ sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus()); } - // todo 设置飞书id - // sysUser.setFeishuId(); + // 设置飞书id, IAM村的id就是飞书id + sysUser.setFeishuId(userAcceptDto.getId()); // 获取组织机构(多个逗号分隔) String orgCode = userAcceptDto.getSrmsOrgCode(); String selectedDeparts = null; @@ -691,7 +691,8 @@ public class SyncIamService { } - // TODO 菜单英文名数据库中没有,需要确认 + // 菜单英文名 + sysPermission.setMenuEn(resourceDto.getMenu_en()); // sysPermission的 menuType (0:一级菜单;1:子菜单 ;2:按钮权限) if (DockingConstant.BPMC_RESOURCE_TYPE_MENU == resourceDto.getMenu_type()){ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 9f0c5d92..eb1fe176 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -222,4 +222,19 @@ public class MarketStandardController { public Result queryFirstByVersionFlag(String versionFlag) { return Result.OK(marketStandardService.queryFirstByVersionFlag(versionFlag)); } + + + /** + * 获取清单编号 + * + * @param marketStandard + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-获取清单编号") + @ApiOperation(value = "外部标准库-市场法规清单-获取清单编号", notes = "外部标准库-市场法规清单-获取清单编号") + @GetMapping(value = "/getManifestNo") + @ApiOperationSupport(order = 8) + public Result getManifestNo(LawsMarketStandard marketStandard) { + return marketStandardService.getManifestNo(marketStandard); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index e34f2994..6717eade 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -113,4 +113,11 @@ public interface ILawsMarketStandardService extends IService * @return */ LawsMarketStandard queryFirstByVersionFlag(String versionFlag); + + /** + * 获取清单编号 + * @param marketStandard + * @return + */ + Result getManifestNo(LawsMarketStandard marketStandard); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 89db1583..7a4ad04c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -206,9 +206,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listCountry = marketStandardMapper.getOneByEnBase(Arrays.asList(country.split(","))); // 生成清单编号 - String s = "BZFG-" + String.join(",",listCountry) + "-"; + String s = "BZFG-" + country + "-"; String manifestNo = marketStandardMapper.getOneByManifestNo(s); if(StringUtils.isBlank(manifestNo)){ return s + "01"; @@ -543,6 +542,18 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl getManifestNo(LawsMarketStandard marketStandard) { + if(StringUtils.isEmpty(marketStandard.getCountry())){ + Result.error("请选择国家/地区"); + } + List listCountry = marketStandardMapper.getOneByEnBase(Arrays.asList(marketStandard.getCountry().split(","))); + if(CollectionUtils.isEmpty(listCountry)){ + return Result.OK(); + } + return Result.OK(String.join(",",listCountry)); + } }