Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java

@@ -93,4 +93,16 @@ public class DmsRecordShutDown extends TenantEntity {
     @TableField(exist = false)
     private String shutTypeName;//JOIN
 
+    /**
+     * 停机类型编号
+     */
+    @TableField(exist = false)
+    private String shutTypeCode;//JOIN
+
+    /**
+     * 停机原因
+     */
+    @TableField(exist = false)
+    private String shutReasonName;
+
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java

@@ -9,6 +9,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dms.domain.DmsBaseMachineInfo;
+import org.dromara.dms.domain.DmsBaseShutReason;
 import org.dromara.dms.domain.DmsBaseShutType;
 import org.dromara.dms.domain.DmsRecordShutDown;
 import org.dromara.dms.domain.bo.DmsRecordShutDownBo;
@@ -82,9 +83,8 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService {
             .select(DmsBaseShutType::getShutTypeName)
             .leftJoin(DmsBaseShutType.class,DmsBaseShutType::getShutTypeId,DmsRecordShutDown::getShutTypeId)
             //关联查询停机原因信息
-/*            .select(DmsBaseShutReason::getReasonCode,DmsBaseShutReason::getShutReason)
+            .selectAs(DmsBaseShutReason::getShutReason,DmsRecordShutDown::getShutReasonName)
-            .select(DmsBaseShutReason::getReasonCode)
+            .leftJoin(DmsBaseShutReason.class,DmsBaseShutReason::getShutReasonId,DmsRecordShutDown::getShutReasonId)
-            .leftJoin(DmsBaseShutReason.class,DmsBaseShutReason::getShutReasonId,DmsRecordShutDown::getShutReasonId)*/
 
         .eq(bo.getRecordShutDownId() != null, DmsRecordShutDown::getRecordShutDownId, bo.getRecordShutDownId())
         .eq(bo.getMachineId() != null, DmsRecordShutDown::getMachineId, bo.getMachineId())