开发作业服务相关接口

src/main/java/com/mmc/pms/controller/BackstageTaskServiceController.java

@@ -54,14 +54,14 @@ public class BackstageTaskServiceController extends BaseController {
   @ApiOperation(value = "查询作业服务")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ServiceDTO.class)})
   @GetMapping("queryWorkService")
-  public ResultBody queryWorkService(@ApiParam("作业服务id") @RequestParam(value = "id") Integer id) {
+  public ResultBody<ServiceDTO> queryWorkService(@ApiParam("作业服务id") @RequestParam(value = "id") Integer id) {
     return backstageTaskService.queryById(id);
   }
 
   @ApiOperation(value = "查询服务管理列表")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ServiceDTO.class)})
   @PostMapping("queryServiceManagerList")
-  public ResultBody queryServiceManagerList(
+  public ResultBody<ServiceDTO> queryServiceManagerList(
           @Validated(Page.class) @RequestBody ServiceQO param, HttpServletRequest request) {
     return ResultBody.success(backstageTaskService.queryServiceManagerList(param, this.getUserLoginInfoFromRedis(request).getUserAccountId()));
   }
@@ -69,7 +69,7 @@ public class BackstageTaskServiceController extends BaseController {
   @ApiOperation(value = "条件查询作业服务列表")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WorkServiceDTO.class)})
   @PostMapping("queryWorkServiceList")
-  public ResultBody queryWorkServiceList(@Validated(Page.class) @RequestBody ServiceQO param, HttpServletRequest request) {
+  public ResultBody<WorkServiceDTO> queryWorkServiceList(@Validated(Page.class) @RequestBody ServiceQO param, HttpServletRequest request) {
     return ResultBody.success(backstageTaskService.queryWorkServiceList(param,request));
   }
 }

src/main/java/com/mmc/pms/controller/DirectoryController.java

