2023-11-10 删除注释，修改优化代码。

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpSmartTerminalServiceImpl.java

@@ -127,7 +127,6 @@ public class HxpSmartTerminalServiceImpl implements IHxpSmartTerminalService {
             if(checkBox){
                 smartTerminal.getFailRemark().append("失败：");
                 failSmartTerminalList.add(smartTerminal);
-                checkBox = false;
             }
             smartTerminal.getFailRemark().append("实验室不能为空、");
         }else{
@@ -143,7 +142,6 @@ public class HxpSmartTerminalServiceImpl implements IHxpSmartTerminalService {
                 if(checkBox){
                     smartTerminal.getFailRemark().append("失败：");
                     failSmartTerminalList.add(smartTerminal);
-                    checkBox = false;
                 }
                 smartTerminal.getFailRemark().append("实验室不存在、");
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabHazardServiceImpl.java

@@ -4,7 +4,6 @@ import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.domain.LabHazard;
 import com.zd.laboratory.domain.LabHazardSubjectRelation;
 import com.zd.laboratory.domain.LabRiskPlan;
@@ -16,7 +15,6 @@ import com.zd.laboratory.domain.vo.LabHazardVO;
 import com.zd.laboratory.mapper.LabHazardMapper;
 import com.zd.laboratory.mapper.LabHazardSubjectRelationMapper;
 import com.zd.laboratory.mapper.LabRiskPlanMapper;
-import com.zd.laboratory.mapper.LabSafeClassifiedMapper;
 import com.zd.laboratory.service.ILabHazardService;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysUser;
@@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,8 +43,6 @@ public class LabHazardServiceImpl implements ILabHazardService {
     private LabHazardSubjectRelationMapper subjectRelationMapper;
     @Autowired
     private LabRiskPlanMapper riskPlanMapper;
-    @Autowired
-    private LabSafeClassifiedMapper safeClassifiedMapper;
 
     /**
      * 查询危险源
@@ -90,7 +85,6 @@ public class LabHazardServiceImpl implements ILabHazardService {
         labHazard.setDeptId(user.getDeptId());
         labHazard.setDeptName(user.getDeptName());
         int rows = labHazardMapper.insertLabHazard(labHazard);
-        //insertLabHazardSubjectRelation(labHazard);
         return rows;
     }
 
@@ -109,7 +103,6 @@ public class LabHazardServiceImpl implements ILabHazardService {
         labHazard.setUpdateTime(DateUtils.getNowDate());
         labHazard.setUpdateBy(user.getNickName());
 
-        // insertLabHazardSubjectRelation(labHazard);
         return labHazardMapper.updateLabHazard(labHazard);
     }
 
@@ -147,7 +140,6 @@ public class LabHazardServiceImpl implements ILabHazardService {
 
         }
 
-        // labHazardMapper.deleteLabHazardSubjectRelationByIds(ids);
         return labHazardMapper.deleteLabHazardByIds(ids);
     }
 
@@ -167,33 +159,11 @@ public class LabHazardServiceImpl implements ILabHazardService {
      * 查询危险源
      */
     @Override
-//    @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.LABORATORY_HAZARD)
     public List<LabHazardDTO> selectLabHazardAndContainerList(LabHazardDTO labHazard) {
         List<LabHazardDTO> list = labHazardMapper.selectLabHazardAndContainerList(labHazard);
         return list;
     }
 
-    /**
-     * 新增危险源和实验室关联信息
-     *
-     * @param labHazard 危险源对象
-     */
-    public void insertLabHazardSubjectRelation(LabHazard labHazard) {
-        List<LabHazardSubjectRelation> labHazardSubjectRelationList = labHazard.getLabHazardSubjectRelationList();
-        Long id = labHazard.getId();
-        // 先删除
-        labHazardMapper.deleteLabHazardSubjectRelationBy(labHazard.getId());
-        if (StringUtils.isNotNull(labHazardSubjectRelationList)) {
-            List<LabHazardSubjectRelation> list = new ArrayList<>();
-            for (LabHazardSubjectRelation labHazardSubjectRelation : labHazardSubjectRelationList) {
-                labHazardSubjectRelation.setHazardId(id);
-                list.add(labHazardSubjectRelation);
-            }
-            if (list.size() > 0) {
-                labHazardMapper.batchLabHazardSubjectRelation(list);
-            }
-        }
-    }
 
 
     /**