微信

src/main/java/com/jeeplus/modules/wexintheorder/entity/TheOrder.java

@@ -8,19 +8,46 @@ import java.util.Date;
 public class TheOrder extends DataEntity<TheOrder> {
     private String name;//姓名
     private String department;//部门
-    private String leadership;//分管领导
-    private Date confirmOrder;//确定订餐
+    private String team;
+    private String specific;
     private Date scheduled;//预定餐
     private String correlationId;//关联id
-
     private String status;//有无回显 1-回显 2-本来就有
+    private Integer orderStatus;
+    private String DateStart;
+    private Date beginDate;
+    private Date EndDate;
 
-    public String getStatus() {
-        return status;
+    public Date getEndDate() {
+        return EndDate;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setEndDate(Date endDate) {
+        EndDate = endDate;
+    }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getDateStart() {
+        return DateStart;
+    }
+
+    public void setDateStart(String dateStart) {
+        DateStart = dateStart;
     }
 
     public String getName() {
@@ -39,20 +66,20 @@ public class TheOrder extends DataEntity<TheOrder> {
         this.department = department;
     }
 
-    public String getLeadership() {
-        return leadership;
+    public String getTeam() {
+        return team;
     }
 
-    public void setLeadership(String leadership) {
-        this.leadership = leadership;
+    public void setTeam(String team) {
+        this.team = team;
     }
 
-    public Date getConfirmOrder() {
-        return confirmOrder;
+    public String getSpecific() {
+        return specific;
     }
 
-    public void setConfirmOrder(Date confirmOrder) {
-        this.confirmOrder = confirmOrder;
+    public void setSpecific(String specific) {
+        this.specific = specific;
     }
 
     public Date getScheduled() {
@@ -70,5 +97,13 @@ public class TheOrder extends DataEntity<TheOrder> {
     public void setCorrelationId(String correlationId) {
         this.correlationId = correlationId;
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
 

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -54,9 +54,6 @@ public class TheOrderController extends BaseController {
         List<TheLeadership> listUserId = theLeadershipService.findListUserId(theLeadership);
         if (listUserId.size()>0){
             theLeadership.setTeam(listUserId.get(0).getTeam());
-            if (listUserId.get(0).getTeam().equals("潘中")){
-                theOrder.setDepartment("1");
-            }
             theOrder.setDepartment("2");//全显示
             theLeadership.setSpecific(listUserId.get(0).getSpecific());
             theLeadership.setDepartment(listUserId.get(0).getDepartment());
@@ -66,7 +63,6 @@ public class TheOrderController extends BaseController {
             theLeadership.setSpecific("");
             theLeadership.setDepartment("");
             theOrder.setStatus("1"); //不是回显
-            theOrder.setDepartStatus("1");//显示一级
         }
         return theOrder;
     }