From 2019d3ea4088eae51b5d52a2f6245841deb26781 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 19 七月 2023 15:05:43 +0800
Subject: [PATCH] 用户以及要素部分修改

---
 src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java
index 1102a12..d5bebd9 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java
@@ -3,14 +3,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gk.hotwork.Domain.EmergencyPlanFile;
-import com.gk.hotwork.Domain.SafetyInspectionItem;
+import com.gk.hotwork.Domain.*;
 import com.gk.hotwork.Domain.Exception.BusinessException;
-import com.gk.hotwork.Domain.SafetyInspectionItemDeduction;
-import com.gk.hotwork.Domain.UserInfo;
 import com.gk.hotwork.Domain.Utils.StringUtils;
 import com.gk.hotwork.Mapper.SafetyInspectionItemDeductionMapper;
 import com.gk.hotwork.Mapper.SafetyInspectionItemMapper;
+import com.gk.hotwork.Service.ElementManagementService;
 import com.gk.hotwork.Service.SafetyInspectionItemService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.checkerframework.checker.units.qual.C;
@@ -32,12 +30,27 @@
     @Autowired
     private SafetyInspectionItemDeductionMapper safetyInspectionItemDeductionMapper;
 
+    @Autowired
+    private ElementManagementService elementManagementService;
+
     /**
     * @Description: 分页
     */
     @Override
     public IPage<SafetyInspectionItem> selectPage(Page<SafetyInspectionItem> page, Map<String, Object> filter, UserInfo user) {
         IPage<SafetyInspectionItem> res = safetyInspectionItemMapper.selectPages(page,filter);
+        if (CollectionUtils.isNotEmpty(res.getRecords())){
+            for (int i = 0 ; i < res.getRecords().size(); i++){
+                List<SafetyInspectionItemDeduction> fileList = safetyInspectionItemDeductionMapper.getBySafetyInspectionItemId(res.getRecords().get(i).getId());
+                res.getRecords().get(i).setDeductionList(fileList);
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public IPage<SafetyInspectionItem> selectCPage(Page<SafetyInspectionItem> page, Map<String, Object> filter, UserInfo user) {
+        IPage<SafetyInspectionItem> res = safetyInspectionItemMapper.selectCPages(page,filter);
         if (CollectionUtils.isNotEmpty(res.getRecords())){
             for (int i = 0 ; i < res.getRecords().size(); i++){
                 List<SafetyInspectionItemDeduction> fileList = safetyInspectionItemDeductionMapper.getBySafetyInspectionItemId(res.getRecords().get(i).getId());
@@ -90,7 +103,7 @@
         String username = user.getRealname();
         param.setUpdateTime(date);
         param.setUpdateBy(username);
-        this.updateById(param);
+        safetyInspectionItemMapper.updateSafetyInspectionItem(param);
         //更新扣分项表
 
         List<SafetyInspectionItemDeduction> oldList = safetyInspectionItemDeductionMapper.getBySafetyInspectionItemId(param.getId());

--
Gitblit v1.9.2