From 096296cd7485c5583c8194d88cca700e3c4d84a0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 16:50:42 +0800
Subject: [PATCH] 调整基础配置信息查询方式，取消jpa
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
index 965f11c..5923d64 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -1,10 +1,10 @@
package com.fzzy.igds.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.domain.Company;
-import com.fzzy.igds.repository.CompanyRepository;
+import com.fzzy.igds.mapper.CoreCompanyMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -20,46 +20,39 @@
public class CoreCompanyService {
@Resource
- private CompanyRepository companyRepository;
+ private CoreCompanyMapper coreCompanyMapper;
/**
- * jpa鏌ヨ鍏徃淇℃伅
+ * 鏍规嵁鏉′欢鏌ヨ鍏徃淇℃伅
* @param id
+ * @param companyId
+ * @param parentId
* @return
*/
- public List<Company> getDataById(String id) {
+ public List<Company> listCompany(String id, String companyId, String parentId) {
- return companyRepository.getDataById(id);
- }
+ QueryWrapper<Company> queryWrapper = new QueryWrapper<>();
- /**
- * jpa鏌ヨ鍏徃淇℃伅
- * @return
- */
- public List<Company> getAllData(String companyId) {
-
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
+ if(StringUtils.isNotBlank(id)){
+ queryWrapper.eq("id", id);
}
- return companyRepository.getAllData(companyId);
+ if(StringUtils.isNotBlank(companyId)){
+ queryWrapper.eq("company_id", companyId);
+ }
+ if(StringUtils.isNotBlank(parentId)){
+ queryWrapper.likeRight("id", parentId);
+ }
+
+ return coreCompanyMapper.selectList(queryWrapper);
}
/**
- * jpa鏌ヨ鍏徃淇℃伅
- * @return
- */
- public List<Company> getDataByParentId() {
-
- SysUser user = ContextUtil.getLoginUser();
- return companyRepository.getDataByParentId(user.getDeptId() + "%");
- }
-
- /**
- * jpa鏂板鍏徃淇℃伅
+ * 鏇存柊鎴栦繚瀛樺叕鍙镐俊鎭�
* @param sysDept
+ * @param isAdd
* @return
*/
- public void saveOrUpdate(SysDept sysDept) {
+ public void saveOrUpdate(SysDept sysDept, Boolean isAdd) {
if (null == sysDept) {
return;
}
@@ -72,15 +65,30 @@
company.setDwzt(sysDept.getStatus());
company.setCompanyId(sysDept.getCompanyId());
- //鍒涘缓淇℃伅
- company.setCreateBy(ContextUtil.getLoginUserName());
- company.setCreateTime(new Date());
-
- this.update(company);
+ if (isAdd) {
+ this.save(company);
+ }else {
+ this.update(company);
+ }
}
/**
- * jpa鏇存柊鍏徃淇℃伅
+ * 鏂板鍏徃淇℃伅
+ * @param data
+ */
+ public void save(Company data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ //鏂板淇℃伅
+ data.setCreateBy(ContextUtil.getLoginUserName());
+ data.setCreateTime(new Date());
+
+ coreCompanyMapper.insert(data);
+ }
+
+ /**
+ * 鏇存柊鍏徃淇℃伅
* @param data
*/
public void update(Company data) {
@@ -91,7 +99,7 @@
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
- companyRepository.save(data);
+ coreCompanyMapper.updateById( data);
}
/**
@@ -100,6 +108,6 @@
* @return
*/
public void delData(String deptId) {
- companyRepository.deleteById(deptId);
+ coreCompanyMapper.deleteById(deptId);
}
}
\ No newline at end of file
--
Gitblit v1.9.3