feats

src/main/java/com/yunzhi/nanyang/common/DateUtils.java

@@ -34,4 +34,14 @@ public class DateUtils {
     public static LocalDateTime getDateTime(long milliseconds) {
         return LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds), ZoneOffset.UTC);
     }
+
+    public static LocalDateTime getDayStart(String dt) {
+        if (dt == null || dt.equals("")) return null;
+        return from(dt + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+    }
+
+    public static LocalDateTime getDayEnd(String dt) {
+        if (dt == null || dt.equals("")) return null;
+        return from(dt + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+    }
 }

src/main/java/com/yunzhi/nanyang/controller/TaDispatchController.java

@@ -3,10 +3,7 @@ package com.yunzhi.nanyang.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.nanyang.common.BaseController;
-import com.yunzhi.nanyang.common.Constants;
-import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
@@ -26,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 调度表 前端控制器
@@ -60,25 +59,42 @@ public class TaDispatchController extends BaseController {
     @Autowired
     public ITaWorkJobService iTaWorkJobService;
 
+    @Autowired
+    public ISysUserService iSysUserService;
 
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/admin/dispatch",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taDispatchList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//        IPage<TaDispatch> pg = new Page<>(pageNum, pageSize);
-//        QueryWrapper<TaDispatch> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.orderByDesc("create_date");
-//
-//        IPage<TaDispatch> result = iTaDispatchService.page(pg, queryWrapper);
-//        return ResponseBean.success(result);
-//    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/dispatch",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taDispatchList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
+                                       @ApiParam("农机") @RequestParam(value ="machineryId", required = false) String machineryId,
+                                       @ApiParam(value = "预约开始", example = "2022-03-01") @RequestParam(value ="startDate",required = false) String startDate,
+                                       @ApiParam(value = "预约结束", example = "2022-03-31") @RequestParam(value ="endDate",required = false) String endDate,
+                                       @ApiParam("手机号") @RequestParam(value ="phone",required = false) String phone,
+                                       @ApiParam("状态") @RequestParam(value ="status", required = false) String status) throws Exception{
+
+        SysUser user = currentUser();
+        if (!Constants.ADMIN_ID.equals(user.getUserId()) && !StringUtils.isEmpty(orgId)) {
+            if (!checkOrgAccess(user.getOrgId(), user.getUserId())) {
+                return ResponseBean.error("无权查询机构内容");
+            }
+        }
+
+        IPage<TaDispatch> pg = new Page<>(pageNum, pageSize);
+
+        LocalDateTime start = DateUtils.getDayStart(startDate);
+        LocalDateTime end = DateUtils.getDayEnd(endDate);
+
+        IPage<TaDispatch> result = iTaDispatchService.getPageBy(pg, orgId, machineryId, start, end, phone, status);
+        return ResponseBean.success(result);
+    }
 
     /**
      * 保存对象
@@ -115,6 +131,10 @@ public class TaDispatchController extends BaseController {
             taDispatch.setTypeName(iTdMachineryTypeService.getById(taDispatch.getTypeId()).getName());
         }
 
+        if (!StringUtils.isEmpty(taDispatch.getWorkerId())) {
+            taDispatch.setWorkerName(iSysUserService.getById(taDispatch.getWorkerId()).getUserName());
+        }
+
         taDispatch.setStatus(Constants.STATUS_NORMAL);
 
 

src/main/java/com/yunzhi/nanyang/controller/TaMachineryController.java

@@ -8,8 +8,10 @@ import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.service.ITaOrderService;
 import com.yunzhi.nanyang.vo.MachineSummary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,8 @@ import com.yunzhi.nanyang.service.ITaMachineryService;
 import com.yunzhi.nanyang.entity.TaMachinery;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 农机表 前端控制器
@@ -49,6 +53,9 @@ public class TaMachineryController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
 
     /**
      * 分页查询列表
@@ -62,7 +69,8 @@ public class TaMachineryController extends BaseController {
                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                         @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
                                         @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
-                                        @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId) throws Exception{
+                                        @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId,
+                                        @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
         SysUser sysUser = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
 
@@ -79,6 +87,7 @@ public class TaMachineryController extends BaseController {
         queryWrapper.in(!isAdmin, "org_id", getAccessOrgs(sysUser.getUserId()));
         queryWrapper.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(null != status, "status", status);
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaMachinery> result = iTaMachineryService.page(pg, queryWrapper);
@@ -232,4 +241,18 @@ public class TaMachineryController extends BaseController {
                                          @ApiParam("是否查询附件") @RequestParam(value ="attached", defaultValue = "false") Boolean attached) throws Exception{
         return ResponseBean.success(iTaMachineryService.getSummaryDetail(id, location, attached));
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/machinery/{id}/duty",method= RequestMethod.GET)
+    @ApiOperation(value="校验车辆预约期状态", notes = "校验车辆预约期状态", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryDuty(@ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam(value = "预约时间", example = "2022-03-30") @RequestParam(value ="date") String date) throws Exception{
+
+        List<TaOrder> taOrderList = iTaOrderService.checkMachineryDuty(id, date);
+
+        return ResponseBean.success(taOrderList);
+    }
 }

src/main/java/com/yunzhi/nanyang/controller/TaOrderController.java

@@ -62,13 +62,12 @@ public class TaOrderController extends BaseController {
     @RequestMapping(value="/admin/order",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                @ApiParam("是否未调度") @RequestParam(value = "isNotDispatched", defaultValue = "false") Boolean isNotDispatched) throws Exception{
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
         SysUser current = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(current.getUserId());
         IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaOrder> result = iTaOrderService.getAdminPage(pg, isNotDispatched, isAdmin ? null : current);
+        IPage<TaOrder> result = iTaOrderService.getAdminPage(pg, isAdmin ? null : current);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/nanyang/controller/TaWorkJobController.java

@@ -8,9 +8,7 @@ import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.*;
-import com.yunzhi.nanyang.service.ITaDispatchService;
-import com.yunzhi.nanyang.service.ITaOrderService;
-import com.yunzhi.nanyang.service.ITaOrgService;
+import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.nanyang.service.ITaWorkJobService;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -55,6 +52,9 @@ public class TaWorkJobController extends BaseController {
     @Autowired
     public ITaOrgService iTaOrgService;
 
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -109,9 +109,12 @@ public class TaWorkJobController extends BaseController {
 
         int status = mode ? Constants.WORK_DOING : Constants.WORK_PAUSE;
 
-        // 暂停 不影响订单状态
         taWorkJob.setStatus(status);
 
+        // 联动状态
+        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DOING);
+        iTaMachineryService.updateStatus(taWorkJob.getMachineryId(), "job_status", Constants.WORK_DOING);
+
         if (iTaWorkJobService.updateById(taWorkJob)){
             return ResponseBean.success(taWorkJob);
         }else {
@@ -142,13 +145,16 @@ public class TaWorkJobController extends BaseController {
             return ResponseBean.error("无权操作");
         }
 
-        if (Constants.WORK_PAUSE != taWorkJob.getStatus() || Constants.WORK_DOING != taWorkJob.getStatus()) {
+        if (Constants.WORK_PAUSE != taWorkJob.getStatus() && Constants.WORK_DOING != taWorkJob.getStatus()) {
             return ResponseBean.error("非工作状态, 不能操作");
         }
 
-        // 暂停 不影响订单状态
         origin.setStatus(Constants.WORK_DONE);
         origin.setArea(taWorkJob.getArea());
+        origin.setEndDate(LocalDateTime.now());
+
+        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DONE);
+        iTaMachineryService.updateStatus(taWorkJob.getMachineryId(), "job_status", Constants.WORK_DONE);
 
         if (iTaWorkJobService.updateById(origin)){
             return ResponseBean.success(origin);
@@ -163,13 +169,13 @@ public class TaWorkJobController extends BaseController {
      */
     @RequestMapping(value="/{client}/{clientId}/work-job/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taWorkJobGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taWorkJobGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaPerson taPerson = currentPerson();
         if (StringUtils.isEmpty(taPerson.getUserId())) {
             return ResponseBean.error("无权操作");
         }
 
-        TaWorkJob taWorkJob = iTaWorkJobService.getExistBy("job_id", id, false, true);
+        TaWorkJob taWorkJob = iTaWorkJobService.getDetailBy(id);
 
         return ResponseBean.success(taWorkJob);
     }

src/main/java/com/yunzhi/nanyang/entity/TaOrder.java

@@ -106,5 +106,15 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "下单时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "调度ID")
+    private String dispatchId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机手ID")
+    private String workId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机手名称")
+    private String workName;
 }

