整合(v1.0)

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/PlanItem.java

@@ -30,7 +30,7 @@ public class PlanItem {
     private String qrCode;
 
     @TableField("sort")
-    private String sort;
+    private Integer sort;
 
     @TableField("deleted")
     private int deleted;
@@ -45,6 +45,5 @@ public class PlanItem {
         this.addrCode = bo.getAddrCode();
         this.addrCodeInfo = bo.getAddrCodeInfo();
         this.qrCode = bo.getQrCode();
-        this.sort = "0";
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanItemVo.java

@@ -1,16 +1,23 @@
 package com.ruoyi.demo.entity.vo;
 
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.PlanItem;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class PlanItemVo {
+    @NotBlank(groups = {EditGroup.class})
+    private String itemId;
     private String equipmentId;
     private String equipmentName;
     private String addrInfo;
     private String addrCode;
     private String addrCodeInfo;
-//    private String qrCode;
+    private String qrCode;
+    @NotBlank(groups = {EditGroup.class})
+    private Integer sort;
 
     public PlanItemVo(){}
     public PlanItemVo(PlanItem item){
@@ -19,6 +26,7 @@ public class PlanItemVo {
         this.addrInfo = item.getAddrInfo();
         this.addrCode = item.getAddrCode();
         this.addrCodeInfo = item.getAddrCodeInfo();
-//        this.qrCode = item.getQrCode();
+        this.qrCode = item.getQrCode();
+        this.sort = item.getSort();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/PlanItemMapper.java

@@ -1,11 +1,17 @@
 package com.ruoyi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.demo.entity.PlanItem;
+import com.ruoyi.demo.entity.bo.PlanItemBo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface PlanItemMapper extends BaseMapper<PlanItem> {
     Integer selectEquipmentCountByPlanId(@Param("planId") String planId);
+
+    IPage<PlanItemBo> getEuipmentPlanList(IPage<?> pag, @Param(Constants.WRAPPER) Wrapper<PlanItemBo> queryWrapper);
 }

ruoyi-demo/src/main/resources/mapper/demo/PlanItemMapper.xml

@@ -13,4 +13,11 @@
         GROUP BY
             plan_id;
     </select>
+
+    <select id="getEuipmentPlanList" resultType="com.ruoyi.demo.entity.bo.PlanItemBo">
+        select
+            item_id,dl_plan.plan_id,commercial_id,commercial_name,appkey,app_name,goods_id,goods_img,goods_name,goods_logo,goods_introduce,goods_price,goods_classify,sort
+        from dl_plan,dl_plan_item
+            ${ew.customSqlSegment}
+    </select>
 </mapper>