Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -221,7 +221,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setCreateuserid(currentUser.getId())
                     .setModifyusername(currentUser.getName())
                     .setModifyuserid(currentUser.getId())
-                    .setModifydate(newDate);
+                    .setModifydate(newDate)
+                    .setPlannedstatus("unlocked");
 
             collect.forEach(item ->{
                 item.setId(SecurityUtil.getUUID())
@@ -542,8 +543,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     public EquMaintenanceScheduleDo dataShiftFacilityToPlan(AspCheckItems aspCheckItem,Integer year){
         EquMaintenanceScheduleDo maintenanceSchedule = new EquMaintenanceScheduleDo();
         Date newDate = new Date();
-        // SysUserVo currentUser = CommonUtils.getCurrentUser();
-        maintenanceSchedule.setEquipmenttype(aspCheckItem.getDevicesort())
+        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        maintenanceSchedule.setEquipmenttype(aspCheckItem.getCheckitemtype())
                 .setPlanyear(year)
                 .setEquipmentname(aspCheckItem.getCheckitemname())
                 .setEquipmentid(aspCheckItem.getId())
@@ -557,11 +558,11 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 .setPlannedstatus("unlocked")
                 .setId(SecurityUtil.getUUID())
                 .setCreatedate(newDate)
-                // .setCreateuserid(currentUser.getId())
-                // .setCreateusername(currentUser.getName())
+                .setCreateuserid(currentUser.getId())
+                .setCreateusername(currentUser.getName())
                 .setModifydate(newDate)
-                // .setModifyuserid(currentUser.getId())
-                // .setModifyusername(currentUser.getName())
+                .setModifyuserid(currentUser.getId())
+                .setModifyusername(currentUser.getName())
                 .setTenantid(aspCheckItem.getTenantid());
         return maintenanceSchedule;
     }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquMaintenanceScheduleDo.java

@@ -1,10 +1,9 @@
 package com.rongwei.bsentity.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -30,7 +29,7 @@ public class EquMaintenanceScheduleDo implements Serializable {
 	 */
 	private String id;
 
-	/**
+	/**EQUIPMENTTYPE
 	 * table name:TENANTID
 	 * table type:varchar(36)
 	 * table comment:租户ID

cx-knowledge-base/cx-knowledge-base-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SubConfigServiceImpl.java

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rongwei.bscommon.sys.feign.RwAdminFeign;
 import com.rongwei.bscommon.sys.service.SubConfigService;
 import com.rongwei.bsentity.enums.InsttypeEnum;
@@ -65,7 +67,9 @@ public class SubConfigServiceImpl implements SubConfigService {
             return R.error("该菜单未配置编辑页或页编辑，请重新选择！");
         }
         // 查询页面展示的所有字段
-        return R.ok(getTableNameByData(pagePart));
+        IPage<KdSubsystemDetailVo> res = new Page<>();
+        res.setRecords(getTableNameByData(pagePart));
+        return R.ok(res);
     }