src/main/java/com/yunzhi/nanyang/entity/TaWorkJob.java

@@ -85,6 +85,10 @@ public class TaWorkJob implements Serializable {
     @ApiModelProperty(value = "下单人手机号")
     private String phone;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "费用")
     private Integer charges;

src/main/java/com/yunzhi/nanyang/mapper/TaDispatchMapper.java

@@ -1,8 +1,12 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -15,4 +19,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaDispatchMapper extends BaseMapper<TaDispatch> {
 
+    IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg,
+                                @Param("orgId") String orgId,
+                                @Param("machineryId") String machineryId,
+                                @Param("start") LocalDateTime start,
+                                @Param("end") LocalDateTime end,
+                                @Param("phone") String phone,
+                                @Param("status") String status);
 }

src/main/java/com/yunzhi/nanyang/mapper/TaOrderMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单表 Mapper 接口
@@ -21,7 +23,7 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
     @Select("SELECT fn_nextval(#{name})")
     int getNextOrderNO(@Param("name") String name);
 
-    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, @Param("isNotDispatched") Boolean isNotDispatched, String userId);
+    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, @Param("userId") String userId);
 
     IPage<TaOrder> getClientPage(IPage<TaOrder> pg,
                                  @Param("personId") String personId,
@@ -31,4 +33,6 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
                                       @Param("userId") String userId,
                                       @Param("workStatus") Integer workStatus,
                                       @Param("q") String q);
