From 5edd1056e46c51e501f7377f1a1b0a12e4d22504 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 18:14:29 +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 | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 de2d4c3..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);
});
}
@@ -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