From 94022be3d738be43e57850d82031fa93d1538beb Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 3 Aug 2023 09:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/basicdata/entity/EngineeringMain.java     | 6 ------
 .../xmgl/modules/safety/mapper/EnterpriseScoreMapper.java  | 2 --
 .../safety/service/impl/EnterpriseScoreServiceImpl.java    | 7 -------
 3 files changed, 15 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java
index d854e30..14d74d7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java
@@ -41,12 +41,6 @@ public class EngineeringMain implements Serializable {
     @Excel(name = "企业sn", width = 15)
     @ApiModelProperty(value = "企业sn")
     private String enterpriseSn;
-    /**
-     * 项目sn
-     */
-    @Excel(name = "项目sn", width = 15)
-    @ApiModelProperty(value = "项目sn")
-    private String projectSn;
     /**
      * 工程sn
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java
index 5889a7c..4d67c3c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
 import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto;
 import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,7 +18,6 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
-@DataScope
 public interface EnterpriseScoreMapper extends BaseMapper<EnterpriseScore> {
 
     Page<EnterpriseScoreDto> pageList(Page page, @Param(Constants.WRAPPER)Wrapper<EnterpriseScore> wrapper);
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java
index 35e78b5..c95149b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java
@@ -7,11 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.handler.exception.CustomException;
-import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData;
 import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService;
-import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
 import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService;
 import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto;
 import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
@@ -41,9 +39,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
     @Autowired
     private IEngineeringMainService engineeringMainService;
 
-    @Autowired
-    private IEngineeringService engineeringService;
-
     @Autowired
     private ISystemDictDataService systemDictDataService;
 
@@ -83,8 +78,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
         if (StringUtils.isNotBlank(enterpriseScore.getEnterpriseSn())) {
             EngineeringMain engineeringMain = new EngineeringMain();
             engineeringMain.setEnterpriseSn(enterpriseScore.getEnterpriseSn());
-            engineeringMain.setProjectSn(engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
-                    .eq(Engineering::getEngineeringSn, enterpriseScore.getEngineeringSn())).getProjectSn());
             engineeringMain.setType(enterpriseScore.getEnterpriseType());
             engineeringMainService.save(engineeringMain);
         }