From 036a6d241cf1cfc0345ddf28e748a3d6deda08df Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 15 十二月 2025 20:35:09 +0800
Subject: [PATCH] 新增出入库审批页面

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java |  126 +++++++++++++++++++++++++++++-------------
 1 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
index ffb5ba9..c5219bb 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
@@ -6,6 +6,7 @@
 import com.fzzy.igds.domain.SnapConf;
 import com.fzzy.igds.mapper.SnapConfMapper;
 import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -22,63 +23,110 @@
     private SnapConfMapper snapConfMapper;
 
     /**
-     * 鏌ヨ鎵�鏈夋暟鎹�
+     * 鏌ヨ鍒楄〃鏁版嵁
      *
-     * @param param
-     * @author sgj
-     * @date 2025/12/10
+     * @param param 鏌ヨ鍙傛暟
+     * @return 鏁版嵁鍒楄〃
      */
-    public List<SnapConf> listAll(IgdsBaseParam param) {
-
-        if (null == param)
-            return snapConfMapper.selectList(null);
-
-        QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(param.getName())) {
-            queryWrapper.like("name", param.getName());
-        }
+    public List<SnapConf> selectList(SnapConf param) {
+        QueryWrapper<SnapConf> queryWrapper = getQueryWrapper(param);
         return snapConfMapper.selectList(queryWrapper);
     }
 
     /**
-     * 鏂板鏁版嵁
+     * 灏佽鏌ヨ鏉′欢
      *
-     * @param snapConf
-     * @author sgj
-     * @date 2025/12/10
+     * @param param 鏌ヨ鍙傛暟
+     * @return 鏌ヨ鏋勯�犲櫒
      */
-    public BaseResp addData(SnapConf snapConf) {
-        snapConf.setId(ContextUtil.generateId());
-        snapConf.setCompanyId(ContextUtil.getCompanyId());
-        snapConf.setUpdateBy(ContextUtil.getLoginUserName());
-        snapConf.setUpdateTime(new Date());
-        snapConf.setCreateBy(ContextUtil.getLoginUserName());
-        snapConf.setCreateTime(new Date());
-        return snapConfMapper.insert(snapConf) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+    public QueryWrapper<SnapConf> getQueryWrapper(SnapConf param) {
+        QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
+        if(null == param) param= new SnapConf();
+        // 璁剧疆鍏徃ID骞朵綔涓烘煡璇㈡潯浠�
+        param.setCompanyId(ContextUtil.getCompanyId());
+        queryWrapper.eq("company_id", param.getCompanyId());
+
+        // 鎸夋洿鏂版椂闂村�掑簭鎺掑簭
+        queryWrapper.orderByDesc("update_time");
+
+        return queryWrapper;
     }
 
     /**
-     * 鏇存柊鏁版嵁
+     * 鏍规嵁ID鏌ヨ璇︽儏
      *
-     * @param snapConf
-     * @author sgj
-     * @date 2025/12/10
+     * @param id 涓婚敭ID
+     * @return 瀹炰綋瀵硅薄
      */
-    public BaseResp updateData(SnapConf snapConf) {
-        snapConf.setUpdateBy(ContextUtil.getLoginUserName());
-        snapConf.setUpdateTime(new Date());
-        return snapConfMapper.updateById(snapConf) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+    public SnapConf selectById(String id) {
+        return snapConfMapper.selectById(id);
     }
 
     /**
-     * 鍒犻櫎鏁版嵁
+     * 鎻掑叆鏂版暟鎹�
      *
-     * @param snapConf
-     * @author sgj
-     * @date 2025/12/10
+     * @param param 鏁版嵁瀹炰綋
+     * @return 鎿嶄綔缁撴灉
      */
-    public BaseResp deleteData(SnapConf snapConf) {
-        return snapConfMapper.deleteById(snapConf) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+    public BaseResp insertData(SnapConf param) {
+        try {
+            param.setId(ContextUtil.generateId());
+            param.setCompanyId(ContextUtil.getCompanyId());
+            param.setCreateBy(ContextUtil.getLoginUserName());
+            param.setCreateTime(new Date());
+            return snapConfMapper.insert(param) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+        } catch (Exception e) {
+            log.error("鎻掑叆蹇媿閰嶇疆鏁版嵁寮傚父", e);
+            return BaseResp.error("娣诲姞澶辫触锛�" + e.getMessage());
+        }
+    }
+
+    /**
+     * 鏇存柊宸叉湁鏁版嵁
+     *
+     * @param param 鏁版嵁瀹炰綋
+     * @return 鎿嶄綔缁撴灉
+     */
+    public BaseResp updateData(SnapConf param) {
+        try {
+            param.setUpdateBy(ContextUtil.getLoginUserName());
+            param.setUpdateTime(new Date());
+            return snapConfMapper.updateById(param) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+        } catch (Exception e) {
+            log.error("鏇存柊蹇媿閰嶇疆鏁版嵁寮傚父", e);
+            return BaseResp.error("鏇存柊澶辫触锛�" + e.getMessage());
+        }
+    }
+
+    /**
+     * 鍒犻櫎鎸囧畾ID鐨勬暟鎹�
+     *
+     * @param param 瑕佸垹闄ょ殑璁板綍
+     * @return 鎿嶄綔缁撴灉
+     */
+    public BaseResp deleteData(SnapConf param) {
+        return snapConfMapper.deleteById(param) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+    }
+
+
+    /**
+     * 鏇存柊鎵ц鏃堕棿
+     *
+     */
+    public void updateActHour(SnapConf param) {
+        // 鍒涘缓鏇存柊鏉′欢鍖呰鍣�
+        QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
+        // 璁剧疆缁勭粐ID鏉′欢
+        queryWrapper.eq("company_id", param.getCompanyId());
+        // 鍒涘缓鏇存柊瀹炰綋锛屽彧鏇存柊鎵ц鏃堕棿鐩稿叧瀛楁
+        SnapConf updateEntity = new SnapConf();
+        updateEntity.setActHour1(param.getActHour1());
+        updateEntity.setActHour2(param.getActHour2());
+        updateEntity.setActHour3(param.getActHour3());
+        updateEntity.setUpdateTime(new Date());
+        updateEntity.setUpdateBy(ContextUtil.getLoginUserName());
+        // 鎵ц鎵归噺鏇存柊
+        snapConfMapper.update(updateEntity, queryWrapper);
     }
 
 }

--
Gitblit v1.9.3