Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java

@@ -1,5 +1,6 @@
 package com.stdiet.custom.domain;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.stdiet.common.annotation.Excel;
 import lombok.Data;
@@ -74,6 +75,4 @@ public class SysDishes {
 
     private List<SysDishesIngredient> igdList;
 
-    private List<SysDishesIngredient> detail;
-
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java

@@ -1,8 +1,6 @@
 package com.stdiet.custom.domain;
 
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 
@@ -27,4 +25,11 @@ public class SysDishesIngredient extends SysIngredient {
 
     private String remark;
 
+    private Long id;
+
+    private String cus_unit;
+
+    private String cus_weight;
+
+
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipes.java

@@ -1,47 +1,17 @@
 package com.stdiet.custom.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data
 public class SysRecipes {
-    private static final long serialVersionUID = 1L;
 
     private Long id;
 
-    private Integer numDay;
+    private Long cusId;
 
-    private List<SysDishes> dishes;
+    private Long planId;
 
-    private Integer reviewStatus;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
+    private List<SysRecipesDaily> menus;
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesDaily.java

@@ -0,0 +1,34 @@
+package com.stdiet.custom.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SysRecipesDaily {
+    private Long id;
+
+    private Integer numDay;
+
+    private Date date;
+
+    private Long recipesId;
+
+    private Long cusId;
+
+    private Integer reviewStatus;
+
+    private Date createTime;
+
+    private String createBy;
+
+    private Date updateTime;
+
+    private String updateBy;
+
+    private String remark;
+
+    private List<SysRecipesDailyDishes> dishes;
+
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesDailyDishes.java

@@ -0,0 +1,28 @@
+package com.stdiet.custom.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SysRecipesDailyDishes {
+    private Long id;
+
+    private Long menuId;
+
+    private String name;
+
+    private Long dishesId;
+
+    private JSONArray detail;
+
+    private String methods;
+
+    private List<SysDishesIngredient> igdList;
+
+    private String type;
+
+    private Integer isMain;
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java

@@ -26,6 +26,8 @@ public class SysRecipesPlan extends BaseEntity
     //@Excel(name = "订单ID")
     private Long orderId;
 
+    private Long cusId;
+
     //客户ID
     private Long customerId;