2024-08-15 设备-维修-增加审核意见+异常抛出

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java

@@ -544,6 +544,9 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
         EquEquipment equEquipment = new EquEquipment();
         equEquipment.setEquipmentCode(equRepairWorkOrder.getEquipmentCode());
         EquEquipment equ = equEquipmentMapper.selectEquEquipmentByEquEquipmentCode(equEquipment.getEquipmentCode());
+        if(equ == null){
+            throw new NotLoginException("设备表中不存在此设备，请确认！");
+        }
         String equStatus = "";
         //todo 维修保养中 和维修中 和保养中！！！！！！！！！！！！！！！！！！！！！！！ 需要修改状态
         if(equ.getEquipmentStatus().equals("0")){
@@ -658,6 +661,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
         for (String id : ids) {
             EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
             equRepairWorkOrder.setWorkId(id);
+            equRepairWorkOrder.setAuditOpinion(upKeepOrderDTO.getAuditOpinion());
             String resultInspect = upKeepOrderDTO.getInspect();
 
             //1.1 审核通过后 更新运行表 + 更新设备表 1审核通过

op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml

@@ -140,6 +140,7 @@
         erwo.fault_start_time,
         erwo.result_inspect,
         erwo.remark,
+        erwo.audit_opinion,
         be.equipment_name,
         et.team_name,
         et.team_person