Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-common/src/main/java/com/sundot/airport/common/enums/BaseAttachmentSourceTypeEnum.java

@@ -14,7 +14,8 @@ public enum BaseAttachmentSourceTypeEnum {
     CHECK_CORRECTION("CHECK_CORRECTION", "问题整改表"),
     CHECK_CORRECTION_RECORD("CHECK_CORRECTION_RECORD", "问题整改表中检查记录"),
     CHECK_PROJECT_ITEM("CHECK_PROJECT_ITEM", "检查项明细表"),
-    ITEM_SEIZURE_ITEMS("ITEM_SEIZURE_ITEMS", "查获物品明细表");
+    ITEM_SEIZURE_ITEMS("ITEM_SEIZURE_ITEMS", "查获物品明细表"),
+    EQUIPMENT_LEDGER("EQUIPMENT_LEDGER", "设备台账表");
 
     private final String code;
     private final String info;

airport-equipment/src/main/java/com/sundot/airport/equipment/domain/EquipmentLedger.java

@@ -1,11 +1,14 @@
 package com.sundot.airport.equipment.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.domain.BaseAttachment;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.sundot.airport.common.annotation.Excel;
@@ -140,6 +143,22 @@ public class EquipmentLedger extends BaseEntity {
     @Excel(name = "定/自检小组组员2名称")
     private String inspectionTeamMember2Name;
 
+    /** 设备定检记录列表*/
+    @TableField(exist = false)
+    private List<EquipmentInspectionRecord> equipmentInspectionRecordList;
+
+    /** 设备照片列表*/
+    @TableField(exist = false)
+    private List<BaseAttachment> baseAttachmentList;
+
+    /** 查询定/自检小组人员ID*/
+    @TableField(exist = false)
+    private String inspectionTeamUserId;
+
+    /** 查询定/自检小组人员ID名称*/
+    @TableField(exist = false)
+    private String inspectionTeamUserName;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -356,6 +375,38 @@ public class EquipmentLedger extends BaseEntity {
         return inspectionTeamMember2Name;
     }
 
+    public List<EquipmentInspectionRecord> getEquipmentInspectionRecordList() {
+        return equipmentInspectionRecordList;
+    }
+
+    public void setEquipmentInspectionRecordList(List<EquipmentInspectionRecord> equipmentInspectionRecordList) {
+        this.equipmentInspectionRecordList = equipmentInspectionRecordList;
+    }
+
+    public List<BaseAttachment> getBaseAttachmentList() {
+        return baseAttachmentList;
+    }
+
+    public void setBaseAttachmentList(List<BaseAttachment> baseAttachmentList) {
+        this.baseAttachmentList = baseAttachmentList;
+    }
+
+    public String getInspectionTeamUserId() {
+        return inspectionTeamUserId;
+    }
+
+    public void setInspectionTeamUserId(String inspectionTeamUserId) {
+        this.inspectionTeamUserId = inspectionTeamUserId;
+    }
+
+    public String getInspectionTeamUserName() {
+        return inspectionTeamUserName;
+    }
+
+    public void setInspectionTeamUserName(String inspectionTeamUserName) {
+        this.inspectionTeamUserName = inspectionTeamUserName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -391,6 +442,8 @@ public class EquipmentLedger extends BaseEntity {
                 .append("inspectionTeamMember1Name", getInspectionTeamMember1Name())
                 .append("inspectionTeamMember2Id", getInspectionTeamMember2Id())
                 .append("inspectionTeamMember2Name", getInspectionTeamMember2Name())
+                .append("equipmentInspectionRecordList", getEquipmentInspectionRecordList())
+                .append("baseAttachmentList", getBaseAttachmentList())
                 .toString();
     }
 }

airport-equipment/src/main/java/com/sundot/airport/equipment/service/impl/EquipmentLedgerServiceImpl.java

@@ -2,13 +2,23 @@ package com.sundot.airport.equipment.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.domain.BaseAttachment;
+import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.service.IBaseAttachmentService;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.equipment.domain.EquipmentInspectionRecord;
+import com.sundot.airport.equipment.service.IEquipmentInspectionRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.equipment.mapper.EquipmentLedgerMapper;
 import com.sundot.airport.equipment.domain.EquipmentLedger;
 import com.sundot.airport.equipment.service.IEquipmentLedgerService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 设备台账Service业务层处理
@@ -20,6 +30,10 @@ import com.sundot.airport.equipment.service.IEquipmentLedgerService;
 public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMapper, EquipmentLedger> implements IEquipmentLedgerService {
     @Autowired
     private EquipmentLedgerMapper equipmentLedgerMapper;
+    @Autowired
+    private IEquipmentInspectionRecordService equipmentInspectionRecordService;
+    @Autowired
+    private IBaseAttachmentService baseAttachmentService;
 
     /**
      * 查询设备台账
@@ -29,7 +43,20 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      */
     @Override
     public EquipmentLedger selectEquipmentLedgerById(Long id) {
-        return equipmentLedgerMapper.selectEquipmentLedgerById(id);
+        EquipmentLedger result = equipmentLedgerMapper.selectEquipmentLedgerById(id);
+        if (ObjUtil.isNull(result)) {
+            return result;
+        }
+        LambdaQueryWrapper<EquipmentInspectionRecord> recordQueryWrapper = new LambdaQueryWrapper<>();
+        recordQueryWrapper.eq(EquipmentInspectionRecord::getSourceId, result.getId());
+        List<EquipmentInspectionRecord> equipmentInspectionRecordList = equipmentInspectionRecordService.getBaseMapper().selectList(recordQueryWrapper);
+        result.setEquipmentInspectionRecordList(equipmentInspectionRecordList);
+        LambdaQueryWrapper<BaseAttachment> attachmentQueryWrapper = new LambdaQueryWrapper<>();
+        attachmentQueryWrapper.eq(BaseAttachment::getSourceType, BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+        attachmentQueryWrapper.eq(BaseAttachment::getSourceId, result.getId());
+        List<BaseAttachment> baseAttachmentList = baseAttachmentService.getBaseMapper().selectList(attachmentQueryWrapper);
+        result.setBaseAttachmentList(baseAttachmentList);
+        return result;
     }
 
     /**
@@ -49,10 +76,36 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @param equipmentLedger 设备台账
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int insertEquipmentLedger(EquipmentLedger equipmentLedger) {
+        EquipmentLedger temp = new EquipmentLedger();
+        temp.setEquipmentSerialNumber(equipmentLedger.getEquipmentSerialNumber());
+        List<EquipmentLedger> tempList = equipmentLedgerMapper.selectEquipmentLedgerList(temp);
+        if (CollUtil.isNotEmpty(tempList)) {
+            throw new ServiceException("该设备序列号已存在");
+        }
         equipmentLedger.setCreateTime(DateUtils.getNowDate());
-        return equipmentLedgerMapper.insertEquipmentLedger(equipmentLedger);
+        int result = equipmentLedgerMapper.insertEquipmentLedger(equipmentLedger);
+        if (CollUtil.isNotEmpty(equipmentLedger.getEquipmentInspectionRecordList())) {
+            equipmentLedger.getEquipmentInspectionRecordList().forEach(equipmentInspectionRecord -> {
+                equipmentInspectionRecord.setSourceId(equipmentLedger.getId());
+                equipmentInspectionRecord.setCreateBy(equipmentLedger.getCreateBy());
+                equipmentInspectionRecord.setCreateTime(DateUtils.getNowDate());
+                equipmentInspectionRecordService.insertEquipmentInspectionRecord(equipmentInspectionRecord);
+            });
+        }
+        if (CollUtil.isNotEmpty(equipmentLedger.getBaseAttachmentList())) {
+            equipmentLedger.getBaseAttachmentList().forEach(baseAttachment -> {
+                baseAttachment.setSourceType(BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+                baseAttachment.setSourceTypeName(BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getInfo());
+                baseAttachment.setSourceId(equipmentLedger.getId());
+                baseAttachment.setCreateBy(equipmentLedger.getCreateBy());
+                baseAttachment.setCreateTime(DateUtils.getNowDate());
+                baseAttachmentService.insertBaseAttachment(baseAttachment);
+            });
+        }
+        return result;
     }
 
     /**
@@ -61,10 +114,51 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @param equipmentLedger 设备台账
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int updateEquipmentLedger(EquipmentLedger equipmentLedger) {
         equipmentLedger.setUpdateTime(DateUtils.getNowDate());
-        return equipmentLedgerMapper.updateEquipmentLedger(equipmentLedger);
+        int result = equipmentLedgerMapper.updateEquipmentLedger(equipmentLedger);
+        // 删除旧数据
+        LambdaQueryWrapper<EquipmentInspectionRecord> recordOldQueryWrapper = new LambdaQueryWrapper<>();
+        recordOldQueryWrapper.eq(EquipmentInspectionRecord::getSourceId, equipmentLedger.getId());
+        List<EquipmentInspectionRecord> equipmentInspectionRecordOldList = equipmentInspectionRecordService.getBaseMapper().selectList(recordOldQueryWrapper);
+        if (CollUtil.isNotEmpty(equipmentInspectionRecordOldList)) {
+            equipmentInspectionRecordService.removeBatchByIds(equipmentInspectionRecordOldList);
+        }
+        LambdaQueryWrapper<BaseAttachment> attachmentOldQueryWrapper = new LambdaQueryWrapper<>();
+        attachmentOldQueryWrapper.eq(BaseAttachment::getSourceType, BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+        attachmentOldQueryWrapper.eq(BaseAttachment::getSourceId, equipmentLedger.getId());
+        List<BaseAttachment> baseAttachmentOldList = baseAttachmentService.getBaseMapper().selectList(attachmentOldQueryWrapper);
+        if (CollUtil.isNotEmpty(baseAttachmentOldList)) {
+            baseAttachmentService.removeBatchByIds(baseAttachmentOldList);
+        }
+        // 新增新数据
+        if (CollUtil.isNotEmpty(equipmentLedger.getEquipmentInspectionRecordList())) {
+            equipmentLedger.getEquipmentInspectionRecordList().forEach(equipmentInspectionRecord -> {
+                equipmentInspectionRecord.setId(null);
+                equipmentInspectionRecord.setSourceId(equipmentLedger.getId());
+                equipmentInspectionRecord.setCreateBy(equipmentLedger.getCreateBy());
+                equipmentInspectionRecord.setCreateTime(DateUtils.getNowDate());
+                equipmentInspectionRecord.setUpdateBy(equipmentLedger.getCreateBy());
+                equipmentInspectionRecord.setUpdateTime(DateUtils.getNowDate());
+                equipmentInspectionRecordService.insertEquipmentInspectionRecord(equipmentInspectionRecord);
+            });
+        }
+        if (CollUtil.isNotEmpty(equipmentLedger.getBaseAttachmentList())) {
+            equipmentLedger.getBaseAttachmentList().forEach(baseAttachment -> {
+                baseAttachment.setId(null);
+                baseAttachment.setSourceType(BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+                baseAttachment.setSourceTypeName(BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getInfo());
+                baseAttachment.setSourceId(equipmentLedger.getId());
+                baseAttachment.setCreateBy(equipmentLedger.getCreateBy());
+                baseAttachment.setCreateTime(DateUtils.getNowDate());
+                baseAttachment.setUpdateBy(equipmentLedger.getCreateBy());
+                baseAttachment.setUpdateTime(DateUtils.getNowDate());
+                baseAttachmentService.insertBaseAttachment(baseAttachment);
+            });
+        }
+        return result;
     }
 
     /**
@@ -73,9 +167,26 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @param ids 需要删除的设备台账主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteEquipmentLedgerByIds(Long[] ids) {
-        return equipmentLedgerMapper.deleteEquipmentLedgerByIds(ids);
+        int result = equipmentLedgerMapper.deleteEquipmentLedgerByIds(ids);
+        for (Long id : ids) {
+            LambdaQueryWrapper<EquipmentInspectionRecord> detailQueryWrapper = new LambdaQueryWrapper<>();
+            detailQueryWrapper.eq(EquipmentInspectionRecord::getSourceId, id);
+            List<EquipmentInspectionRecord> equipmentInspectionRecordList = equipmentInspectionRecordService.getBaseMapper().selectList(detailQueryWrapper);
+            if (CollUtil.isNotEmpty(equipmentInspectionRecordList)) {
+                equipmentInspectionRecordService.removeBatchByIds(equipmentInspectionRecordList);
+            }
+            LambdaQueryWrapper<BaseAttachment> attachmentQueryWrapper = new LambdaQueryWrapper<>();
+            attachmentQueryWrapper.eq(BaseAttachment::getSourceType, BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+            attachmentQueryWrapper.eq(BaseAttachment::getSourceId, id);
+            List<BaseAttachment> baseAttachmentList = baseAttachmentService.getBaseMapper().selectList(attachmentQueryWrapper);
+            if (CollUtil.isNotEmpty(baseAttachmentList)) {
+                baseAttachmentService.removeBatchByIds(baseAttachmentList);
+            }
+        }
+        return result;
     }
 
     /**
@@ -84,8 +195,23 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @param id 设备台账主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteEquipmentLedgerById(Long id) {
-        return equipmentLedgerMapper.deleteEquipmentLedgerById(id);
+        int result = equipmentLedgerMapper.deleteEquipmentLedgerById(id);
+        LambdaQueryWrapper<EquipmentInspectionRecord> detailQueryWrapper = new LambdaQueryWrapper<>();
+        detailQueryWrapper.eq(EquipmentInspectionRecord::getSourceId, id);
+        List<EquipmentInspectionRecord> equipmentInspectionRecordList = equipmentInspectionRecordService.getBaseMapper().selectList(detailQueryWrapper);
+        if (CollUtil.isNotEmpty(equipmentInspectionRecordList)) {
+            equipmentInspectionRecordService.removeBatchByIds(equipmentInspectionRecordList);
+        }
+        LambdaQueryWrapper<BaseAttachment> attachmentQueryWrapper = new LambdaQueryWrapper<>();
+        attachmentQueryWrapper.eq(BaseAttachment::getSourceType, BaseAttachmentSourceTypeEnum.EQUIPMENT_LEDGER.getCode());
+        attachmentQueryWrapper.eq(BaseAttachment::getSourceId, id);
+        List<BaseAttachment> baseAttachmentList = baseAttachmentService.getBaseMapper().selectList(attachmentQueryWrapper);
+        if (CollUtil.isNotEmpty(baseAttachmentList)) {
+            baseAttachmentService.removeBatchByIds(baseAttachmentList);
+        }
+        return result;
     }
 }

airport-equipment/src/main/resources/mapper/equipment/EquipmentInspectionRecordMapper.xml

@@ -60,6 +60,7 @@
                 #{inspectionNature}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectEquipmentInspectionRecordById" parameterType="Long" resultMap="EquipmentInspectionRecordResult">

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -121,7 +121,20 @@
             <if test="inspectionTeamMember2Name != null  and inspectionTeamMember2Name != ''">and
                 inspection_team_member2_name like concat('%', #{inspectionTeamMember2Name}, '%')
             </if>
+            <if test="inspectionTeamUserId != null ">and (
+                inspection_team_leader_id = #{inspectionTeamUserId} or
+                inspection_team_member1_id = #{inspectionTeamUserId} or
+                inspection_team_member2_id = #{inspectionTeamUserId}
+                )
+            </if>
+            <if test="inspectionTeamUserName != null  and inspectionTeamUserName != ''">and (
+                inspection_team_leader_name like concat('%', #{inspectionTeamUserName}, '%') or
+                inspection_team_member1_name like concat('%', #{inspectionTeamUserName}, '%') or
+                inspection_team_member2_name like concat('%', #{inspectionTeamUserName}, '%')
+                )
+            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectEquipmentLedgerById" parameterType="Long" resultMap="EquipmentLedgerResult">