From 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 18:48:11 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java |   93 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 75 insertions(+), 18 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 d376ebb..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,10 +1,14 @@
 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;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
@@ -19,27 +23,57 @@
 public class CoreDeptService {
 
     @Resource
-    private DeptRepository deptRepository;
+    private ISysDeptService iSysDeptService;
+    @Resource
+    private CoreDeptMapper coreDeptMapper;
+    @Resource
+    private InoutConfService inoutConfService;
 
     /**
-     * jpa鏌ヨ淇℃伅
+     * 鏍规嵁鏉′欢鏌ヨ搴撳尯淇℃伅
+     * @param id
      * @param companyId
+     * @param parentId
      * @return
      */
-    public List<Dept> getAllData(String companyId) {
+    public List<Dept> listDept(String id, String companyId, String parentId) {
 
-        if (StringUtils.isEmpty(companyId)) {
-            companyId = ContextUtil.getCompanyId();
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+
+        if(StringUtils.isNotBlank(id)){
+            queryWrapper.eq("id", id);
         }
-        return deptRepository.getAllData(companyId);
+        if(StringUtils.isNotBlank(companyId)){
+            queryWrapper.eq("company_id", companyId);
+        }
+        if(StringUtils.isNotBlank(parentId)){
+            queryWrapper.likeRight("id", parentId);
+        }
+
+        return coreDeptMapper.selectList(queryWrapper);
     }
 
     /**
-     * jpa鏂板搴撳尯淇℃伅
-     * @param sysDept
+     * 鏌ヨ淇℃伅
      * @return
      */
-    public void saveOrUpdate(SysDept sysDept) {
+    public List<Dept> getDeptData() {
+        SysUser user = ContextUtil.getLoginUser();
+        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
+        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+            return this.listDept(ContextUtil.subDeptId(user),null,null);
+        }else {
+            return this.listDept(null,null,user.getDeptId() + "%");
+        }
+    }
+
+    /**
+     * 鏂板鎴栨洿鏂板簱鍖轰俊鎭�
+     * @param sysDept
+     * @param isAdd
+     * @return
+     */
+    public void saveOrUpdate(SysDept sysDept, Boolean isAdd) {
         if (null == sysDept) {
             return;
         }
@@ -48,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);
     }
 
     /**
@@ -76,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