From da2d0647babd92e8929a09d4bfaaf413b980fe24 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 02 十二月 2025 20:19:58 +0800
Subject: [PATCH] 登记及称重页面调整，及相关流程逻辑
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index ad5fde1..eefcd8d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -1,8 +1,9 @@
package com.fzzy.igds.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.repository.DeptRepository;
+import com.fzzy.igds.mapper.CoreDeptMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,39 +25,55 @@
@Resource
private ISysDeptService iSysDeptService;
@Resource
- private DeptRepository deptRepository;
-
+ private CoreDeptMapper coreDeptMapper;
+ @Resource
+ private InoutConfService inoutConfService;
/**
- * jpa鏌ヨ淇℃伅
+ * 鏍规嵁鏉′欢鏌ヨ搴撳尯淇℃伅
+ * @param id
+ * @param companyId
* @param parentId
* @return
*/
- public List<Dept> getDataByParentId(String parentId) {
- return deptRepository.getDataByParentId(parentId + "%");
+ public List<Dept> listDept(String id, String companyId, String parentId) {
+
+ QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+
+ if(StringUtils.isNotBlank(id)){
+ queryWrapper.eq("id", id);
+ }
+ if(StringUtils.isNotBlank(companyId)){
+ queryWrapper.eq("company_id", companyId);
+ }
+ if(StringUtils.isNotBlank(parentId)){
+ queryWrapper.likeRight("id", parentId);
+ }
+
+ return coreDeptMapper.selectList(queryWrapper);
}
-
/**
- * jpa鏌ヨ淇℃伅
+ * 鏌ヨ淇℃伅
* @return
*/
public List<Dept> getDeptData() {
SysUser user = ContextUtil.getLoginUser();
SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
- return deptRepository.getDataById(ContextUtil.subDeptId(user));
+ return this.listDept(ContextUtil.subDeptId(user),null,null);
}else {
- return deptRepository.getDataByParentId(user.getDeptId() + "%");
+ return this.listDept(null,null,user.getDeptId() + "%");
}
}
/**
- * jpa鏂板搴撳尯淇℃伅
+ * 鏂板鎴栨洿鏂板簱鍖轰俊鎭�
* @param sysDept
+ * @param isAdd
* @return
*/
- public void saveOrUpdate(SysDept sysDept) {
+ public void saveOrUpdate(SysDept sysDept, Boolean isAdd) {
if (null == sysDept) {
return;
}
@@ -65,26 +82,45 @@
dept.setKqmc(sysDept.getDeptName());
dept.setCompanyId(sysDept.getCompanyId());
- //鍒涘缓淇℃伅
- dept.setCreateBy(ContextUtil.getLoginUserName());
- dept.setCreateTime(new Date());
-
- this.update(dept);
+ if (isAdd) {
+ this.save(dept);
+ }else {
+ this.update(dept);
+ }
}
/**
- * jpa鏇存柊搴撳尯淇℃伅
+ * 淇濆瓨搴撳尯淇℃伅
+ * @param data
+ */
+ public void save(Dept data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ //鍒涘缓淇℃伅
+ data.setCreateBy(ContextUtil.getLoginUserName());
+ data.setCreateTime(new Date());
+
+ coreDeptMapper.insert(data);
+
+ //鍒濆鍖栧嚭鍏ュ簱娴佺▼閰嶇疆淇℃伅
+ inoutConfService.initSysConfData(data.getCompanyId(), data.getId());
+ }
+
+ /**
+ * 鏇存柊搴撳尯淇℃伅
* @param data
*/
public void update(Dept data) {
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
+
//鏇存柊淇℃伅
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
- deptRepository.save(data);
+ coreDeptMapper.updateById(data);
}
/**
@@ -93,6 +129,10 @@
* @return
*/
public void delData(String deptId) {
- deptRepository.deleteById(deptId);
+ //鍒犻櫎搴撳尯淇℃伅
+ coreDeptMapper.deleteById(deptId);
+
+ //鍒犻櫎娴佺▼閰嶇疆淇℃伅
+ inoutConfService.delSysConfData(deptId);
}
}
\ No newline at end of file
--
Gitblit v1.9.3