@@ -47,14 +47,14 @@ public class DirectoryController {
     @ApiOperation(value = "获取应用类型列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CategoriesDTO.class)})
     @PostMapping("getApplicationList")
-    public ResultBody getApplicationList() {
+    public ResultBody<CategoriesDTO> getApplicationList() {
         return categoriesService.getApplicationList(DIRECTORY_NAME_APPLICATION);
     }
 
     @ApiOperation(value = "获取对应行业列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CategoriesDTO.class)})
     @PostMapping("getIndustryList")
-    public ResultBody getIndustryList() {
+    public ResultBody<CategoriesDTO> getIndustryList() {
         return categoriesService.getApplicationList(DIRECTORY_NAME_INDUSTRY);
     }
 }

src/main/java/com/mmc/pms/controller/service/ServiceOrderProvinceCityController.java

+package com.mmc.pms.controller.service;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 服务订单地址 前端控制器
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@RestController
+@RequestMapping("/serviceOrderProvinceCity")
+public class ServiceOrderProvinceCityController {
+
+}
+

src/main/java/com/mmc/pms/controller/service/ServiceOrderStatusInfoController.java

+package com.mmc.pms.controller.service;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 服务订单状态 前端控制器
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@RestController
+@RequestMapping("/serviceOrderStatusInfo")
+public class ServiceOrderStatusInfoController {
+
+}
+

src/main/java/com/mmc/pms/controller/service/ServiceOrderTaskController.java

+package com.mmc.pms.controller.service;
+
+
+import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.controller.BaseController;
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.work.vo.ServiceOrderTaskVO;
+import com.mmc.pms.model.work.vo.ServiceVO;
+import com.mmc.pms.service.ServiceOrderTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Api(tags = {"云享飞服务订单-模块"})
+@RestController
+@RequestMapping("/serviceOrderTask")
+public class ServiceOrderTaskController extends BaseController {
+
+    @Autowired
+    private ServiceOrderTaskService serviceOrderTaskService;
+
+    @ApiOperation(value = "订单任务-新增")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("insertOrderTask")
+    public ResultBody insertOrderTask(
+            @Validated(Create.class) @RequestBody ServiceOrderTaskVO param, HttpServletRequest request) {
+        return serviceOrderTaskService.insertOrderTask(param, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+}
+

src/main/java/com/mmc/pms/controller/service/ServiceOrderTaskImageController.java

+package com.mmc.pms.controller.service;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 服务订单图片 前端控制器
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@RestController
+@RequestMapping("/serviceOrderTaskImage")
+public class ServiceOrderTaskImageController {
+
+}
+

src/main/java/com/mmc/pms/dao/BackstageTaskServiceDao.java

@@ -26,7 +26,7 @@ public interface BackstageTaskServiceDao {
 
   Integer count(ServiceQO param);
 
-  int conditionCount(@Param("param") ServiceQO param, @Param("userIds") List<Integer> userIds);
+  int conditionCount(@Param("param") ServiceQO param, @Param("categoriesIds") List<Integer> categoriesIds, @Param("userIds") List<Integer> userIds);
 
-  List<ServiceDO> queryPageByLimit(@Param("param") ServiceQO param, @Param("userIds") List<Integer> userIds);
+  List<ServiceDO> queryPageByLimit(@Param("param") ServiceQO param,@Param("categoriesIds") List<Integer> categoriesIds, @Param("userIds") List<Integer> userIds);
 }

src/main/java/com/mmc/pms/dao/ServiceOrderProvinceCityDao.java

+package com.mmc.pms.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mmc.pms.entity.ServiceOrderProvinceCityDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 服务订单地址 Mapper 接口
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Mapper
+public interface ServiceOrderProvinceCityDao extends BaseMapper<ServiceOrderProvinceCityDO> {
+
+}

src/main/java/com/mmc/pms/dao/ServiceOrderStatusInfoDao.java

+package com.mmc.pms.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mmc.pms.entity.ServiceOrderStatusInfoDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 服务订单状态 Mapper 接口
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Mapper
+public interface ServiceOrderStatusInfoDao extends BaseMapper<ServiceOrderStatusInfoDO> {
+
+}

src/main/java/com/mmc/pms/dao/ServiceOrderTaskDao.java

+package com.mmc.pms.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mmc.pms.entity.ServiceOrderTaskDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表 Mapper 接口
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Mapper
+public interface ServiceOrderTaskDao extends BaseMapper<ServiceOrderTaskDO> {
+
+}

src/main/java/com/mmc/pms/dao/ServiceOrderTaskImageDao.java

+package com.mmc.pms.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mmc.pms.entity.ServiceOrderTaskImageDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 服务订单图片 Mapper 接口
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Mapper
+public interface ServiceOrderTaskImageDao extends BaseMapper<ServiceOrderTaskImageDO> {
+
+}

src/main/java/com/mmc/pms/entity/ServiceOrderProvinceCityDO.java

+package com.mmc.pms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 服务订单地址
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName(value = "service_order_province_city")
+public class ServiceOrderProvinceCityDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "服务订单id")
+    private Integer serviceOrderTaskId;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal lat;
+}

src/main/java/com/mmc/pms/entity/ServiceOrderStatusInfoDO.java

+package com.mmc.pms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务订单状态
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName(value = "service_order_status_info")
+public class ServiceOrderStatusInfoDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer orderStatus;
+
+    private String doing;
+
+    private String waiting;
+
+    private String userPort;
+
+    private String flyerPort;
+
+    private String managePort;
+}

src/main/java/com/mmc/pms/entity/ServiceOrderTaskDO.java

+package com.mmc.pms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName(value = "service_order_task")
+public class ServiceOrderTaskDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "订单名称")
+    private String orderName;
+
+    @ApiModelProperty(value = "订单总金额")
+    private BigDecimal orderAmt;
+
+    @ApiModelProperty(value = "订单状态：0 待分配运营")
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "客户ID")
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "运营人员ID（负责这个order的运营人员id)")
+    private Integer userOperateId;
+
+    @ApiModelProperty(value = "飞手ID")
+    private Integer flyerId;
+
+    @ApiModelProperty(value = "服务项ID")
+    private Integer inspectionId;
+
+    @ApiModelProperty(value = "服务名称")
+    private String inspectionName;
+
+    @ApiModelProperty(value = "预计服务开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "预计服务结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "实际服务开始时间")
+    private Date acStartTime;
+
+    @ApiModelProperty(value = "实际服务结束时间")
+    private Date acEndTime;
+
+    @ApiModelProperty(value = "任务描述")
+    private String taskDescription;
+
+    @ApiModelProperty(value = "平台备注")
+    private String pfRemark;
+
+    @ApiModelProperty(value = "是否显示：0 隐藏，1 显示")
+    private Integer display;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createdTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updatedTime;
+
+    @ApiModelProperty(value = "逻辑删除;1代表删除，0代表未删除")
+    @TableLogic
+    private Integer isDeleted;
+}