+
+    List<TaOrder> checkMachineryDuty(@Param("machineryId") String machineryId,@Param("appointmentDate") String appointmentDate);
 }

src/main/java/com/yunzhi/nanyang/mapper/TaWorkJobMapper.java

@@ -18,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaWorkJobMapper extends BaseMapper<TaWorkJob> {
 
     IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, @Param("userId") String userId);
+
+    TaWorkJob getDetailBy(@Param("id") String id);
 }

src/main/java/com/yunzhi/nanyang/service/ITaDispatchService.java

@@ -1,8 +1,11 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 调度表 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaDispatchService extends IBaseService<TaDispatch> {
 
+    IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg, String orgId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status);
 }

src/main/java/com/yunzhi/nanyang/service/ITaMachineryService.java

@@ -27,4 +27,6 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
     IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q);
 
     MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached);
+
+    boolean updateStatus(String machineryId, String statusColumn, int statusValue);
 }

src/main/java/com/yunzhi/nanyang/service/ITaOrderService.java

@@ -5,6 +5,8 @@ import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaPerson;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单表 服务类
@@ -17,9 +19,11 @@ public interface ITaOrderService extends IBaseService<TaOrder> {
 
     String getNextOrderNO();
 
-    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, Boolean isNotDispatched, SysUser sysUser);
+    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser);
 
     IPage<TaOrder> getClientPage(IPage<TaOrder> pg, TaPerson taPerson, SysUser sysUser, Integer workStatus, String q);
 
     boolean updateStatus(String orderId, String statusColumn, int statusValue);
+
+    List<TaOrder> checkMachineryDuty(String machineryId, String appointmentDate);
 }

src/main/java/com/yunzhi/nanyang/service/ITaWorkJobService.java

@@ -19,4 +19,6 @@ public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
     TaWorkJob createByDispatch(TaDispatch taDispatch, TaOrder taOrder) throws Exception;
 
     IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, String userId);
+
+    TaWorkJob getDetailBy(String id);
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaDispatchServiceImpl.java

@@ -1,11 +1,14 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.yunzhi.nanyang.mapper.TaDispatchMapper;
 import com.yunzhi.nanyang.service.ITaDispatchService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 调度表 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
 
+    @Override
+    public IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg, String orgId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status) {
+        return baseMapper.getPageBy(pg, orgId, machineryId, start, end, phone, status);
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaMachineryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.StringUtils;
@@ -124,6 +125,15 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
         return summaryDetail;
     }
 
+    @Override
+    public boolean updateStatus(String machineryId, String statusColumn, int statusValue) {
+        UpdateWrapper<TaMachinery> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set(statusColumn, statusValue);
+        updateWrapper.eq("machinery_id", machineryId);
+
+        return update(updateWrapper);
+    }
+
     private void saveImages(TaMachinery taMachinery) {
         String machineryId = taMachinery.getMachineryId();
         // 先删除所有

src/main/java/com/yunzhi/nanyang/service/impl/TaOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.yunzhi.nanyang.service.ITaOrderService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -34,8 +35,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     }
 
     @Override
-    public IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, Boolean isNotDispatched, SysUser sysUser) {
-        return baseMapper.getAdminPage(pg, isNotDispatched, null == sysUser ? null : sysUser.getUserId());
+    public IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser) {
+
+        return baseMapper.getAdminPage(pg, null == sysUser ? null : sysUser.getUserId());
     }
 
     @Override
@@ -58,4 +60,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
 
         return update(updateWrapper);
     }
