From e2255cad8935c961fe161eca60dc88b0930395ad Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期一, 11 十二月 2023 15:25:00 +0800 Subject: [PATCH] 项目表 --- modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java index 61b9549..6c6234f 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java @@ -1,6 +1,7 @@ package com.zt.life.modules.configItemWarehouse.service; import com.zt.common.service.BaseService; +import com.zt.common.utils.CommonUtils; import com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao; import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto; import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse; @@ -22,6 +23,7 @@ import com.zt.modules.oss.service.SysOssService; import com.zt.modules.workflow.dto.FlowInfoDto; import com.zt.modules.workflow.service.WorkflowService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; @@ -103,9 +105,20 @@ for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) { configItem.setWarehouseId(warehouseId); if (configItem.getId() != null) { - configItemService.update(configItem); + WarehouseConfigItem configItem2 = configItemService.get(configItem.getId()); + if (CommonUtils.isActureChangeData(configItem,configItem2)) { + configItemService.update(configItem); + } } else { + Map<String, String> map = new HashMap<>(); + String pageCode = configItem.getPageCode(); + if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) { + map.put("funCode", "test_" + pageCode); + //map.put("projectId",configItemDto.getProjectId().toString()); + configItem.setItemIdentify(sysCodeRuleService.getNewCode(map)); + } configItem.setWarehouseId(warehouseId); + configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId()); configItemService.insert(configItem); } Long checkId = configItem.getCheckId(); @@ -114,6 +127,7 @@ if (testCheckOrder.getConfigItemId() == null) { Long configItemId = configItem.getId(); testCheckOrder.setConfigItemId(configItemId); + testCheckOrder.setConfigOrderId(warehouseId); testCheckOrderService.update(testCheckOrder); } } -- Gitblit v1.9.1