修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EquipmentSpecificMapper.java

@@ -79,4 +79,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecificVo>
      * @return
      */
     Map queryFireMonitor(@Param("equipmentId") String equipmentId, @Param("code") String fireMonitor);
+
+    int getOneByQrcode(@Param("qrCode") String qrCode);
+
+    EquipmentSpecific getSpecificById(@Param("id") Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
@@ -9,6 +10,7 @@ import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
 import com.yeejoin.amos.fas.business.feign.IEquipManageFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.ImgParam;
+import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
@@ -16,10 +18,7 @@ import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
 import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
-import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.fas.dao.entity.EquipmentExcelData;
-import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
-import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
+import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -63,6 +62,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Autowired
     EquipmentSpecificMapper equipmentSpecificMapper;
+
     @Autowired
     IEquipmentDao iEquipmentDao;
     @Autowired
@@ -196,6 +196,11 @@ public class EquipmentServiceImpl implements IEquipmentService {
     public List<Map<String, Object>> bindFireEqumt(Long equipmentId, List<EquipmentFireEquipment> list) throws Exception {
         List<Map<String, Object>> resultList = new ArrayList<>();
         for (EquipmentFireEquipment equipmentFireEquipment : list) {
+            EquipmentSpecific equip  = equipmentSpecificMapper.getSpecificById(equipmentFireEquipment.getFireEquipmentId());
+            int num = equipmentSpecificMapper.getOneByQrcode(equip.getQrCode());
+            if (0 < num) {
+                throw new RuntimeException("已报废装备不能添加为配套设备！");
+            }
             int count = equipmentFireEquipmentDao.findByEqmtIdAndFireEqmtId(equipmentId, equipmentFireEquipment.getFireEquipmentId());
             if (count > 0) {
                 continue;

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -229,4 +229,23 @@
             </if>
         </where>
     </select>
+
+    <select id="getOneByQrcode" resultType="java.lang.Integer">
+        select count(1)
+        from
+            wl_scrap_detail as wsd
+        left join wl_stock_detail as stdet on wsd.stock_detail_id = stdet.id
+        where
+        stdet.qr_code = #{qrCode}
+        and
+        stdet.status = 7
+    </select>
+
+    <select id="getSpecificById" resultType="com.yeejoin.amos.fas.dao.entity.EquipmentSpecific">
+        SELECT
+        *
+        FROM
+        wl_equipment_specific wes
+        WHERE wes.id=#{id}
+    </select>
 </mapper>
\ No newline at end of file