diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteDeliveryController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteDeliveryController.java index ec8ec60..b571c81 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteDeliveryController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteDeliveryController.java @@ -2,6 +2,8 @@ package com.ruoyi.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.domain.ServiceCate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -68,7 +70,18 @@ public class SiteDeliveryController extends BaseController { return success(siteDeliveryService.selectSiteDeliveryById(id)); } - + /** + * 定时任务状态修改 + */ + @PreAuthorize("@ss.hasPermi('system:SiteDelivery:changeStatus')") + @Log(title = "修改状态", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SiteDelivery siteDelivery) + { + SiteDelivery newSiteDelivery = siteDeliveryService.selectSiteDeliveryById(siteDelivery.getId()); + newSiteDelivery.setStatus(siteDelivery.getStatus()); + return toAjax(siteDeliveryService.updateSiteDelivery(newSiteDelivery)); + } /** * 新增快递公司 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java index 5fb6c9c..29765f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java @@ -2,6 +2,8 @@ package com.ruoyi.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.domain.AdvImg; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -91,6 +93,22 @@ public class SiteSkillController extends BaseController return toAjax(siteSkillService.updateSiteSkill(siteSkill)); } + + /** + * 定时任务状态修改 + */ + @PreAuthorize("@ss.hasPermi('system:SiteSkill:changeStatus')") + @Log(title = "修改状态", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SiteSkill siteSkill) + { + SiteSkill newSiteSkill = siteSkillService.selectSiteSkillById(siteSkill.getId()); + newSiteSkill.setStatus(siteSkill.getStatus()); + return toAjax(siteSkillService.updateSiteSkill(newSiteSkill)); + } + + + /** * 删除师傅技能配置 */ diff --git a/ruoyi-system/src/main/resources/mapper/system/SiteDeliveryMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SiteDeliveryMapper.xml index d9a31a6..059a768 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SiteDeliveryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SiteDeliveryMapper.xml @@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and title = #{title} + and title like concat('%',#{title},'%') and level = #{level} and ar = #{ar} and total_price = #{totalPrice} diff --git a/ruoyi-ui/src/api/system/SiteDelivery.js b/ruoyi-ui/src/api/system/SiteDelivery.js index df3a0f6..427edaf 100644 --- a/ruoyi-ui/src/api/system/SiteDelivery.js +++ b/ruoyi-ui/src/api/system/SiteDelivery.js @@ -16,7 +16,18 @@ export function getSiteDelivery(id) { method: 'get' }) } - +// 任务状态修改 +export function changefenleiStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/SiteDelivery/changeStatus', + method: 'put', + data: data + }) +} // 新增快递公司 export function addSiteDelivery(data) { return request({ diff --git a/ruoyi-ui/src/api/system/SiteSkill.js b/ruoyi-ui/src/api/system/SiteSkill.js index 192797c..1ff0224 100644 --- a/ruoyi-ui/src/api/system/SiteSkill.js +++ b/ruoyi-ui/src/api/system/SiteSkill.js @@ -16,7 +16,18 @@ export function getSiteSkill(id) { method: 'get' }) } - +// 任务状态修改 +export function changefenleiStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/SiteSkill/changeStatus', + method: 'put', + data: data + }) +} // 新增师傅技能配置 export function addSiteSkill(data) { return request({ diff --git a/ruoyi-ui/src/views/system/SiteDelivery/index.vue b/ruoyi-ui/src/views/system/SiteDelivery/index.vue index 2e89c10..a7a18cb 100644 --- a/ruoyi-ui/src/views/system/SiteDelivery/index.vue +++ b/ruoyi-ui/src/views/system/SiteDelivery/index.vue @@ -17,30 +17,8 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - + + 搜索 重置 @@ -95,17 +73,27 @@ - + - - + + + + + - + @@ -137,7 +125,6 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - @@ -176,7 +163,7 @@