src/main/java/com/mmc/pms/entity/ServiceOrderTaskImageDO.java

+package com.mmc.pms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务订单图片
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName(value = "service_order_task_image")
+public class ServiceOrderTaskImageDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer orderTaskId;
+
+    @ApiModelProperty(value = "图片")
+    private String picture;
+
+
+}

src/main/java/com/mmc/pms/model/qo/ServiceQO.java

@@ -12,6 +12,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Author LW
@@ -32,11 +33,8 @@ public class ServiceQO implements Serializable {
   @Length(message = "最大不超过30字", max = 30)
   private String serviceName;
 
-  @ApiModelProperty(value = "应用", example = "1")
-  private Integer applicationId;
-
-  @ApiModelProperty(value = "行业", example = "2")
-  private Integer industryId;
+  @ApiModelProperty(value = "分类id集合(应用/行业等)")
+  private List<Integer> categoriesId;
 
   @ApiModelProperty(value = "省份编码", example = "440000")
   private Integer provinceCode;

src/main/java/com/mmc/pms/model/work/dto/WorkServiceDTO.java

@@ -3,6 +3,7 @@ package com.mmc.pms.model.work.dto;
 import com.mmc.pms.entity.InspComtDO;
 import com.mmc.pms.model.group.Create;
 import com.mmc.pms.model.group.Update;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/pms/model/work/vo/ServiceOrderTaskVO.java

+package com.mmc.pms.model.work.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mmc.pms.model.group.Create;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ServiceOrderTaskVO implements Serializable {
+
+    private static final long serialVersionUID = -178678654L;
+
+    @ApiModelProperty(value = "服务项ID",example = "1")
+    @NotNull(message = "新增服务-id不能为空", groups = {Create.class})
+    private Integer inspectionId;
+
+    @ApiModelProperty(value = "服务名称")
+    @NotBlank(message = "新增服务-名称不能为空", groups = {Create.class})
+    private String inspectionName;
+
+    @ApiModelProperty(value = "预计服务开始时间")
+    @NotNull(message = "新增服务-预计服务开始时间不能为空", groups = {Create.class})
+    private Date startTime;
+
+    @ApiModelProperty(value = "预计服务结束时间")
+    @NotNull(message = "新增服务-预计服务结束时间不能为空", groups = {Create.class})
+    private Date endTime;
+
+    @ApiModelProperty(value = "省份",example = "广东")
+    @NotBlank(message = "新增服务-省份不能为空", groups = {Create.class})
+    private String province;
+
+    @ApiModelProperty(value = "市",example = "深圳")
+    @NotBlank(message = "新增服务-市不能为空", groups = {Create.class})
+    private String city;
+
+    @ApiModelProperty(value = "详细地址",example = "西丽街道")
+    @NotBlank(message = "新增服务-详细地址不能为空", groups = {Create.class})
+    private String address;
+
+    @ApiModelProperty(value = "经度",example = "117.257370")
+    @NotNull(message = "新增服务-经度不能为空", groups = {Create.class})
+    private BigDecimal lon;
+
+    @ApiModelProperty(value = "纬度",example = "32.050774")
+    @NotNull(message = "新增服务-纬度不能为空", groups = {Create.class})
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "任务描述")
+    private String taskDescription;
+
+    @ApiModelProperty(value = "图片")
+    private List<String> images;
+}

src/main/java/com/mmc/pms/service/Impl/BackstageTaskServiceImpl.java

