Bug:【ID1000467】仪器管理-序列号列表，【删除批量数据】/【删除全量数据】删除已绑定状态数据，删除成功

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentSerialMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.WxInstrumentSerial;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,6 +21,8 @@ public interface WxInstrumentSerialMapper
      */
     public WxInstrumentSerial selectWxInstrumentSerialById(Long id);
 
+    public List<WxInstrumentSerial> selectWxInstrumentSerialByIdList(@Param("idList") List<Long> idList);
+
     /**
      * 查询仪器序列号关联列表
      *

flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml

@@ -60,6 +60,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectWxInstrumentSerialByIdList" parameterType="Long" resultMap="WxInstrumentSerialResult">
+        <include refid="selectWxInstrumentSerialVo"/>
+        where id in
+        <foreach item="id" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <insert id="insertWxInstrumentSerial" parameterType="WxInstrumentSerial" useGeneratedKeys="true" keyProperty="id">
         insert into wx_instrument_serial
         <trim prefix="(" suffix=")" suffixOverrides=",">

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java

@@ -463,10 +463,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             wxModeServiceInfo.setModeId(wxMode.getId());
             List<WxModeServiceInfo> wxModeServiceInfoList = wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo);
             if (wxModeServiceInfoList != null && wxModeServiceInfoList.size() > 0) {
-                Calendar calendar = Calendar.getInstance();
+
                 for (WxModeServiceInfo modeServiceInfo : wxModeServiceInfoList) {
                     if (modeServiceInfo.getServiceStartTime() != null) {
                         Date date = wxModeServiceInfo.getServiceStartTime();
+                        Calendar calendar = Calendar.getInstance();
                         calendar.setTime(date);
                         modeServiceInfo.setServiceStartTimeStr(
                                 DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60
@@ -477,6 +478,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                     }
                     if (modeServiceInfo.getServiceEndTime() != null) {
                         Date date = wxModeServiceInfo.getServiceEndTime();
+                        Calendar calendar = Calendar.getInstance();
                         calendar.setTime(date);
                         modeServiceInfo.setServiceEndTimeStr(
                                 DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java

@@ -1,5 +1,6 @@
 package com.flossom.system.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -9,6 +10,7 @@ import com.flossom.common.core.domain.entity.WxInstrument;
 import com.flossom.common.core.domain.entity.WxInstrumentSerial;
 import com.flossom.common.core.domain.req.WxInstrumentSerialExportVm;
 import com.flossom.common.core.domain.req.WxInstrumentSerialImportVm;
+import com.flossom.common.core.enums.BindingStatusEnums;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.mapper.WxInstrumentMapper;
 import com.flossom.common.core.mapper.WxInstrumentSerialMapper;
@@ -21,6 +23,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxInstrumentSerialService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -121,8 +124,17 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteWxInstrumentSerialByIds(Long[] ids)
     {
+        List<WxInstrumentSerial> wxInstrumentSerialList = wxInstrumentSerialMapper.selectWxInstrumentSerialByIdList(Arrays.asList(ids));
+        if (wxInstrumentSerialList != null && wxInstrumentSerialList.size() > 0) {
+            for (WxInstrumentSerial wxInstrumentSerial : wxInstrumentSerialList) {
+                if (wxInstrumentSerial.getBindingStatus() == BindingStatusEnums.BINDED.getCode()) {
+                    throw new ServiceException("删除失败，只能删除已解绑状态的数据，您选中的内容存在【已绑定状态】请重试");
+                }
+            }
+        }
         return wxInstrumentSerialMapper.deleteWxInstrumentSerialByIds(ids);
     }
 
@@ -139,7 +151,16 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
     }
 
     @Override
+    @Transactional
     public int deleteAll() {
+        List<WxInstrumentSerial> wxInstrumentSerialList = wxInstrumentSerialMapper.selectWxInstrumentSerialList(new WxInstrumentSerial());
+        if (wxInstrumentSerialList != null && wxInstrumentSerialList.size() > 0) {
+            for (WxInstrumentSerial wxInstrumentSerial : wxInstrumentSerialList) {
+                if (wxInstrumentSerial.getBindingStatus() == BindingStatusEnums.BINDED.getCode()) {
+                    throw new ServiceException("删除失败，只能删除已解绑状态的数据，您选中的内容存在【已绑定状态】请重试");
+                }
+            }
+        }
         return wxInstrumentSerialMapper.deleteAll();
     }