Merge remote-tracking branch 'origin/master'

zhangherong

9 天以前 3661612cc6c99bccf0fb6a212d22c51ee7841c6e

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

@@ -106,7 +106,7 @@
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getConfirmComment());
                        log.setDescription(order.getInspectConfirmComment());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }
@@ -117,8 +117,8 @@
                    if (ThirdMaintenanceStatusEnum.COMPLETE.name().equals(order.getMaintenanceStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getLeaderConfirmComment());
                        log.setOperator(order.getRepairman());
                        log.setDescription(order.getProblemDescription());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }