feats

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

@@ -20,6 +20,14 @@ public class Constants {
     public final static int PAY_PAID = 1;  // 已支付
     public final static int PAY_REFUND = -1;  // 已退款
 
+    // 是否调度
+    public final static int DISPATCH_READY = 0; // 待调度
+    public final static int DISPATCH_DONE = 1; // 已调度
+
     // 工作状态
     public final static int WORK_READY = 0;   // 预备中
+    public final static int WORK_DOING = 1;   // 工作中
+    public final static int WORK_PAUSE = 2;   // 暂停
+    public final static int WORK_DONE = 3;   // 已完成
+
 }

src/main/java/com/yunzhi/nanyang/config/CorsConfig.java

@@ -8,19 +8,19 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 public class CorsConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        //添加映射路径
-        registry.addMapping("/**")
-                //是否发送Cookie
-                .allowCredentials(true)
-                //设置放行哪些原始域
-                .allowedOrigins("*")
-                //放行哪些请求方式
-                .allowedMethods("GET", "POST", "PUT", "DELETE")
-                //.allowedMethods("*") //或者放行全部
-                //放行哪些原始请求头部信息
-                .allowedHeaders("*")
-                //暴露哪些原始请求头部信息
-                .exposedHeaders("X-Authorization-JWT");
+//        //添加映射路径
+//        registry.addMapping("/**")
+//                //是否发送Cookie
+//                .allowCredentials(true)
+//                //设置放行哪些原始域
+//                .allowedOrigins("*")
+//                //放行哪些请求方式
+//                .allowedMethods("GET", "POST", "PUT", "DELETE")
+//                //.allowedMethods("*") //或者放行全部
+//                //放行哪些原始请求头部信息
+//                .allowedHeaders("*")
+//                //暴露哪些原始请求头部信息
+//                .exposedHeaders("X-Authorization-JWT");
     }
 }
 

src/main/java/com/yunzhi/nanyang/config/DateConverterConfig.java

@@ -0,0 +1,30 @@
+package com.yunzhi.nanyang.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 处理 ResquestParam 中的日期格式
+ */
+
+@Configuration
+public class DateConverterConfig {
+    @Bean
+    public Converter<String, LocalDateTime> localDateTimeConverter() {
+        return new Converter<String, LocalDateTime>() {
+            @Override
+            public LocalDateTime convert(String source) {
+                if ("".equals(source)) {
+                    return null;
+                }
+
+                String dt = source + "+0800";
+                return LocalDateTime.parse(dt, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+            }
+        };
+    }
+}

src/main/java/com/yunzhi/nanyang/config/JacksonConfig.java

@@ -0,0 +1,71 @@
+package com.yunzhi.nanyang.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimeZone;
+
+/**
+ * 处理 RequestBody 中的日期
+ */
+
+@Configuration
+public class JacksonConfig {
+
+    /** 默认日期时间格式 */
+    public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    /** 默认日期格式 */
+    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    /** 默认时间格式 */
+    public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+
+    @Bean
+    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        // 忽略json字符串中不识别的属性
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        // 忽略无法转换的对象
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        // PrettyPrinter 格式化输出
+        objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+        // NULL不参与序列化
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+        // 指定时区
+        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
+        // 日期类型字符串处理
+        objectMapper.setDateFormat(new SimpleDateFormat(DEFAULT_DATE_TIME_FORMAT));
+
+        // java8日期日期处理
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+        javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(javaTimeModule);
+
+        converter.setObjectMapper(objectMapper);
+        return converter;
+    }
+}

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

@@ -4,10 +4,17 @@ 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.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaWorkJob;
+import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +23,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.ITaDispatchService;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,39 +42,90 @@ public class TaDispatchController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaDispatchController.class);
 
+    @Autowired
+    ITaOrgService iTaOrgService;
+
     @Autowired
     public ITaDispatchService iTaDispatchService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taDispatch",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{
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
 
-		    IPage<TaDispatch> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaDispatch> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+    @Autowired
+    public ITdMachineryTypeService iTdMachineryTypeService;
+
+    @Autowired
+    public ITaWorkJobService iTaWorkJobService;
 
-            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) 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 taDispatch 实体对象
      * @return
      */
