1.缺料报表优化

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -409,6 +409,12 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
 
 
     private String mg;
     private String mg;
 
 
+    private String describe = "";
+
+    private int calculateIssuedNum = 0;
+
+    private String remark = "";
+
     /**
     /**
      * 工单开始时间
      * 工单开始时间
      */
      */

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/query/ReportQueryCondition.java

@@ -111,10 +111,8 @@ public class ReportQueryCondition {
     private String expireStatus;
     private String expireStatus;
 
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private BetweenData<Date> startDate;
+    private BetweenData<Date> createDate;
 
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private BetweenData<Date> finishDate;
 
 
     private int page;
     private int page;