优化

platform-dao/src/main/java/com/platform/dao/vo/export/longyanpurchaseorder/ExportLongYanPurchaseOrderVO.java

@@ -4,6 +4,7 @@ import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 
@@ -18,76 +19,86 @@ import java.time.LocalDate;
 public class ExportLongYanPurchaseOrderVO implements Serializable {
 
     /**
-   * 
+   *
    */
-          @Excel(name = "", orderNum = "1")
+          @Excel(name = "主键", orderNum = "1")
       private String id;
-    
+
+    @Excel(name = "采购单号", orderNum = "2")
+    private String purchaseNo;
+
     /**
    * 设备id
    */
-          @Excel(name = "设备id", orderNum = "2")
-      private String sbId;
-    
+          @Excel(name = "设备名称", orderNum = "3")
+      private String sbName;
+
+    @Excel(name = "新老厂，1：新厂，2：老厂", orderNum = "4")
+    private Integer oldOrNew;
+
     /**
    * 项目id
    */
-          @Excel(name = "项目id", orderNum = "3")
-      private String projectId;
-    
+          @Excel(name = "项目名称", orderNum = "5")
+      private String complateProjectName;
+
     /**
-   * 
+   *
    */
-          @Excel(name = "", orderNum = "4")
-      private String createdUserId;
-    
+//          @Excel(name = "", orderNum = "4")
+//      private String createdUserId;
+    @Excel(name = "采购计划类型1：计划采购，2：临时采购，3：紧急采购", orderNum = "6",dicCode = "LONG_YAN_PURCHASE_TYPE")
+    private Integer type;
+
     /**
-   * 
+     * 采购计划名称
+     */
+    @Excel(name = "采购计划名称", orderNum = "7")
+    private String orderName;
+
+    @Excel(name = "采购物料总数", orderNum = "8")
+    private BigDecimal totalNum;
+
+    /**
+   *
    */
-          @Excel(name = "", orderNum = "5")
+          @Excel(name = "创建人", orderNum = "9")
       private String createdUserName;
-    
+
     /**
-   * 
+   *
    */
-          @Excel(name = "", orderNum = "6")
+          @Excel(name = "创建时间", orderNum = "10")
       private LocalDateTime createdTime;
-    
-    /**
-   * 
-   */
-          @Excel(name = "", orderNum = "7")
-      private LocalDateTime updateTime;
-    
+
     /**
-   * 
+   *
    */
-          @Excel(name = "", orderNum = "8")
-      private String updateUserId;
-    
+//          @Excel(name = "", orderNum = "7")
+//      private LocalDateTime updateTime;
+//
+//    /**
+//   *
+//   */
+//          @Excel(name = "", orderNum = "8")
+//      private String updateUserId;
+
     /**
-   * 
+   *
    */
-          @Excel(name = "", orderNum = "9")
-      private String updateUserName;
-    
+//          @Excel(name = "", orderNum = "9")
+//      private String updateUserName;
+
     /**
    * 采购计划类型1：计划采购，2：临时采购，3：紧急采购
    */
-          @Excel(name = "采购计划类型1：计划采购，2：临时采购，3：紧急采购", orderNum = "10")
-      private Integer type;
-    
-    /**
-   * 采购计划名称
-   */
-          @Excel(name = "采购计划名称", orderNum = "11")
-      private String orderName;
-    
+
+
     /**
    * 备注
    */
-          @Excel(name = "备注", orderNum = "12")
+          @Excel(name = "备注", orderNum = "11")
       private String remark;
-    
-  
+
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -32,6 +32,7 @@ public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
     private Integer oldOrNew;
     private BigDecimal totalNum;
     private String positionNo;
+    private String sbName;
 
     /**
      *

platform-dao/src/main/java/com/platform/dao/vo/report/LongYanPurchaseOrderReportVO.java

@@ -19,7 +19,7 @@ public class LongYanPurchaseOrderReportVO implements Serializable {
     private static final long serialVersionUID = 1L;
     @Excel(name = "采购类型", orderNum = "1",dicCode = "LONG_YAN_PURCHASE_TYPE")
     private Integer purchaseType;
-    @Excel(name = "采购物料总数", orderNum = "2")
+    @Excel(name = "采购单总数", orderNum = "2")
     private BigDecimal orderTotalNum;
     private String purchaseTypeName;
 
@@ -27,7 +27,7 @@ public class LongYanPurchaseOrderReportVO implements Serializable {
     /**
      * 每月总数
      */
-    @Excel(name = "总数", orderNum = "3")
+    @Excel(name = "采购物料总数", orderNum = "3")
     private BigDecimal spareTotalNum;
 
 

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -93,8 +93,9 @@
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO" resultType="com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO">
-        select menu.*,project.name as projectName,project2.name as parentProjectName
+        select menu.*,project.name as projectName,project2.name as parentProjectName,info.name as sbName,info.position_no as positionNo
         from t_long_yan_purchase_order as menu
+        left join t_sb_info info on info.id = menu.sb_id
         left join t_project project on project.id = menu.project_id
         left join t_project project2 on project.parent_id = project2.id
         <where>