-    @RequestMapping(value="/taDispatch",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/dispatch",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("orderjob:add")
     public ResponseBean taDispatchAdd(@ApiParam("保存内容") @RequestBody TaDispatch taDispatch) throws Exception{
+        SysUser user = currentUser();
+
+        taDispatch.setDispatchId(null);
+
+        if (StringUtils.isEmpty(taDispatch.getOrderId()) || StringUtils.isEmpty(taDispatch.getOrderId())) {
+            return ResponseBean.error("订单或者接单机构为空");
+        }
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", taDispatch.getOrderId(), false, true);
+        if (null == taOrder) {
+            return ResponseBean.error("验证订单信息异常");
+        }
+
+        if (!checkOrgAccess(taDispatch.getOrgId(), user.getUserId())) {
+            return ResponseBean.error("无操作权限");
+        }
+
+        taDispatch.setOrgName(iTaOrgService.getById(taDispatch.getOrgId()).getName());
+
+        if (!StringUtils.isEmpty(taDispatch.getMachineryId())) {
+            taDispatch.setMachineryName(iTaMachineryService.getById(taDispatch.getMachineryId()).getName());
+        }
+
+        if (!StringUtils.isEmpty(taDispatch.getTypeId())) {
+            taDispatch.setTypeName(iTdMachineryTypeService.getById(taDispatch.getTypeId()).getName());
+        }
+
+        taDispatch.setStatus(Constants.STATUS_NORMAL);
+
 
         if (iTaDispatchService.save(taDispatch)){
+
+            // 生成作业信息
+            iTaWorkJobService.createByDispatch(taDispatch, taOrder);
+
+            // 更新订单状态
+            iTaOrderService.updateStatus(taDispatch.getOrderId(), "dispatch_status", Constants.DISPATCH_DONE);
+
             return ResponseBean.success(taDispatch);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -79,41 +136,74 @@ public class TaDispatchController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taDispatch/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/dispatch/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taDispatchDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaDispatchService.removeById(id)){
+    @RequiresPermissions("orderjob:delete")
+    public ResponseBean taDispatchDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaDispatch taDispatch = iTaDispatchService.getById(id);
+
+        SysUser user = currentUser();
+
+        if (!checkOrgAccess(taDispatch.getOrgId(), user.getUserId())) {
+            return ResponseBean.error("无操作权限");
+        }
+
+        TaWorkJob taWorkJob = iTaWorkJobService.getExistBy("dispatch_id", id, false, true);
+        if (null == taWorkJob) {
+            return ResponseBean.error("校验作业信息失败");
+        }
+
+//        if (Constants.WORK_READY != taWorkJob.getStatus()) {
+//            return ResponseBean.error("作业已开始，不能删除");
+//        }
+
+        // 先清除原来的作业信息
+        iTaWorkJobService.removeLogicById(taWorkJob.getJobId());
+
+        if(iTaDispatchService.removeLogicById(id)){
+            // 更新订单状态
+            iTaOrderService.updateStatus(taDispatch.getOrderId(), "dispatch_status", Constants.DISPATCH_READY);
             return ResponseBean.success("success");
-        }else {
+        } else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taDispatch 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taDispatch/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taDispatchUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaDispatch taDispatch) throws Exception{
+//
+//        if (iTaDispatchService.updateById(taDispatch)){
+//            return ResponseBean.success(iTaDispatchService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     /**
-     * 修改对象
+     * 根据id查询对象
      * @param id  实体ID
-     * @param taDispatch 实体对象
-     * @return
      */
-    @RequestMapping(value="/taDispatch/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taDispatchUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaDispatch taDispatch) throws Exception{
-
-        if (iTaDispatchService.updateById(taDispatch)){
-            return ResponseBean.success(iTaDispatchService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+    @RequestMapping(value="/admin/dispatch/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="调度详情", notes = "调度详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("调度ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaDispatchService.getExistBy("dispatch_id", id, false, true));
     }
 
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taDispatch/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taDispatchGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaDispatchService.getById(id));
+    @RequestMapping(value="/admin/order/{orderId}/dispatch",method= RequestMethod.GET)
+    @ApiOperation(value="调度详情", notes = "调度详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taDispatchGet(@ApiParam("订单ID") @PathVariable String orderId) throws Exception{
+        return ResponseBean.success(iTaDispatchService.getExistBy("order_id", orderId, false, true));
     }
 }

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

@@ -4,7 +4,13 @@ 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.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.service.ITaPersonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,81 +45,122 @@ public class TaEvaluationController extends BaseController {
     @Autowired
     public ITaEvaluationService iTaEvaluationService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taEvaluation",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taEvaluationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    @Autowired
+    public ITaPersonService iTaPersonService;
 
-		    IPage<TaEvaluation> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaEvaluation> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaEvaluation> result = iTaEvaluationService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taEvaluation",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taEvaluationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaEvaluation> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaEvaluation> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaEvaluation> result = iTaEvaluationService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
 
     /**
      * 保存对象
      * @param taEvaluation 实体对象
      * @return
      */
-    @RequestMapping(value="/taEvaluation",method= RequestMethod.POST)
+    @RequestMapping(value="/{client}/{clientId}/evaluation",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taEvaluationAdd(@ApiParam("保存内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
+    public ResponseBean taEvaluationAdd(@ApiParam("客户端") @PathVariable String client,
+                                        @ApiParam("客户端ID") @PathVariable String clientId,
+                                        @ApiParam("保存内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
+
+        if (StringUtils.isEmpty(taEvaluation.getOrderId())) {
+            return ResponseBean.error("订单ID为空");
+        }
+
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", taEvaluation.getOrderId(), false, true);
+        if (taOrder == null) {
+            return ResponseBean.error("找不到订单");
+        }
+
+        String personId = currentPerson().getPersonId();
+        if (!taOrder.getPersonId().equals(personId)) {
+            return ResponseBean.error("非法操作");
+        }
+
+        if (Constants.PAY_PAID != taOrder.getPayStatus() || Constants.WORK_DONE != taOrder.getWorkStatus()) {
+            return ResponseBean.error("订单未支付或者未完成");
+        }
+
+        taEvaluation.setPersonId(personId);
 
         if (iTaEvaluationService.save(taEvaluation)){
+
+            iTaOrderService.updateStatus(taOrder.getOrderId(), "is_evaluated", 1);
+
             return ResponseBean.success(taEvaluation);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taEvaluation/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taEvaluationDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaEvaluationService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taEvaluation 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taEvaluation/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taEvaluationUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
+//
+//        if (iTaEvaluationService.updateById(taEvaluation)){
+//            return ResponseBean.success(iTaEvaluationService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
     /**
-     * 根据id删除对象
+     * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taEvaluation/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taEvaluationDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaEvaluationService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/admin/order/{orderId}/evaluation",method= RequestMethod.GET)
+    @ApiOperation(value="依据订单查询", notes = "依据订单查询", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taEvaluationGet(@ApiParam("订单ID") @PathVariable String orderId) throws Exception{
+        TaEvaluation taEvaluation  = iTaEvaluationService.getExistBy("order_id", orderId, false, false);
+        if (null == taEvaluation) {
+            return ResponseBean.error("未找到评价内容");
         }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taEvaluation 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taEvaluation/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taEvaluationUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
 
-        if (iTaEvaluationService.updateById(taEvaluation)){
-            return ResponseBean.success(iTaEvaluationService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        TaPerson taPerson = iTaPersonService.getById(taEvaluation.getPersonId());
+        if (taPerson != null) {
+            taEvaluation.setPersonName(taPerson.getNickName());
         }
-    }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taEvaluation/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taEvaluationGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaEvaluationService.getById(id));
+        return ResponseBean.success(taEvaluation);
     }
 }

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

@@ -99,12 +99,13 @@ public class TaMachineryController extends BaseController {
                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam("当前位置") @RequestParam(value ="location") String location,
-                                       @ApiParam("分类") @RequestParam(value = "typeId", required = false) String typeId) throws Exception{
+                                       @ApiParam("分类") @RequestParam(value = "typeId", required = false) String typeId,
+                                       @ApiParam("搜索关键词") @RequestParam(value = "q", required = false) String q) throws Exception{
 
         String orgId = null;
         TaPerson current = currentPerson();
         if (Constants.CLIENT_WORKER.equals(clientId)) {
-            // 农机手查询机器列表, 只能查询自己绑定的机器
+            // 农机手查询机器列表, 只能查询自己机构的机器
             if (StringUtils.isEmpty(current.getUserId())) {
                 return ResponseBean.error("未找到绑定农机手信息");
             }
@@ -116,10 +117,9 @@ public class TaMachineryController extends BaseController {
             orgId = user.getOrgId();
         }
 
-
         IPage<MachineSummary> pg = new Page<>(pageNum, pageSize);
 
-        IPage<MachineSummary> result = iTaMachineryService.getSummaryList(pg, location, typeId, orgId);
+        IPage<MachineSummary> result = iTaMachineryService.getSummaryList(pg, location, typeId, orgId, q);
         return ResponseBean.success(result);
     }
 

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

@@ -82,6 +82,36 @@ public class TaNewsController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/news",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taNewsList(@ApiParam("客户端") @PathVariable String client,
+                                   @ApiParam("客户端ID") @PathVariable String clientId,
+                                   @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("名称") @RequestParam(value ="title", required = false) String title,
+                                   @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId) throws Exception{
+//        SysUser sysUser = currentUser();
+//        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
+
+        IPage<TaNews> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", "%" + title + "%");
+        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
+//        queryWrapper.in(!isAdmin, "org_id", getAccessOrgs(sysUser.getUserId()));
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+
     /**
      * 保存对象
      * @param taNews 实体对象
@@ -141,7 +171,7 @@ public class TaNewsController extends BaseController {
 
         taNews.setTypeName(iTaNewsTypeService.getById(taNews.getTypeId()).getName());
 
-        iTaExtendContentService.editContent(Constants.TARGET_NEWS, id, taNews.getContentList());
+//        iTaExtendContentService.editContent(Constants.TARGET_NEWS, id, taNews.getContentList());
 
         if (iTaNewsService.updateById(taNews)){
             return ResponseBean.success(taNews);
@@ -167,4 +197,24 @@ public class TaNewsController extends BaseController {
 
         return ResponseBean.success(taNews);
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/{clientId}//news/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("客户端") @PathVariable String client,
+                                  @ApiParam("客户端ID") @PathVariable String clientId,
+                                  @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaNews taNews = iTaNewsService.getExistBy("news_id", id, false, true);
+        if (null == taNews) {
+            return ResponseBean.error("内存不存在");
+        }
+
+        List<TaExtendContent> contentList = iTaExtendContentService.listByTarget(Constants.TARGET_NEWS, id);
+        taNews.setContentList(contentList);
+
+        return ResponseBean.success(taNews);
+    }
 }

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

@@ -6,7 +6,9 @@ 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.entity.TaPerson;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.*;
+import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -18,8 +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.ITaOrderService;
-import com.yunzhi.nanyang.entity.TaOrder;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -38,9 +38,39 @@ public class TaOrderController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOrderController.class);
 
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
     @Autowired
     public ITaOrderService iTaOrderService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ISysUserService iSysUserService;
+
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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{
+        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);
+        return ResponseBean.success(result);
+    }
 
     /**
      * 分页查询列表
@@ -50,18 +80,33 @@ public class TaOrderController extends BaseController {
      */
     @RequestMapping(value="/{client}/{clientId}/order",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taOrderList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean isMine) throws Exception{
+    public ResponseBean taOrderList(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("客户端ID") @PathVariable String clientId,
+                                    @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									@ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean isMine,
+                                    @ApiParam("作业状态") @RequestParam(value = "workStatus", required = false) Integer workStatus,
+                                    @ApiParam("关键字") @RequestParam(value = "q", required = false) String q) throws Exception{
         TaPerson taPerson = currentPerson();
 
+        SysUser sysUser = null;
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            String userId = taPerson.getUserId();
+            if (StringUtils.isEmpty(userId)) {
+                return ResponseBean.error("未绑定农机手信息");
+            }
+
+            if (!Constants.ADMIN_ID.equals(userId)) {
+                sysUser = iSysUserService.getExistBy("user_id", userId, false, true);
+                if (null == sysUser) {
+                    return ResponseBean.error("未绑定农机手信息");
+                }
+            }
+        }
+
         IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(isMine, "person_id", taPerson.getPersonId());
-        queryWrapper.eq("status", Constants.STATUS_NORMAL);
-        queryWrapper.orderByDesc("create_date");
 
-        IPage<TaOrder> result = iTaOrderService.page(pg, queryWrapper);
+        IPage<TaOrder> result = iTaOrderService.getClientPage(pg, isMine ? taPerson : null, sysUser, workStatus, q);
         return ResponseBean.success(result);
     }
 
@@ -83,6 +128,18 @@ public class TaOrderController extends BaseController {
         taOrder.setOrderNo(orderNo);
         taOrder.setPersonId(taPerson.getPersonId());
 
+//        TaMachinery taMachinery = iTaMachineryService.getById(taOrder.getMachineryId());
+//        taOrder.setOrgId(taMachinery.getOrgId());
+
+        if (StringUtils.isEmpty(taOrder.getOrgId())) {
+            return ResponseBean.error("未找到接单机构");
+        }
+
+        TaOrg taOrg = iTaOrgService.getById(taOrder.getOrgId());
+        if (null == taOrg) {
+            return ResponseBean.error("未找到接单机构");
+        }
+
         if (iTaOrderService.save(taOrder)){
             return ResponseBean.success(taOrder);
         }else {
@@ -120,6 +177,16 @@ public class TaOrderController extends BaseController {
         }
     }
 
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/order/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(getOrder(id));
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -127,6 +194,25 @@ public class TaOrderController extends BaseController {
     @RequestMapping(value="/{client}/{clientId}/order/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaOrderService.getById(id));
+        return ResponseBean.success(getOrder(id));
+    }
+
+    private TaOrder getOrder(String id) throws Exception {
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", id, false, true);
+        if (null == taOrder) {
+            throw new Exception("订单不存在");
+        }
+
+        TaOrg taOrg = iTaOrgService.getById(taOrder.getOrgId());
+        if (null == taOrg) {
+            throw new Exception("订单机构不存在");
+        }
+
+        taOrder.setOrgName(taOrg.getName());
+
+        TaPerson taPerson = iTaPersonService.getById(taOrder.getPersonId());
+        taOrder.setPersonName(taPerson.getNickName());
+        taOrder.setPhone(taPerson.getPhone());
+        return taOrder;
     }
 }

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

@@ -4,7 +4,13 @@ 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.entity.*;
+import com.yunzhi.nanyang.service.ITaDispatchService;
+import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.service.ITaOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -17,9 +23,10 @@ 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 com.yunzhi.nanyang.entity.TaWorkJob;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 作业表 前端控制器
@@ -39,6 +46,14 @@ public class TaWorkJobController extends BaseController {
     @Autowired
     public ITaWorkJobService iTaWorkJobService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
+    @Autowired
+    public ITaDispatchService iTaDispatchService;
+
+    @Autowired
+    public ITaOrgService iTaOrgService;
 
     /**
      * 分页查询列表
@@ -46,62 +61,97 @@ public class TaWorkJobController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taWorkJob",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/{clientId}/work-job",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taWorkJobList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taWorkJobList(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                      @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("是否我的") @RequestParam(value ="mine", defaultValue = "true") Boolean isMine) throws Exception{
+        TaPerson taPerson = currentPerson();
+        if (isMine && StringUtils.isEmpty(taPerson.getUserId())) {
+            return ResponseBean.error("无权操作");
+        }
 
-		    IPage<TaWorkJob> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaWorkJob> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        String userId = isMine ? taPerson.getUserId() : null;
 
-            IPage<TaWorkJob> result = iTaWorkJobService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaWorkJob> pg = new Page<>(pageNum, pageSize);
+        IPage<TaWorkJob> result = iTaWorkJobService.getPageBy(pg, userId);
+        return ResponseBean.success(result);
     }
 
     /**
-     * 保存对象
+     * 暂停/开启
+     * @param id  实体ID
      * @param taWorkJob 实体对象
      * @return
      */
-    @RequestMapping(value="/taWorkJob",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taWorkJobAdd(@ApiParam("保存内容") @RequestBody TaWorkJob taWorkJob) throws Exception{
+    @RequestMapping(value="/{client}/worker/work-job/{id}/pause",method= RequestMethod.PUT)
+    @ApiOperation(value="暂停/开启", notes = "暂停/开启", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taWorkJobUpdate(@ApiParam("客户端") @PathVariable String client,
+//                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                        @ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("是否暂停") @RequestParam("mode") Boolean mode) throws Exception{
 
-        if (iTaWorkJobService.save(taWorkJob)){
-            return ResponseBean.success(taWorkJob);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        TaPerson taPerson = currentPerson();
+        if (StringUtils.isEmpty(taPerson.getUserId())) {
+            return ResponseBean.error("无权操作");
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taWorkJob/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taWorkJobDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaWorkJobService.removeById(id)){
-            return ResponseBean.success("success");
+        TaWorkJob taWorkJob = iTaWorkJobService.getExistBy("job_id", id, false, true);
+        if (!taPerson.getUserId().equals(taWorkJob.getWorkerId())) {
+            return ResponseBean.error("无权操作");
+        }
+
+        if (Constants.WORK_PAUSE < taWorkJob.getStatus() || Constants.WORK_READY > taWorkJob.getStatus()) {
+            return ResponseBean.error("非工作状态, 不能操作");
+        }
+
+        int status = mode ? Constants.WORK_DOING : Constants.WORK_PAUSE;
+
+        // 暂停 不影响订单状态
+        taWorkJob.setStatus(status);
+
+        if (iTaWorkJobService.updateById(taWorkJob)){
+            return ResponseBean.success(taWorkJob);
         }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
-     * 修改对象
+     * 暂停/开启
      * @param id  实体ID
      * @param taWorkJob 实体对象
      * @return
      */
-    @RequestMapping(value="/taWorkJob/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taWorkJobUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaWorkJob taWorkJob) throws Exception{
+    @RequestMapping(value="/{client}/worker/work-job/{id}/stop",method= RequestMethod.PUT)
+    @ApiOperation(value="完成工作", notes = "完成工作", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean stopJob(@ApiParam("客户端") @PathVariable String client,
+//                              @ApiParam("客户端ID") @PathVariable String clientId,
+                                @ApiParam("对象ID") @PathVariable String id,
+                                @ApiParam("保存内容") @RequestBody TaWorkJob taWorkJob) throws Exception{
 
-        if (iTaWorkJobService.updateById(taWorkJob)){
-            return ResponseBean.success(iTaWorkJobService.getById(id));
+        TaPerson taPerson = currentPerson();
+        if (StringUtils.isEmpty(taPerson.getUserId())) {
+            return ResponseBean.error("无权操作");
+        }
+
+        TaWorkJob origin = iTaWorkJobService.getExistBy("job_id", id, false, true);
+        if (origin == null || !taPerson.getUserId().equals(taWorkJob.getWorkerId())) {
+            return ResponseBean.error("无权操作");
+        }
+
+        if (Constants.WORK_PAUSE != taWorkJob.getStatus() || Constants.WORK_DOING != taWorkJob.getStatus()) {
+            return ResponseBean.error("非工作状态, 不能操作");
+        }
+
+        // 暂停 不影响订单状态
+        origin.setStatus(Constants.WORK_DONE);
+        origin.setArea(taWorkJob.getArea());
+
+        if (iTaWorkJobService.updateById(origin)){
+            return ResponseBean.success(origin);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +161,16 @@ public class TaWorkJobController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taWorkJob/{id}",method= RequestMethod.GET)
+    @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{
-        return ResponseBean.success(iTaWorkJobService.getById(id));
+        TaPerson taPerson = currentPerson();
+        if (StringUtils.isEmpty(taPerson.getUserId())) {
+            return ResponseBean.error("无权操作");
+        }
+
+        TaWorkJob taWorkJob = iTaWorkJobService.getExistBy("job_id", id, false, true);
+
+        return ResponseBean.success(taWorkJob);
     }
 }

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

@@ -27,7 +27,7 @@ public class TaDispatch implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "调度ID")
-    @TableId(value = "dispatch_id", type = IdType.INPUT)
+    @TableId(value = "dispatch_id", type = IdType.UUID)
     private String dispatchId;
 
     @ApiModelProperty(value = "订单ID")
@@ -36,12 +36,27 @@ public class TaDispatch implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
     @ApiModelProperty(value = "农机手")
     private String workerId;
 
+    @ApiModelProperty(value = "农机手名称")
+    private String workerName;
+
     @ApiModelProperty(value = "农机ID")
     private String machineryId;
 
+    @ApiModelProperty(value = "农机名称")
+    private String machineryName;
+
+    @ApiModelProperty(value = "类型ID")
+    private String typeId;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeName;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -2,6 +2,8 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -27,7 +29,7 @@ public class TaEvaluation implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "评价id")
-    @TableId(value = "evaluate_id", type = IdType.INPUT)
+    @TableId(value = "evaluate_id", type = IdType.UUID)
     private String evaluateId;
 
     @ApiModelProperty(value = "订单Id")
@@ -42,6 +44,10 @@ public class TaEvaluation implements Serializable {
     @ApiModelProperty(value = "评价人")
     private String personId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "评价人姓名")
+    private String personName;
+
     @ApiModelProperty(value = "评价时间")
     private LocalDateTime createDate;
 

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

@@ -54,6 +54,9 @@ public class TaMessage implements Serializable {
     @ApiModelProperty(value = "推送结果")
     private String pushResult;
 
+    @ApiModelProperty(value = "关联动作")
+    private String action;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -1,14 +1,21 @@
 package com.yunzhi.nanyang.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -36,6 +43,14 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "下单人Id")
     private String personId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单人名称")
+    private String personName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单人手机号")
+    private String phone;
+
     @ApiModelProperty(value = "费用")
     private Integer charges;
 
@@ -81,6 +96,10 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "接单机构")
     private String orgId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "接单机构名称")
+    private String orgName;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -2,8 +2,12 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +31,7 @@ public class TaWorkJob implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "作业ID")
-    @TableId(value = "job_id", type = IdType.INPUT)
+    @TableId(value = "job_id", type = IdType.UUID)
     private String jobId;
 
     @ApiModelProperty(value = "调度ID")
@@ -69,5 +73,31 @@ public class TaWorkJob implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单人Id")
+    private String personId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单人名称")
+    private String personName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单人手机号")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "费用")
+    private Integer charges;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "预约时间")
+    private LocalDateTime appointmentDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间")
+    private LocalDateTime orderDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机名称")
+    private String machineryName;
 }

src/main/java/com/yunzhi/nanyang/event/WorkExpiredEvent.java

@@ -0,0 +1,15 @@
+package com.yunzhi.nanyang.event;
+
+import com.yunzhi.nanyang.entity.TaDispatch;
+import org.springframework.context.ApplicationEvent;
+
+public class WorkExpiredEvent extends ApplicationEvent {
+    private TaDispatch taDispatch;
+
+    public WorkExpiredEvent(Object source, TaDispatch taDispatch) {
+        super(source);
+        this.taDispatch = taDispatch;
+    }
+
+    public TaDispatch getTaDispatch() { return taDispatch; }
+}

src/main/java/com/yunzhi/nanyang/event/listener/WorkExpiredEventListener.java

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.event.listener;
+
+import com.yunzhi.nanyang.event.WorkExpiredEvent;
+import com.yunzhi.nanyang.service.ITaMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WorkExpiredEventListener implements ApplicationListener<WorkExpiredEvent> {
+    @Autowired
+    ITaMessageService iTaMessageService;
+
+    @Override
+    public void onApplicationEvent(WorkExpiredEvent evt) {
+        iTaMessageService.sendMessage(evt);
+    }
+}

src/main/java/com/yunzhi/nanyang/exception/GlobalExceptionHandler.java

@@ -19,6 +19,12 @@ public class GlobalExceptionHandler {
         if (e instanceof UnauthorizedException) {
             return ResponseBean.error("暂无权限进行当前操作", ResponseBean.ERROR_UNAUTHORIZED);
         }
-        return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+
+        String err = e.getMessage();
+        if (err.contains("java")) {
+            err = "系统内部异常";
+        }
+
+        return ResponseBean.error(err, ResponseBean.ERROR_UNAVAILABLE);
     }
 }

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

@@ -32,5 +32,8 @@ public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
 
     MachineSummary getSummaryDetail(@Param("machineryId") String machineryId, @Param("location") String location);
 
-    IPage<MachineSummary> getOneOfTypes(IPage<MachineSummary> pg, @Param("location") String location, @Param("typeId") String typeId);
+    IPage<MachineSummary> getOneOfTypes(IPage<MachineSummary> pg,
+                                        @Param("location") String location,
+                                        @Param("typeId") String typeId,
+                                        @Param("q") String q);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,4 +20,15 @@ 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> getClientPage(IPage<TaOrder> pg,
+                                 @Param("personId") String personId,
+                                 @Param("q") String q);
+
+    IPage<TaOrder> getOrderDispatched(IPage<TaOrder> pg,
+                                      @Param("userId") String userId,
+                                      @Param("workStatus") Integer workStatus,
+                                      @Param("q") String q);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaWorkJob;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaWorkJobMapper extends BaseMapper<TaWorkJob> {
 
+    IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, @Param("userId") String userId);
 }

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

@@ -24,7 +24,7 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
 
     boolean updateRegionName(String regionId, String regionName);
 
-    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId);
+    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q);
 
     MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached);
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TaMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.event.WorkExpiredEvent;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMessageService extends IBaseService<TaMessage> {
 
+    void sendMessage(WorkExpiredEvent evt);
 }

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

@@ -1,7 +1,9 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.entity.TaPerson;
 
 /**
  * <p>
@@ -14,4 +16,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaOrderService extends IBaseService<TaOrder> {
 
     String getNextOrderNO();
+
+    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, Boolean isNotDispatched, SysUser sysUser);
+
+    IPage<TaOrder> getClientPage(IPage<TaOrder> pg, TaPerson taPerson, SysUser sysUser, Integer workStatus, String q);
+
+    boolean updateStatus(String orderId, String statusColumn, int statusValue);
 }

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

@@ -1,5 +1,8 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.entity.TaDispatch;
+import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
 
+    TaWorkJob createByDispatch(TaDispatch taDispatch, TaOrder taOrder) throws Exception;
+
+    IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, String userId);
 }

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

@@ -96,12 +96,12 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
     }
 
     @Override
-    public IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId) {
+    public IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q) {
 
         // 有没有 orgId 实际上用来区分是否农机手端
         if (StringUtils.isEmpty(orgId)) {
             // 农户端, 实际上过滤的是所有组织下的所有分类的其中一个机器
-            return baseMapper.getOneOfTypes(pg, location, typeId);
+            return baseMapper.getOneOfTypes(pg, location, typeId, q);
         } else {
             // 农机手端
             return baseMapper.getSummaryList(pg, location, typeId, orgId);

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

@@ -1,9 +1,12 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.yunzhi.nanyang.entity.TaDispatch;
 import com.yunzhi.nanyang.entity.TaMessage;
+import com.yunzhi.nanyang.event.WorkExpiredEvent;
 import com.yunzhi.nanyang.mapper.TaMessageMapper;
 import com.yunzhi.nanyang.service.ITaMessageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements ITaMessageService {
 
+    @Async
+    @Override
+    public void sendMessage(WorkExpiredEvent evt) {
+        evt.getTaDispatch();
+    }
 }

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

@@ -1,11 +1,14 @@
 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.DateUtils;
 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.mapper.TaOrderMapper;
 import com.yunzhi.nanyang.service.ITaOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -29,4 +32,30 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         int next = baseMapper.getNextOrderNO(prefix);
         return prefix + StringUtils.lpad(String.valueOf(next), "0", 6);
     }
+
+    @Override
+    public IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, Boolean isNotDispatched, SysUser sysUser) {
+        return baseMapper.getAdminPage(pg, isNotDispatched, null == sysUser ? null : sysUser.getUserId());
+    }
+
+    @Override
+    public IPage<TaOrder> getClientPage(IPage<TaOrder> pg, TaPerson taPerson, SysUser sysUser, Integer workStatus, String q) {
+        String userId = null == sysUser ? null : sysUser.getUserId();
+        String personId = null == taPerson ? null : taPerson.getPersonId();
+
+        if (!StringUtils.isEmpty(userId)) {
+            return baseMapper.getOrderDispatched(pg, userId, workStatus, q);
+        }
+
+        return baseMapper.getClientPage(pg, personId, q);
+    }
+
+    @Override
+    public boolean updateStatus(String orderId, String statusColumn, int statusValue) {
+        UpdateWrapper<TaOrder> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set(statusColumn, statusValue);
+        updateWrapper.eq("order_id", orderId);
+
+        return update(updateWrapper);
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.entity.TaDispatch;
+import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
 import com.yunzhi.nanyang.mapper.TaWorkJobMapper;
 import com.yunzhi.nanyang.service.ITaWorkJobService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 作业表 服务实现类
@@ -17,4 +23,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWorkJob> implements ITaWorkJobService {
 
+    @Override
+    public TaWorkJob createByDispatch(TaDispatch taDispatch, TaOrder taOrder) throws Exception {
+
+        TaWorkJob taWorkJob = new TaWorkJob();
+        LocalDateTime now = LocalDateTime.now();
+        taWorkJob.setJobId(null);
+        taWorkJob.setDispatchId(taDispatch.getDispatchId());
+        taWorkJob.setOrderId(taOrder.getOrderId());
+        taWorkJob.setWorkerId(taDispatch.getWorkerId());
+        taWorkJob.setMachineryId(taDispatch.getMachineryId());
+        taWorkJob.setStartDate(now);
+        taWorkJob.setOrgId(taDispatch.getOrgId());
+        taWorkJob.setStatus(Constants.WORK_READY);
+        taWorkJob.setCreateUser(taDispatch.getWorkerId());
+        taWorkJob.setCreateDate(now);
+
+        if (!save(taWorkJob)) {
+            throw new Exception("生成作业信息异常");
+        }
+
+        return taWorkJob;
+    }
+
+    @Override
+    public IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, String userId) {
+        return baseMapper.getPageBy(pg, userId);
+    }
 }

src/main/java/com/yunzhi/nanyang/task/WorkExpire.java

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.task;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WorkExpire {
+
+    /**
+     * 每天 9 点查询超时订单, 只提醒一次，昨天的
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
+    public void execute() {
+
+    }
+}

src/main/resources/application.yml

@@ -76,6 +76,9 @@ weixin:
 spring:
   application:
     name: demo
+#  jackson:
+#    date-format: yyyy-MM-dd HH:mm:ss
+#    time-zone: GMT+8
   profiles:
     active: @profileActive@
 

src/main/resources/mapper/TaMachineryMapper.xml

@@ -41,13 +41,21 @@
             count( * ) AS num
         FROM
             ta_machinery t
-        INNER JOIN ta_machinery s ON t.org_id = s.org_id
-            AND t.type_id = s.type_id
-        INNER JOIN ta_org m ON m.org_id = t.org_id
+            INNER JOIN ta_machinery s ON t.org_id = s.org_id
+                AND t.type_id = s.type_id
+            INNER JOIN ta_org m ON m.org_id = t.org_id
+            INNER JOIN td_machinery_type n ON n.type_id = t.type_id
         WHERE
-            t.machinery_id < s.machinery_id
+            t.`status` > -1
+            AND t.machinery_id <= s.machinery_id
         <if test="typeId != null and typeId != ''">
             AND t.type_id = #{typeId}
+        </if>
+        <if test="q != null and q != ''">
+            AND (
+                t.`name` LIKE CONCAT('%', #{q}, '%')
+                OR n.`name` LIKE CONCAT('%', #{q}, '%')
+            )
         </if>
          GROUP BY
             t.org_id,

src/main/resources/mapper/TaOrderMapper.xml

@@ -2,4 +2,76 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaOrderMapper">
 
+    <select id="getAdminPage" resultType="com.yunzhi.nanyang.entity.TaOrder">
+        SELECT DISTINCT
+            t.*,
+            m.`name` as org_name
+        FROM
+            ta_order t
+            <if test="userId != null and userId != ''">
+                INNER JOIN sys_user_data_scope s ON t.org_id = s.org_id
+                AND s.user_id = #{userId}
+            </if>
+            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>
+    <select id="getClientPage" resultType="com.yunzhi.nanyang.entity.TaOrder">
+        SELECT DISTINCT
+            t.*,
+            m.`name` as org_name,
+            n.nick_name as person_name,
+            n.phone as phone
+        FROM
+        ta_order t
+            INNER JOIN ta_org m ON m.org_id = t.org_id
+            INNER JOIN ta_person n ON n.person_id = t.person_id
+        WHERE
+            t.`status` = 1
+        <if test="personId != null and personId != ''">
+            AND t.person_id = #{personId}
+        </if>
+        <if test="q != null and q != ''">
+            AND (
+                n.nick_name LIKE CONCAT('%', #{q}, '%')
+                OR n.phone LIKE CONCAT('%', #{q}, '%')
+            )
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+    <select id="getOrderDispatched" resultType="com.yunzhi.nanyang.entity.TaOrder">
+        SELECT DISTINCT
+            t.*,
+            m.`name` as org_name,
+            n.nick_name as person_name,
+            n.phone as phone
+        FROM
+            ta_order t
+        INNER JOIN ta_org m ON m.org_id = t.org_id
+        INNER JOIN ta_person n ON n.person_id = t.person_id
+        INNER JOIN ta_dispatch d ON d.order_id = t.order_id AND d.`status` = 1
+        WHERE
+            t.`status` = 1
+            AND d.worker_id = #{userId}
+        <if test="workStatus != null">
+            AND t.dispatch_status = 1
+            AND t.work_status = #{workStatus}
+        </if>
+        <if test="q != null and q != ''">
+            AND (
+                n.nick_name LIKE CONCAT('%', #{q}, '%')
+                OR n.phone LIKE CONCAT('%', #{q}, '%')
+            )
+        </if>
+        ORDER BY
+            t.work_status ASC,
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaWorkJobMapper.xml

@@ -2,4 +2,28 @@
 <!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">
+        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
+        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
+        WHERE
+            t.`status` &gt; -1
+          <if test="userId != null and userId != ''">
+              AND t.worker_id = #{userId}
+          </if>
+        ORDER BY
+            t.`status` ASC,
+            t.create_date DESC
+    </select>
 </mapper>