实现订单查看功能

src/main/java/com/chuanghai/repair/entity/RepairsAdmin.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -15,7 +16,7 @@ public class RepairsAdmin {
     /**
      * 管理员ID
      */
-
+    @ApiModelProperty(value = "管理员ID")
     @Id
     @Column(name = "admin_id")
     private Integer adminId;
@@ -23,24 +24,28 @@ public class RepairsAdmin {
     /**
      * 管理员名称
      */
+    @ApiModelProperty(value = "管理员名称")
     @Column(name = "admin_name")
     private String adminName;
 
     /**
      * 管理员密码
      */
+    @ApiModelProperty(value = "管理员密码")
     @Column(name = "admin_password")
     private String adminPassword;
 
     /**
      * 手机号码
      */
+    @ApiModelProperty(value = "管理员手机号码")
     @Column(name = "admin_phone")
     private String adminPhone;
 
     /**
      * 状态 1（启用） 0（未启用）
      */
+    @ApiModelProperty(value = "状态 1（启用） 0（未启用）")
     @Column(name = "admin_status")
     private String adminStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsAdvice.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -14,6 +15,7 @@ public class RepairsAdvice {
     /**
      * 评价建议编号
      */
+    @ApiModelProperty(value = "评价建议ID")
     @Id
     @Column(name = "advice_id")
     private Integer adviceId;
@@ -21,20 +23,21 @@ public class RepairsAdvice {
     /**
      * 反馈建议
      */
+    @ApiModelProperty(value = "反馈建议")
     @Column(name = "advice_options")
     private String adviceOptions;
 
     /**
      * 学生学号
      */
-    @Column(name = "student_id")
-    private String studentId;
+    @Column(name = "repairsStudent")
+    private RepairsStudent repairsStudent;
 
     /**
      * 订单ID
      */
-    @Column(name = "order_id")
-    private String orderId;
+    @Column(name = "repairsOrder")
+    private RepairsOrder repairsOrder;
 
 
 }

src/main/java/com/chuanghai/repair/entity/RepairsFault.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -14,6 +15,7 @@ public class RepairsFault {
     /**
      * 故障类型ID
      */
+    @ApiModelProperty(value = "故障类型ID")
     @Id
     @Column(name = "fault_id")
     private Integer faultId;
@@ -21,18 +23,21 @@ public class RepairsFault {
     /**
      * 故障类型名称
      */
+    @ApiModelProperty(value = "故障类型名称")
     @Column(name = "fault_name")
     private String faultName;
 
     /**
      * 故障类型优先级
      */
+    @ApiModelProperty(value = "故障类型优先级")
     @Column(name = "fault_level")
     private String faultLevel;
 
     /**
      * 故障类型状态 1（启用）0（停用）
      */
+    @ApiModelProperty(value = "故障类型状态 1（启用）0（停用）")
     @Column(name = "fault_status")
     private String faultStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsFaultOrder.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -14,12 +15,14 @@ public class RepairsFaultOrder {
     /**
      * 故障类型编号
      */
+    @ApiModelProperty(value = "故障类型编号")
     @Column(name = "fault_id")
     private Integer faultId;
 
     /**
      * 订单ID
      */
+    @ApiModelProperty(value = "订单ID")
     @Column(name = "order_id")
     private String orderId;
 

src/main/java/com/chuanghai/repair/entity/RepairsNotice.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.util.Date;
@@ -15,6 +16,7 @@ public class RepairsNotice {
     /**
      * 公告ID
      */
+    @ApiModelProperty(value = "公告ID")
     @Id
     @Column(name = "notice_id")
     private Integer noticeId;
@@ -22,26 +24,29 @@ public class RepairsNotice {
     /**
      * 公告内容
      */
+    @ApiModelProperty(value = "公告内容")
     @Column(name = "notice_content")
     private String noticeContent;
 
     /**
      * 发布时间
      */
+    @ApiModelProperty(value = "发布时间")
     @Column(name = "notice_time")
     private Date noticeTime;
 
     /**
      * 公告状态 0（删除）1（启用）
      */
+    @ApiModelProperty(value = "公告状态 0（删除）1（启用）")
     @Column(name = "notice_status")
     private String noticeStatus;
 
     /**
      * 管理员ID
      */
-    @Column(name = "admin_id")
-    private Integer adminId;
+    @Column(name = "repairsAdmin")
+    private RepairsAdmin repairsAdmin;
 
 
 }

src/main/java/com/chuanghai/repair/entity/RepairsOrder.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -16,6 +17,7 @@ public class RepairsOrder {
     /**
      * 订单ID
      */
+    @ApiModelProperty(value = "订单ID")
     @Id
     @Column(name = "order_id")
     private String orderId;
@@ -23,54 +25,63 @@ public class RepairsOrder {
     /**
      * 故障图片
      */
+    @ApiModelProperty(value = "故障图片")
     @Column(name = "order_images")
     private String orderImages;
 
     /**
      * 订单备注
      */
+    @ApiModelProperty(value = "订单备注")
     @Column(name = "order_note")
     private String orderNote;
 
     /**
      * 订单预期维修时间
      */
+    @ApiModelProperty(value = "订单预期维修时间")
     @Column(name = "order_expected_time")
     private Date orderExpectedTime;
 
     /**
      * 订单完成维修时间
      */
+    @ApiModelProperty(value = "订单完成维修时间")
     @Column(name = "order_complete_time")
     private Date orderCompleteTime;
 
     /**
      * 订单提交时间
      */
+    @ApiModelProperty(value = "订单提交时间")
     @Column(name = "order_commit_time")
     private Date orderCommitTime;
 
     /**
      * 订单评价
      */
+    @ApiModelProperty(value = "订单评价")
     @Column(name = "order_advice")
     private String orderAdvice;
 
     /**
      * 订单状态 0（待接单）1（已接单）2（维修完成）3（退单）
      */
+    @ApiModelProperty(value = "订单状态 0（待接单）1（已接单）2（维修完成）3（退单）")
     @Column(name = "order_status")
     private String orderStatus;
 
     /**
      * 订单维修费用
      */
+    @ApiModelProperty(value = "订单维修费用")
     @Column(name = "order_price")
     private BigDecimal orderPrice;
 
     /**
      * 支付状态 0（未支付）1（已支付）
      */
+    @ApiModelProperty(value = "支付状态 0（未支付）1（已支付）")
     @Column(name = "order_price_status")
     private String orderPriceStatus;
 
@@ -78,6 +89,7 @@ public class RepairsOrder {
     /**
      * 退单理由
      */
+    @ApiModelProperty(value = "退单理由")
     @Column(name = "order_back")
     private String orderBack;
 

src/main/java/com/chuanghai/repair/entity/RepairsStudent.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -14,6 +15,7 @@ public class RepairsStudent {
     /**
      * 学生学号
      */
+    @ApiModelProperty(value = "学生学号")
     @Id
     @Column(name = "student_id")
     private String studentId;
@@ -21,48 +23,56 @@ public class RepairsStudent {
     /**
      * 学生名称
      */
+    @ApiModelProperty(value = "学生名称")
     @Column(name = "student_name")
     private String studentName;
 
     /**
      * 学生性别
      */
+    @ApiModelProperty(value = "学生性别 0(男) 1（女）")
     @Column(name = "student_sex")
     private String studentSex;
 
     /**
      * 手机号码
      */
+    @ApiModelProperty(value = "学生手机号码")
     @Column(name = "student_phone")
     private String studentPhone;
 
     /**
      * 备选手机号码
      */
+    @ApiModelProperty(value = "备选手机号码")
     @Column(name = "student_other_phone")
     private String studentOtherPhone;
 
     /**
      * 学生专业年级班级
      */
+    @ApiModelProperty(value = "学生专业年级班级")
     @Column(name = "student_professionl_grade_clazz")
     private String studentProfessionlGradeClazz;
 
     /**
      * 学生宿舍
      */
+    @ApiModelProperty(value = "学生宿舍")
     @Column(name = "student_build_floor_room")
     private String studentBuildFloorRoom;
 
     /**
      * 宿舍ID拼接
      */
+    @ApiModelProperty(value = "宿舍ID拼接")
     @Column(name = "student_dormitory")
     private String studentDormitory;
 
     /**
      * 学生状态 0（未毕业）1（已毕业）
      */
+    @ApiModelProperty(value = "学生状态 0（未毕业）1（已毕业）")
     @Column(name = "student_status")
     private String studentStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsWork.java

@@ -44,9 +44,9 @@ public class RepairsWork {
     private String workPhone;
 
     /**
-     * 状态 1（在职）0（离职）
+     * 状态 1（在岗）0（离岗）2（离职）
      */
-    @ApiModelProperty(value = "状态 1（在职）0（离职）")
+    @ApiModelProperty(value = "状态 1（在岗）0（离岗）2（离职）")
     @Column(name = "work_status")
     private String workStatus;
 

src/main/java/com/chuanghai/repair/mapper/RepairsOrderMapper.java

@@ -25,4 +25,17 @@ public interface RepairsOrderMapper  {
      */
     Integer updateOrderAdvice(String orderId,String orderAdvice);
 
+    /**
+     * 查询所有未接单状态的订单-
+     * @return
+     */
+    List<RepairsOrder> queryAllOrderNotReceive();
+
+    /**
+     * 查询指定订单ID 的订单
+     * @param orderId
+     * @return
+     */
+    RepairsOrder queryByOrderId(String orderId);
+
 }

src/main/java/com/chuanghai/repair/mapper/RepairsWorkMapper.java

@@ -38,4 +38,6 @@ public interface RepairsWorkMapper{
      */
     Integer updateWorkStatus(String workId) throws Exception;
 
+    List<String> queryAllWork() throws Exception;
+
 }

src/main/java/com/chuanghai/repair/service/RepairsOrderService.java

@@ -28,4 +28,19 @@ public interface RepairsOrderService {
      * @throws Exception
      */
     Integer updateOrderAdvice(String orderId,String orderAdvice) throws Exception;
+
+
+    /**
+     * 查询所有未接单状态的订单-
+     * @return
+     */
+    List<RepairsOrder> queryAllOrderNotReceive() throws Exception;
+
+
+    /**
+     * 查询指定订单ID 的订单
+     * @param orderId
+     * @return
+     */
+    RepairsOrder queryByOrderId(String orderId)throws  Exception;
 }

src/main/java/com/chuanghai/repair/service/RepairsWorkService.java

@@ -44,4 +44,6 @@ public interface RepairsWorkService {
      * @throws Exception
      */
     Integer updateWorkStatus(String workId) throws Exception;
+
+    List<String>queryAllWork() throws Exception;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsOrderServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,4 +46,14 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
     public Integer updateOrderAdvice(String orderId, String orderAdvice) throws Exception {
         return repairsOrderMapper.updateOrderAdvice(orderId,orderAdvice);
     }
+
+    @Override
+    public List<RepairsOrder> queryAllOrderNotReceive() throws Exception {
+        return repairsOrderMapper.queryAllOrderNotReceive();
+    }
+
+    @Override
+    public RepairsOrder queryByOrderId(String orderId) throws Exception {
+        return repairsOrderMapper.queryByOrderId(orderId);
+    }
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsWorkServiceImpl.java

@@ -65,4 +65,9 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
     public Integer updateWorkStatus(String workId) throws Exception {
         return repairsWorkMapper.updateWorkStatus(workId);
     }
+
+    @Override
+    public List<String> queryAllWork() throws Exception {
+        return repairsWorkMapper.queryAllWork();
+    }
 }

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -15,8 +15,7 @@
         <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
         <result column="order_price" property="orderPrice" jdbcType="DECIMAL"/>
         <result column="order_price_status" property="orderPriceStatus" jdbcType="VARCHAR"/>
-        <result column="work_id" property="workId" jdbcType="INTEGER"/>
-        <result column="student_id" property="studentId" jdbcType="VARCHAR"/>
+
         <result column="order_back" property="orderBack" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -77,4 +76,19 @@
     </select>
 
 
+<!--    查询所有未接单状态的订单-->
+    <select id="queryAllOrderNotReceive" resultMap="OrderFaultStudentMap">
+        select * from repairs_order  where  order_status = 0
+    </select>
+
+<!--    查询指定订单ID 的订单-->
+    <select id="queryByOrderId"  parameterType="java.lang.String" resultMap="OrderFaultStudentMap">
+        select * from repairs_order
+        <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
+            <if test="orderId!='' and orderId!=null">
+                and order_id =#{orderId}
+            </if>
+        </trim>
+    </select>
+
 </mapper>

src/main/resources/mapper/RepairsWorkMapper.xml

@@ -57,4 +57,9 @@
     <select id="updateWorkStatus" parameterType="java.lang.String" resultType="Integer" >
         update repairs_work wo set wo.work_status = 0 where wo.work_id = #{work_id}
     </select>
+
+<!--    查询所有在职维修工-->
+    <select id="queryAllWork" resultType="java.lang.String">
+        select work_id from  repairs_work where work_status = 1
+    </select>
 </mapper>