@@ -144,17 +144,18 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
     Integer provinceCode = param.getProvinceCode();
     if(provinceCode!=null){
       userIds = userAppApi.feignListUserAccountIds(provinceCode, null, null, null);
-      if(CollectionUtils.isEmpty(userIds)){
-        log.warn("根据地区信息查询用户id为空");
+      if(userIds==null || userIds.size()==0){
+        userIds = Arrays.asList(-1);
       }
     }
-    int count = backstageTaskServiceDao.conditionCount(param,userIds);
+    List<Integer> categoriesIds = param.getCategoriesId();
+    int count = backstageTaskServiceDao.conditionCount(param,categoriesIds,userIds);
     if (count == 0) {
       return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
     }
     Integer pageNo = param.getPageNo();
     param.buildCurrentPage();
-    List<ServiceDO> pageList = backstageTaskServiceDao.queryPageByLimit(param,userIds);
+    List<ServiceDO> pageList = backstageTaskServiceDao.queryPageByLimit(param,categoriesIds,userIds);
 
     // 用户暂时无关联公司数据，先用假数据展示
     String companyName = "浙江科比特创新科技有限公司";

src/main/java/com/mmc/pms/service/Impl/ServiceOrderProvinceCityServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mmc.pms.dao.ServiceOrderProvinceCityDao;
+import com.mmc.pms.entity.ServiceOrderProvinceCityDO;
+import com.mmc.pms.service.ServiceOrderProvinceCityService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务订单地址 服务实现类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Service
+public class ServiceOrderProvinceCityServiceImpl extends ServiceImpl<ServiceOrderProvinceCityDao, ServiceOrderProvinceCityDO> implements ServiceOrderProvinceCityService {
+
+}

src/main/java/com/mmc/pms/service/Impl/ServiceOrderStatusInfoServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mmc.pms.dao.ServiceOrderStatusInfoDao;
+import com.mmc.pms.entity.ServiceOrderStatusInfoDO;
+import com.mmc.pms.service.ServiceOrderStatusInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务订单状态 服务实现类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Service
+public class ServiceOrderStatusInfoServiceImpl extends ServiceImpl<ServiceOrderStatusInfoDao, ServiceOrderStatusInfoDO> implements ServiceOrderStatusInfoService {
+
+}

src/main/java/com/mmc/pms/service/Impl/ServiceOrderTaskImageServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mmc.pms.dao.ServiceOrderTaskImageDao;
+import com.mmc.pms.entity.ServiceOrderTaskImageDO;
+import com.mmc.pms.service.ServiceOrderTaskImageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务订单图片 服务实现类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Service
+public class ServiceOrderTaskImageServiceImpl extends ServiceImpl<ServiceOrderTaskImageDao, ServiceOrderTaskImageDO> implements ServiceOrderTaskImageService {
+
+}

src/main/java/com/mmc/pms/service/Impl/ServiceOrderTaskServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.dao.ServiceOrderProvinceCityDao;
+import com.mmc.pms.dao.ServiceOrderTaskDao;
+import com.mmc.pms.dao.ServiceOrderTaskImageDao;
+import com.mmc.pms.entity.ServiceOrderProvinceCityDO;
+import com.mmc.pms.entity.ServiceOrderTaskDO;
+import com.mmc.pms.entity.ServiceOrderTaskImageDO;
+import com.mmc.pms.model.work.vo.ServiceOrderTaskVO;
+import com.mmc.pms.service.ServiceOrderTaskService;
+import com.mmc.pms.util.CodeUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表 服务实现类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+@Service
+public class ServiceOrderTaskServiceImpl extends ServiceImpl<ServiceOrderTaskDao, ServiceOrderTaskDO> implements ServiceOrderTaskService {
+
+    @Autowired private ServiceOrderTaskDao serviceOrderTaskDao;
+
+    @Autowired private ServiceOrderProvinceCityDao serviceOrderProvinceCityDao;
+
+    @Autowired private ServiceOrderTaskImageDao serviceOrderTaskImageDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBody insertOrderTask(ServiceOrderTaskVO param, Integer userAccountId) {
+        // 保存作业服务订单
+        ServiceOrderTaskDO orderTaskDO = ServiceOrderTaskDO.builder().orderNo(CodeUtil.createOrderTaskNO()).orderName(param.getInspectionName())
+                .inspectionId(param.getInspectionId()).inspectionName(param.getInspectionName()).taskDescription(param.getTaskDescription())
+                .startTime(param.getStartTime()).endTime(param.getEndTime()).userAccountId(userAccountId).build();
+        serviceOrderTaskDao.insert(orderTaskDO);
+
+        // 保存作业服务地址信息
+        ServiceOrderProvinceCityDO provinceCityDO = ServiceOrderProvinceCityDO.builder().serviceOrderTaskId(orderTaskDO.getId()).province(param.getProvince()).city(param.getCity())
+                .address(param.getAddress()).lat(param.getLat()).lon(param.getLon()).build();
+        serviceOrderProvinceCityDao.insert(provinceCityDO);
+
+        // 保存作业服务图片
+        List<String> images = param.getImages();
+        if(CollectionUtils.isNotEmpty(images)){
+            ServiceOrderTaskImageDO imageDO = ServiceOrderTaskImageDO.builder().orderTaskId(orderTaskDO.getId()).picture(StringUtils.join(",", images)).build();
+            serviceOrderTaskImageDao.insert(imageDO);
+        }
+        return ResultBody.success();
+    }
+}

src/main/java/com/mmc/pms/service/Impl/WebProductMallServiceImpl.java

@@ -8,6 +8,7 @@ import com.mmc.pms.entity.ProductCategory;
 import com.mmc.pms.model.other.dto.AdDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
+import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebProductMallService;

src/main/java/com/mmc/pms/service/ServiceOrderProvinceCityService.java

+package com.mmc.pms.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mmc.pms.entity.ServiceOrderProvinceCityDO;
+
+/**
+ * <p>
+ * 服务订单地址 服务类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+public interface ServiceOrderProvinceCityService extends IService<ServiceOrderProvinceCityDO> {
+
+}

src/main/java/com/mmc/pms/service/ServiceOrderStatusInfoService.java

+package com.mmc.pms.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mmc.pms.entity.ServiceOrderStatusInfoDO;
+
+/**
+ * <p>
+ * 服务订单状态 服务类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+public interface ServiceOrderStatusInfoService extends IService<ServiceOrderStatusInfoDO> {
+
+}

src/main/java/com/mmc/pms/service/ServiceOrderTaskImageService.java

+package com.mmc.pms.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mmc.pms.entity.ServiceOrderTaskImageDO;
+
+/**
+ * <p>
+ * 服务订单图片 服务类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+public interface ServiceOrderTaskImageService extends IService<ServiceOrderTaskImageDO> {
+
+}

src/main/java/com/mmc/pms/service/ServiceOrderTaskService.java

+package com.mmc.pms.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.entity.ServiceOrderTaskDO;
+import com.mmc.pms.model.work.vo.ServiceOrderTaskVO;
+
+/**
+ * <p>
+ * 云享飞服务订单-主表 服务类
+ * </p>
+ *
+ * @author Pika
+ * @since 2023-06-10
+ */
+public interface ServiceOrderTaskService extends IService<ServiceOrderTaskDO> {
+
+    ResultBody insertOrderTask(ServiceOrderTaskVO param, Integer userAccountId);
+}

src/main/resources/mapper/work/BackstageTaskServiceDao.xml

@@ -164,16 +164,20 @@
         from service
         <where>
             is_deleted = 0 and display_state = 0
-            <if test="param.applicationId != null">
-                and application_id = #{param.applicationId}
+            <if test="categoriesIds != null">
+                <foreach collection="categoriesIds" item="item" open="and (application_id in (" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="param.industryId != null">
-                and industry_id = #{param.industryId}
+            <if test="categoriesIds != null">
+                <foreach collection="categoriesIds" item="item" open="or industry_id in (" close="))" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="userIds !=null">
-            <foreach collection="userIds" open="and account_id in (" close=")" separator="," item="item">
-                #{item}
-            </foreach>
+                <foreach collection="userIds" open="and account_id in (" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>
@@ -185,16 +189,20 @@
         from service
         <where>
             is_deleted = 0 and display_state = 0
-            <if test="param.applicationId != null">
-                and application_id = #{param.applicationId}
+            <if test="categoriesIds != null">
+                <foreach collection="categoriesIds" item="item" open="and (application_id in (" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="param.industryId != null">
-                and industry_id = #{param.industryId}
+            <if test="categoriesIds != null">
+                <foreach collection="categoriesIds" item="item" open="or industry_id in (" close="))" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="userIds !=null">
-            <foreach collection="userIds" open="and account_id in (" close=")" separator="," item="item">
-                #{item}
-            </foreach>
+                <foreach collection="userIds" open="and account_id in (" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
             </if>
         </where>
         order by create_time desc

src/main/resources/mapper/work/ServiceOrderProvinceCityDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.pms.dao.ServiceOrderProvinceCityDao">
+
+</mapper>

src/main/resources/mapper/work/ServiceOrderStatusInfoDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.pms.dao.ServiceOrderStatusInfoDao">
+
+</mapper>

src/main/resources/mapper/work/ServiceOrderTaskDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.pms.dao.ServiceOrderTaskDao">
+
+</mapper>

src/main/resources/mapper/work/ServiceOrderTaskImageDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.pms.dao.ServiceOrderTaskImageDao">
+
+</mapper>