From 4d46d3d70d2f38eebd2b861a97a9bf5ba9604ada Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期四, 13 七月 2023 11:08:28 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java index 2c282f1..de2d4c3 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java @@ -386,7 +386,7 @@ String codeClassifyOid = dockingSystemConfig.getClassifyOid(); CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyOid); CodeClassifyVO topClassifyVO = classifyService.getTopClassifyVO(codeClassifyOid); - String btmTypeId = topClassifyVO.getBtmtypeid(); + String btmTypeId = topClassifyVO.getBtmTypeId(); if (StringUtils.isBlank(btmTypeId)) { return R.fail("杩欎釜鍒嗙被鎵�灞為《灞傚垎绫绘病鏈夋坊鍔犱笟鍔$被鍨�"); } @@ -420,7 +420,7 @@ String btmoid = map.get("oid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("oid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁oid String sendtype = map.get("lcstatus".toUpperCase(Locale.ROOT)) == null ? "" : map.get("lcstatus".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎺ㄩ�佺被鍨� String id = map.get("id".toUpperCase(Locale.ROOT)) == null ? "" : map.get("id".toUpperCase(Locale.ROOT)).toString();//缂栫爜 - String btmid = topClassifyVO.getBtmtypeid();//鏁版嵁涓氬姟绫诲瀷 + String btmid = topClassifyVO.getBtmTypeId();//鏁版嵁涓氬姟绫诲瀷 String classifyoid = map.get("codeclsfid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("codeclsfid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎵�鍦ㄧ殑鍒嗙被id String date2Str = VciDateUtil.date2Str(new Date(), VciDateUtil.DateTimeFormatStr); DockingTask dockingTaskDO = new DockingTask(); -- Gitblit v1.9.3