From 9d96f11fb1de77d1ad4fb0be04a10ae8eb7f46c9 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 04 八月 2023 17:52:08 +0800 Subject: [PATCH] 提交代码 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 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 db243fa..60636f9 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 @@ -9,7 +9,7 @@ import com.thoughtworks.xstream.io.xml.DomDriver; import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO; import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.DockingSysIntHeaderDTO; import com.vci.ubcs.code.dto.DockingSystemConfigDTO; import com.vci.ubcs.code.dto.DockingSysIntParamDTO; @@ -34,6 +34,7 @@ import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; +import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.web.constant.QueryOptionConstant; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; @@ -95,11 +96,11 @@ */ @Autowired(required = false) private DockingSystemMapper dockingSystemMapper; - /*** - * 浠诲姟鐢熸垚鏈嶅姟 - */ - @Autowired(required = false) - private IDockingTaskService dockingTaskService; +// /*** +// * 浠诲姟鐢熸垚鏈嶅姟 +// */ +// @Resource +// private IDockingTaskService dockingTaskService; /** @@ -183,7 +184,7 @@ DockingSysIntParam sysIntParamDO = new DockingSysIntParam(); sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid()); BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO,MdmBtmTypeConstant.SYS_INT_PARAMTERY); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY); sysIntParamList.add(sysIntParamDO); }); } @@ -386,7 +387,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 +421,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(); @@ -450,7 +451,7 @@ dockingTaskDO_insert.add(dockingTaskDO); }); } - dockingTaskService.saveBatch(dockingTaskDO_insert); +// dockingTaskService.saveBatch(dockingTaskDO_insert); }catch (Throwable e){ msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"; log.error("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"+e); -- Gitblit v1.9.3