+
+    @Override
+    public List<TaOrder> checkMachineryDuty(String machineryId, String appointmentDate) {
+        return baseMapper.checkMachineryDuty(machineryId, appointmentDate);
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaWorkJobServiceImpl.java

@@ -50,4 +50,9 @@ public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWor
     public IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, String userId) {
         return baseMapper.getPageBy(pg, userId);
     }
+
+    @Override
+    public TaWorkJob getDetailBy(String id) {
+        return baseMapper.getDetailBy(id);
+    }
 }

src/main/resources/mapper/TaDispatchMapper.xml

@@ -2,4 +2,54 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaDispatchMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaOrder">
+        SELECT
+            t.order_id,
+            t.org_id,
+            n.`name` as org_name,
+            t.person_id,
+            t.appointment_date,
+            t.amount,
+            t.charges,
+            t.create_date,
+            t.dispatch_status,
+            m.nick_name as person_name,
+            m.phone,
+            s.dispatch_id,
+            s.machinery_id,
+            s.machinery_name,
+            s.type_id,
+            s.type_name,
+            s.worker_id,
+            s.worker_name
+        FROM
+            ta_order t
+            LEFT JOIN ta_dispatch s ON t.order_id = s.order_id AND s.`status` &gt; -1
+            INNER JOIN ta_person m ON t.person_id = m.person_id
+            INNER JOIN ta_org n ON t.org_id = n.org_id
+        WHERE
+            t.pay_status = 1
+            AND t.work_status &lt; 3
+          <if test="orgId != null and orgId != ''">
+            AND t.org_id = #{orgId}
+          </if>
+        <if test="status != null">
+            AND t.dispatch_status = #{status}
+        </if>
+        <if test="start != null">
+            AND t.appointment_date &gt;= #{start}
+        </if>
+        <if test="end != null">
+            AND t.appointment_date &lt;= #{end}
+        </if>
+        <if test="machineryId != null and machineryId != ''">
+            AND m.machinery_id = #{machineryId}
+        </if>
+        <if test="machineryId != null and phone != ''">
+            AND m.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
+        ORDER BY
+            t.dispatch_status ASC,
+            t.create_date desc
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderMapper.xml

@@ -15,10 +15,6 @@
             INNER JOIN ta_org m ON m.org_id = t.org_id
         WHERE
             t.`status` = 1
-          <if test="isNotDispatched">
-              AND t.pay_status = 1
-              AND t.dispatch_status = 0
-          </if>
         ORDER BY
             t.create_date DESC
     </select>
@@ -74,4 +70,16 @@
             t.work_status ASC,
             t.create_date DESC
     </select>
+    <select id="checkMachineryDuty" resultType="com.yunzhi.nanyang.entity.TaOrder">
+        SELECT
+            *
+        FROM
+            ta_order t
+                INNER JOIN ta_dispatch s ON s.order_id = t.order_id
+        WHERE
+            t.`status` &gt; -1
+          AND t.dispatch_status = 1
+          AND s.machinery_id = #{machineryId}
+          AND TO_DAYS( t.appointment_date ) = TO_DAYS( #{appointmentDate} )
+    </select>
 </mapper>

src/main/resources/mapper/TaWorkJobMapper.xml

@@ -2,21 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaWorkJobMapper">
 
-    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaWorkJob">
+    <sql id="getSummaryOfWork">
         SELECT
             t.*,
-            s.person_id,
-            s.appointment_date,
-            m.phone,
-            s.create_date as order_date,
-            s.charges,
-            m.nick_name as person_name,
-            s.machinery_name
+            n.person_id,
+            n.nick_name AS person_name,
+            n.phone,
+            s.machinery_name,
+            m.appointment_date,
+            m.create_date AS order_date,
+            m.address,
+            m.charges
         FROM
             ta_work_job t
-                INNER JOIN ta_order s ON t.order_id = s.order_id
-                INNER JOIN ta_person m on m.person_id = s.person_id
-                AND s.`status` = 1
+                INNER JOIN ta_dispatch s ON s.dispatch_id = t.dispatch_id
+                INNER JOIN ta_order m ON m.order_id = t.order_id AND m.`status` = 1
+                INNER JOIN ta_person n ON n.person_id = m.person_id
+    </sql>
+
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaWorkJob">
+        <include refid="getSummaryOfWork"></include>
         WHERE
             t.`status` &gt; -1
           <if test="userId != null and userId != ''">
@@ -26,4 +31,9 @@
             t.`status` ASC,
             t.create_date DESC
     </select>
+    <select id="getDetailBy" resultType="com.yunzhi.nanyang.entity.TaWorkJob">
+        <include refid="getSummaryOfWork"></include>
+        WHERE
+            t.job_id = #{id}
+    </select>
 </mapper>