From 1c3005a6b1ebc5d355faf1d01f6bfb647b80700c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 17 七月 2025 17:15:35 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
index 616fe49..8579fe1 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CatalogueServiceImpl.java
@@ -13,6 +13,7 @@
import com.gkhy.exam.system.domain.vo.CatalogueVo;
import com.gkhy.exam.system.mapper.CatalogueMapper;
import com.gkhy.exam.system.mapper.CompanyIndustryTemplateMapper;
+import com.gkhy.exam.system.mapper.ProductItemMapper;
import com.gkhy.exam.system.mapper.SysCompanyMapper;
import com.gkhy.exam.system.service.CatalogueService;
import com.gkhy.exam.system.service.SysCompanyService;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +36,8 @@
private SysCompanyMapper sysCompanyMapper;
@Autowired
private CompanyIndustryTemplateMapper companyIndustryTemplateMapper;
+ @Autowired
+ private ProductItemMapper productItemMapper;
/**
* 目录管理
@@ -73,7 +77,7 @@
}
}
catalogue.setCreateBy(SecurityUtils.getUsername());
- catalogue.setCreateTime(LocalDate.now());
+ catalogue.setCreateTime(LocalDateTime.now());
int insert = catalogueMapper.insert(catalogue);
if (insert>0){
return CommonResult.success();
@@ -84,7 +88,7 @@
@Override
public CommonResult updateCatalogue(Catalogue catalogue) {
catalogue.setUpdateBy(SecurityUtils.getUsername());
- catalogue.setUpdateTime(LocalDate.now());
+ catalogue.setUpdateTime(LocalDateTime.now());
int i = catalogueMapper.updateById(catalogue);
if (i>0){
return CommonResult.success();
@@ -104,7 +108,7 @@
Catalogue catalogue = new Catalogue();
catalogue.setId(catalogueId);
catalogue.setDelFlag(2);
- catalogue.setUpdateTime(LocalDate.now());
+ catalogue.setUpdateTime(LocalDateTime.now());
catalogue.setUpdateBy(SecurityUtils.getUsername());
int i = catalogueMapper.updateById(catalogue);
if (i>0){
@@ -243,7 +247,8 @@
@Override
public CommonResult copyCatalogue(List<CatalogueVo> catalogue) {
Integer companyId = catalogue.get(0).getCompanyId();
- catalogueMapper.delete(Wrappers.<Catalogue>lambdaQuery().eq(Catalogue::getCompanyId,companyId));
+ Integer type = catalogue.get(0).getType();
+ catalogueMapper.delete(Wrappers.<Catalogue>lambdaQuery().eq(Catalogue::getCompanyId,companyId).eq(Catalogue::getType,catalogue.get(0).getType()));
for (CatalogueVo catalogueVo : catalogue) {
Catalogue catalogue1 = new Catalogue();
BeanUtils.copyProperties(catalogueVo,catalogue1);
@@ -253,6 +258,7 @@
saveCatalogue(children,catalogue1);
}
}
+ productItemMapper.deletedByCompanyId(companyId,type.equals(2)?1:2);
return CommonResult.success();
}
--
Gitblit v1.9.2