1、整理部分代码

2、新增订单接口，修改订单查询接口

pom.xml

@@ -73,11 +73,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.2</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -104,6 +99,11 @@
             <artifactId>xmlunit-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.2</version>
+        </dependency>
+        <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
             <version>3.5.4</version>
@@ -113,7 +113,12 @@
             <artifactId>mybatis-spring</artifactId>
             <version>2.0.4</version>
         </dependency>
-
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
         <!--部署热启动依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -197,25 +202,19 @@
             <version>1.2.10</version>
         </dependency>
 
+<!--&lt;!&ndash;    mybatis-plus 依赖&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.5.1</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter-test</artifactId>-->
+<!--            <version>3.5.1</version>-->
+<!--        </dependency>-->
 
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter-test</artifactId>
-            <version>3.5.1</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13</version>
-            <scope>test</scope>
-        </dependency>
-
+<!--    jackjson依赖-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

src/main/java/com/chuanghai/repair/controller/OrderController.java

@@ -23,6 +23,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
+import java.text.DateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.text.SimpleDateFormat;
 
@@ -59,19 +61,18 @@ public class OrderController {
     @ApiOperation("PC端:查询订单")
     @PostMapping(value = "/queryAllOrderByDate")
     public ReturnValueUtil queryAllOrderByDate(@ApiParam(name = "查询日期") String time,
-                                                      @ApiParam(name = "当前页码") Integer pageNum,
-                                                      @ApiParam(name = "每页记录数") Integer pageSize) {
+                                               @ApiParam(name = "订单状态 0(派单查询) 2(已接单查询) 3(已完成查询) 23(订单查询)" ,required = true) String orderStatus,
+                                               @ApiParam(name = "当前页码") Integer pageNum,
+                                               @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
             String tody = "";
             String tomorrow = "";
-            String status = "";
             if (time != null && !time.equals("")) {
-
                 //前端日期数据由 String转Date
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                 Calendar calendar = Calendar.getInstance();
                 //传入时间就设置为当天时间
                 Date date = sdf.parse(time);
@@ -82,9 +83,8 @@ public class OrderController {
                 tody = sdf.format(calendar.getTime());
                 calendar.add(Calendar.DATE, 1); //增加一天
                 tomorrow = sdf.format(calendar.getTime());
-
             }
-            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize, tody, tomorrow, status);
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize, tody, tomorrow,orderStatus);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -92,21 +92,24 @@ public class OrderController {
         return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
+
+
     /**
-     * @param
+     * 通过请求中的 当前页码及每页记录数分页查询意见投诉
+     *
      * @return PageInfo<RepairsOrder>
      */
-    @ApiOperation("PC端:派送订单查询")
-    @PostMapping(value = "/queryAllOrderByStatus")
-    public ReturnValueUtil queryAllOrderByDateStatus(@ApiParam(name = "当前页码") Integer pageNum,
-                                                            @ApiParam(name = "每页记录数") Integer pageSize) {
+    @ApiOperation("维修工：用户评价")
+    @PostMapping(value = "/queryAllOrderByUserAdvice")
+    public ReturnValueUtil queryAllOrderByUserAdvice(HttpServletRequest request,
+                                                     @ApiParam(name = "当前页码") Integer pageNum,
+                                                     @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
-            String status = "0";
-            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize, null, null, status);
-
+            String workID = CreateTokenUtil.getHeadersInfo(request);
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice("","",workID,pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -118,17 +121,33 @@ public class OrderController {
      *
      * @return PageInfo<RepairsOrder>
      */
-    @ApiOperation("维修工：用户评价")
-    @PostMapping(value = "/queryAllOrderByUserAdvice")
-    public ReturnValueUtil queryAllOrderByUserAdvice(HttpServletRequest request,
-                                                 @ApiParam(name = "当前页码") Integer pageNum,
-                                                 @ApiParam(name = "每页记录数") Integer pageSize) {
+    @ApiOperation("PC端：查询指定维修工评价")
+    @PostMapping(value = "/queryOrderByWorkIDAdvice")
+    public ReturnValueUtil queryOrderByWorkIDAdvice(@ApiParam(name = "维修工ID" ,required = true)String workId,
+                                                    @ApiParam(name = "查询日期") String time,
+                                                    @ApiParam(name = "当前页码") Integer pageNum,
+                                                    @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
-            String workID = CreateTokenUtil.getHeadersInfo(request);
-            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(workID,pageNum, pageSize);
+            String tody = "";
+            String tomorrow = "";
+            if (time != null && !time.equals("")) {
+                //前端日期数据由 String转Date
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Calendar calendar = Calendar.getInstance();
+                //传入时间就设置为当天时间
+                Date date = sdf.parse(time);
+                calendar.setTime(date);
+                //获取当天的0时0分0秒
+                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH),
+                        0, 0, 0);
+                tody = sdf.format(calendar.getTime());
+                calendar.add(Calendar.DATE, 1); //增加一天
+                tomorrow = sdf.format(calendar.getTime());
+            }
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(tody,tomorrow,workId,pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -143,13 +162,30 @@ public class OrderController {
      */
     @ApiOperation("PC端：意见投诉")
     @PostMapping(value = "/queryAllOrderByAdvice")
-    public ReturnValueUtil queryAllOrderByAdvice(@ApiParam(name = "当前页码") Integer pageNum,
+    public ReturnValueUtil queryAllOrderByAdvice(@ApiParam(name = "查询日期") String time,
+                                                 @ApiParam(name = "当前页码") Integer pageNum,
                                                  @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
+        String tody = "";
+        String tomorrow = "";
         try {
-            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(null,pageNum, pageSize);
+            if (time != null && !time.equals("")) {
+                //前端日期数据由 String转Date
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Calendar calendar = Calendar.getInstance();
+                //传入时间就设置为当天时间
+                Date date = sdf.parse(time);
+                calendar.setTime(date);
+                //获取当天的0时0分0秒
+                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH),
+                        0, 0, 0);
+                tody = sdf.format(calendar.getTime());
+                calendar.add(Calendar.DATE, 1); //增加一天
+                tomorrow = sdf.format(calendar.getTime());
+            }
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(tody,tomorrow,null,pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -174,7 +210,8 @@ public class OrderController {
             if (!orderId.equals("") && workId != null) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Calendar calendar = Calendar.getInstance();
-                Date time = calendar.getTime();
+                //传入时间就设置为当天时间
+                Date date = sdf.parse(sdf.format(calendar.getTime()));
                 String status = "1";  //将订单状态改为 待接单状态  1
                 RepairsOrder repairsOrder = new RepairsOrder();
                 RepairsWork repairsWork = new RepairsWork();
@@ -182,7 +219,7 @@ public class OrderController {
                 repairsOrder.setOrderStatus(status);
                 repairsWork.setWorkId(workId);
                 repairsOrder.setRepairsWork(repairsWork);
-                repairsOrder.setOrderCompleteTime(time);
+                repairsOrder.setOrderCompleteTime(date);
                 ArrayList<RepairsOrder> orderArrayList = new ArrayList<>();
                 orderArrayList.add(repairsOrder);
                 repairsOrderService.updateRepairsOrderBath(orderArrayList);
@@ -297,7 +334,7 @@ public class OrderController {
 
         Boolean flag = Boolean.FALSE;
         try {
-            if (!orderAdvice.equals("") && !orderId.equals("")) {
+            if (!orderAdvice.equals("")) {
                 repairsOrderService.updateOrderAdvice(orderId, orderAdvice);
                 flag = Boolean.TRUE;
             }
@@ -320,10 +357,41 @@ public class OrderController {
         try {
             if (!orderId.equals("")) {
                 repairsOrder = repairsOrderService.queryByOrderId(orderId);
-                String imageName = repairsOrder.getOrderImages();
-                if (StringUtils.hasText(imageName)) {
-                    repairsOrder.setOrderImages(imgConfig.getShowHost() + imageName);
+                if(repairsOrder.getOrderImages()!=null){
+                    String imageName = repairsOrder.getOrderImages();
+                    if (StringUtils.hasText(imageName)) {
+                        repairsOrder.setOrderImages(imgConfig.getShowHost() + imageName);
+                    }
                 }
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnObject(repairsOrder);
+    }
+
+
+    /**
+     * 查询指定订单ID 的订单信息
+     *
+     * @param orderId
+     * @return
+     */
+    @ApiOperation("派送订单:详情查看")
+    @PostMapping(value = "/queryByOrderIdNotWork")
+    public ReturnValueUtil queryByOrderIdNotWork(@ApiParam(name = "订单ID", required = true) String orderId) {
+        RepairsOrder repairsOrder = null;
+        try {
+            if (!orderId.equals("")) {
+                repairsOrder = repairsOrderService.queryByOrderIdNotWork(orderId);
+                if(repairsOrder.getOrderImages()!=null){
+                    String imageName = repairsOrder.getOrderImages();
+                    if (StringUtils.hasText(imageName)) {
+                        repairsOrder.setOrderImages(imgConfig.getShowHost() + imageName);
+                    }
+                }
+
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -501,9 +569,11 @@ public class OrderController {
                 repairsWork.setWorkId(1);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 //传入时间就设置为当天时间
-                Date completeTimeDate = sdf.parse(completeTime);
+                Date timeDate = sdf.parse(completeTime);
+                String time = sdf.format(timeDate);
+                System.out.println(time);
                 RepairsOrder repairsOrder = new RepairsOrder(orderId, null, null, null,
-                        completeTimeDate, null, null, "2", null,
+                        timeDate, null, null, "2", null,
                         null, null, null, repairsWork, null);
                 ArrayList<RepairsOrder> orderArrayList = new ArrayList<>();
                 orderArrayList.add(repairsOrder);

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

@@ -1,7 +1,9 @@
 package com.chuanghai.repair.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -47,6 +49,7 @@ public class RepairsOrder {
     /**
      * 订单完成维修时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "订单完成维修时间")
     @Column(name = "order_complete_time")
     private Date orderCompleteTime;
@@ -54,6 +57,7 @@ public class RepairsOrder {
     /**
      * 订单提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "订单提交时间")
     @Column(name = "order_commit_time")
     private Date orderCommitTime;

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

@@ -15,7 +15,7 @@ public interface RepairsOrderMapper  {
      * @return
      * @throws Exception
      */
-    List<RepairsOrder> queryAllOrderByDate( String tody, String tomorrow, String status);
+    List<RepairsOrder> queryAllOrderByDate( String tody, String tomorrow,String orderStatus);
 
 
     /**
@@ -39,6 +39,13 @@ public interface RepairsOrderMapper  {
      */
     RepairsOrder queryByOrderId(String orderId);
 
+    /**
+     * 查询指定订单ID 的订单 每有接单的
+     * @param orderId
+     * @return
+     */
+    RepairsOrder queryByOrderIdNotWork(String orderId);
+
 
     /**
      * 管理员手动派单 通过OrderId  修改order_status   work_id
@@ -93,6 +100,6 @@ public interface RepairsOrderMapper  {
      * 查询所有评价的订单信息
      * @return
      */
-    List<RepairsOrder> queryAllOrderByAdvice(String workID);
+    List<RepairsOrder> queryAllOrderByAdvice(String tody, String tomorrow,String workID);
 
 }

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

@@ -1,6 +1,5 @@
 package com.chuanghai.repair.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chuanghai.repair.entity.RepairsWork;
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -20,7 +20,7 @@ public interface RepairsOrderService {
      * @return
      * @throws Exception
      */
-    PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow, String status) throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow,String orderStatus) throws Exception;
 
     /**
      * 通过订单ID修改订单评价
@@ -46,6 +46,12 @@ public interface RepairsOrderService {
      */
     RepairsOrder queryByOrderId(String orderId)throws  Exception;
 
+    /**
+     * 查询指定订单ID 的订单 每有接单的
+     * @param orderId
+     * @return
+     */
+    RepairsOrder queryByOrderIdNotWork(String orderId)throws Exception;
 
     /**
      * 管理员手动派单 通过OrderId  修改order_status   work_id
@@ -103,7 +109,7 @@ public interface RepairsOrderService {
      * 查询所有评价的订单信息
      * @return
      */
-    PageInfo<RepairsOrder> queryAllOrderByAdvice(String workID, Integer pageNum, Integer pageSize)throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByAdvice(String tody, String tomorrow,String workID, Integer pageNum, Integer pageSize)throws Exception;
 
 
 

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

@@ -30,9 +30,9 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @throws Exception
      */
     @Override
-    public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow, String status) throws Exception {
+    public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow,String orderStatus) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
-        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByDate(tody, tomorrow, status);
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByDate(tody, tomorrow,orderStatus);
         PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
         return pageInfo;
     }
@@ -60,6 +60,12 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
         return repairsOrderMapper.queryByOrderId(orderId);
     }
 
+    @Override
+    public RepairsOrder queryByOrderIdNotWork(String orderId) throws Exception {
+        return repairsOrderMapper.queryByOrderIdNotWork(orderId);
+    }
+
+
     /**
      * 管理员手动派单 通过OrderId  修改order_status   work_id
      *
@@ -153,9 +159,9 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @return
      */
     @Override
-    public PageInfo<RepairsOrder> queryAllOrderByAdvice(String workID, Integer pageNum, Integer pageSize) throws Exception {
+    public PageInfo<RepairsOrder> queryAllOrderByAdvice(String tody, String tomorrow,String workID, Integer pageNum, Integer pageSize) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
-        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice(workID);
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice(tody,tomorrow,workID);
         PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
         return pageInfo;
     }

src/main/resources/application.yml

@@ -33,7 +33,7 @@ img:
   # 图片保存地址
   saveLocation: E:\devImg\repair\
   # 图片预览地址
-  showHost: http://localhost/dev-img/
+  showHost: http://192.168.31.115/dev-img/
 
 #微校相关配置
 weixiao:

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -39,6 +39,7 @@
 <!--        订单与维修工之间是  N:1 关系-->
         <association  property="repairsWork"  javaType="com.chuanghai.repair.entity.RepairsWork">
             <id column="work_id" property="workId"></id>
+            <id column="work_name" property="workName"></id>
         </association >
 <!--        订单与故障类型之间是  N:1 关系-->
         <association  property="repairsFault"  javaType="com.chuanghai.repair.entity.RepairsFault">
@@ -50,19 +51,34 @@
 
 <!--    通过时间查询订单信息-->
         <select id="queryAllOrderByDate" parameterType="java.lang.String" resultMap="OrderFaultStudentMap">
-            select od.order_id, od.order_status,od.order_commit_time, fa.fault_name,st.dorm_number, od.order_expected_time
-                from repairs_order od ,repairs_student st ,repairs_fault fa
+
+            select od.order_id, od.order_status,od.order_commit_time, fa.fault_name,st.dorm_number,
+                od.order_complete_time,od.order_expected_time,wo.work_name
+            from
+            repairs_order od left join repairs_student st on od.student_id = st.student_id
+            left join repairs_fault fa on od.fault_id = fa.fault_id
+            left join repairs_work wo on od.work_id = wo.work_id
             <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
-                od.student_id = st.student_id
-                and od.fault_id = fa.fault_id
                 <if test="tody!='' and tody!=null">
-                    and od.order_commit_time BETWEEN #{tody} and #{tomorrow}
+                    and od.order_complete_time BETWEEN #{tody} and #{tomorrow}
+                </if>
+                <if test = "orderStatus == '0'.toString()">
+                    and od.order_status = #{orderStatus}
+                </if>
+                <if test = "orderStatus == '2'.toString()">
+                    and od.work_id = wo.work_id
+                    and od.order_status =#{orderStatus}
                 </if>
-                <if test="status!='' and status!=null">
-                    and od.order_status = #{status}
+                <if test = "orderStatus == '3'.toString()">
+                    and od.work_id = wo.work_id
+                    and od.order_status =#{orderStatus}
+                </if>
+                <if test = "orderStatus == '23'.toString()">
+                    and od.work_id = wo.work_id
+                    and od.order_status in (2,3)
                 </if>
             </trim>
-                order by od.order_commit_time desc, fa.fault_level desc
+            order by od.order_commit_time desc, fa.fault_level desc
         </select>
 
     <!--    通过ID查询订单信息-->
@@ -106,16 +122,65 @@
         select * from repairs_order  where  order_status = 0
     </select>
 
+    <resultMap id="queryByOrderIdMap" type="com.chuanghai.repair.entity.RepairsOrder" >
+        <id column="order_id" property="orderId" jdbcType="VARCHAR"/>
+        <result column="order_images" property="orderImages" jdbcType="VARCHAR"/>
+        <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
+        <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
+        <result column="order_expected_time" property="orderExpectedTime" jdbcType="VARCHAR"/>
+        <!--        订单与学生之间是  N:1 关系-->
+        <association  property="repairsStudent"  javaType="com.chuanghai.repair.entity.RepairsStudent">
+            <id column="student_id" property="studentId"></id>
+            <result column="student_phone" property="studentPhone" jdbcType="VARCHAR"/>
+            <result column="student_other_phone" property="studentOtherPhone" jdbcType="VARCHAR"/>
+            <result column="dorm_number" property="dormNumber" jdbcType="VARCHAR"/>
+        </association >
+        <!--        订单与故障类型之间是  N:1 关系-->
+        <association  property="repairsFault"  javaType="com.chuanghai.repair.entity.RepairsFault">
+            <id column="fault_id" property="faultId"></id>
+            <result column="fault_name" property="faultName" jdbcType="VARCHAR"/>
+        </association >
+        <!--        订单与维修工之间是  N:1 关系-->
+        <association  property="repairsWork"  javaType="com.chuanghai.repair.entity.RepairsWork">
+            <id column="work_id" property="workId"></id>
+            <id column="work_name" property="workName"></id>
+        </association >
+
+    </resultMap>
+
+
 <!--    查询指定订单ID 的订单-->
-    <select id="queryByOrderId"  parameterType="java.lang.String" resultMap="OrderFaultStudentMap">
-        select * from repairs_order
+    <select id="queryByOrderId"  parameterType="java.lang.String" resultMap="queryByOrderIdMap">
+        select od.order_id, od.order_commit_time, fa.fault_name,st.dorm_number, od.order_complete_time,od.order_expected_time,
+            st.student_phone,st.student_other_phone, od.order_images, wo.work_name,od.order_status
+        from repairs_order od ,repairs_student st ,repairs_fault fa, repairs_work wo
+        <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
+            od.student_id = st.student_id
+            and od.fault_id = fa.fault_id
+            and od.work_id = wo.work_id
+            <if test="orderId!='' and orderId!=null">
+                and od.order_id =#{orderId}
+            </if>
+        </trim>
+    </select>
+
+
+    <!--    查询指定订单ID 的订单-->
+    <select id="queryByOrderIdNotWork"  parameterType="java.lang.String" resultMap="queryByOrderIdMap">
+        select od.order_id, od.order_commit_time, fa.fault_name,st.dorm_number, od.order_complete_time,od.order_expected_time,
+        st.student_phone,st.student_other_phone, od.order_images,od.order_status
+        from repairs_order od ,repairs_student st ,repairs_fault fa
         <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
+            od.student_id = st.student_id
+            and od.fault_id = fa.fault_id
             <if test="orderId!='' and orderId!=null">
-                and order_id =#{orderId}
+                and od.order_id =#{orderId}
             </if>
         </trim>
     </select>
 
+
+
 <!--    管理员手动派单 同时修改两个参数-->
     <update id="updateRepairsOrderBath" parameterType="java.util.List" >
         update repairs_order
@@ -244,10 +309,16 @@
             and od.student_id = st.student_id
             and od.fault_id = fa.fault_id
             and order_advice is not null
+            <if test="tody!='' and tody!=null">
+                and od.order_complete_time BETWEEN #{tody} and #{tomorrow}
+            </if>
             <if test="workID!='' and workID!=null">
                 and wo.work_id = #{workID}
             </if>
         </trim>
          order by od.order_complete_time desc
     </select>
+
+
+
 </mapper>