From dd6942743fa3936a1bbcbe6f4102c028d8021d5c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 16:56:35 +0800
Subject: [PATCH] 完善高级查询组件

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index ba39071..bfb5344 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -45,7 +45,6 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.context.annotation.Lazy;
@@ -87,7 +86,7 @@
 	@Autowired(required = false)
 	private CodeTempphaseServiceImpl codeTempphaseServiceImpl;
 	@Autowired(required = false)
-	private CodeTempbuttonServiceImpl codeTempbuttonServiceImpl;
+	private CodeClassifyTemplateButtonServiceImpl codeTempbuttonServiceImpl;
 	@Autowired(required = false)
 	private ICodeClassifyProcessTempService codeClsflowtempServiceImpl;
 //	@Autowired(required = false)
@@ -649,7 +648,10 @@
 		codeClassifyTemplateDO_old.setDescription(codeClassifyDTO.getDescription());//鎻忚堪
 		codeClassifyTemplateDO_old.setCodeClassifyOid(codeClassifyOid);//鍒嗙被oid
 		codeClassifyTemplateDO_old.setOid(newOid);
-		List<CodeClassifyTemplate> codeClassifyTemplateDOList = new ArrayList<CodeClassifyTemplate>();
+		codeClassifyTemplateDO_old.setTs(new Date());
+		codeClassifyTemplateDO_old.setCreateTime(new Date());
+		codeClassifyTemplateDO_old.setLastModifyTime(new Date());
+		List<CodeClassifyTemplate> codeClassifyTemplateDOList = new ArrayList<>();
 		codeClassifyTemplateDOList.add(codeClassifyTemplateDO_old);
 
 		//澶嶅埗妯℃澘灞炴��
@@ -875,9 +877,11 @@
 		CodeClassifyTemplate codeClstemplateQuery = new CodeClassifyTemplate();
 //		BeanUtil.toBean(map,codeClstempattrVO);
 //		BeanUtil
-		BeanMap beanMap = BeanMap.create(codeClstemplateQuery);
+		CodeClassifyTemplateDTO codeClassifyTemplateDTO = new CodeClassifyTemplateDTO();
+		BeanMap beanMap = BeanMap.create(codeClassifyTemplateDTO);
 		beanMap.putAll(conditionMap);
 //		BeanUtils.copyProperties(codeClstemplateVO,codeClstemplateQuery);
+		BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClstemplateQuery);
 		if (pageHelper == null) {
 			pageHelper = new PageHelper(-1);
 		}

--
Gitblit v1.9.3