925116093-qq.com
/
javacodeadmin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

202505261532

This commit is contained in:
张潘 2025-05-26 15:32:31 +08:00
parent e2ab03ffcc
commit 18bede370a
9 changed files with 120 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteDeliveryController.java
View File

@ -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));
}
/**
* 新增快递公司
*/

18
ruoyi-system/src/main/java/com/ruoyi/system/controller/SiteSkillController.java
View File

@ -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));
}
/**
* 删除师傅技能配置
*/

4
ruoyi-system/src/main/resources/mapper/system/SiteDeliveryMapper.xml
View File

@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSiteDeliveryList" parameterType="SiteDelivery" resultMap="SiteDeliveryResult">
<include refid="selectSiteDeliveryVo"/>
<where>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="title != null and title != ''"> and title like concat('%',#{title},'%')</if>
<if test="code != null and code != ''"> and code like concat('%',#{code},'%')</if>
<if test="sort != null "> and sort = #{sort}</if>
<if test="status != null "> and status = #{status}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if>

2
ruoyi-system/src/main/resources/mapper/system/WorkerLevelMapper.xml
View File

@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWorkerLevelList" parameterType="WorkerLevel" resultMap="WorkerLevelResult">
<include refid="selectWorkerLevelVo"/>
<where>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="title != null and title != ''"> and title like concat('%',#{title},'%')</if>
<if test="level != null "> and level = #{level}</if>
<if test="ar != null "> and ar = #{ar}</if>
<if test="totalPrice != null and totalPrice != ''"> and total_price = #{totalPrice}</if>

13
ruoyi-ui/src/api/system/SiteDelivery.js
View File

@ -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({

13
ruoyi-ui/src/api/system/SiteSkill.js
View File

@ -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({

58
ruoyi-ui/src/views/system/SiteDelivery/index.vue
View File

@ -17,30 +17,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input
v-model="queryParams.sort"
placeholder="请输入排序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable
v-model="queryParams.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="updatedAt">
<el-date-picker clearable
v-model="queryParams.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -95,17 +73,27 @@
<el-table v-loading="loading" :data="SiteDeliveryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="ID" align="center" width="55" prop="id" />
<el-table-column label="名称" align="center" prop="title" />
<el-table-column label="编号" align="center" prop="code" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="${comment}" align="center" prop="createdAt" width="180">
<el-table-column label="状态" width="85" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handlefenleiStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="updatedAt" width="180">
<el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template>
@ -137,7 +125,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改快递公司对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -176,7 +163,7 @@
</template>
<script>
import { listSiteDelivery, getSiteDelivery, delSiteDelivery, addSiteDelivery, updateSiteDelivery } from "@/api/system/SiteDelivery"
import { listSiteDelivery, getSiteDelivery, delSiteDelivery, addSiteDelivery, updateSiteDelivery,changefenleiStatus } from "@/api/system/SiteDelivery"
export default {
name: "SiteDelivery",
@ -266,6 +253,17 @@ export default {
this.queryParams.pageNum = 1
this.getList()
},
// 任务状态修改
handlefenleiStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
return changefenleiStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")
}).catch(function() {
row.status = row.status === "0" ? "1" : "0"
})
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")

59
ruoyi-ui/src/views/system/SiteSkill/index.vue
View File

@ -9,30 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input
v-model="queryParams.sort"
placeholder="请输入排序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable
v-model="queryParams.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="updatedAt">
<el-date-picker clearable
v-model="queryParams.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -87,16 +63,29 @@
<el-table v-loading="loading" :data="SiteSkillList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="title" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="${comment}" align="center" prop="createdAt" width="180">
<el-table-column label="状态" width="85" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handlefenleiStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="updatedAt" width="180">
<el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template>
@ -120,7 +109,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -164,7 +153,7 @@
</template>
<script>
import { listSiteSkill, getSiteSkill, delSiteSkill, addSiteSkill, updateSiteSkill } from "@/api/system/SiteSkill"
import { listSiteSkill, getSiteSkill, delSiteSkill, addSiteSkill, updateSiteSkill ,changefenleiStatus } from "@/api/system/SiteSkill"
export default {
name: "SiteSkill",
@ -254,6 +243,18 @@ export default {
this.resetForm("queryForm")
this.handleQuery()
},
// 任务状态修改
handlefenleiStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
return changefenleiStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")
}).catch(function() {
row.status = row.status === "0" ? "1" : "0"
})
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)

94
ruoyi-ui/src/views/system/WorkerLevel/index.vue
View File

@ -9,78 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="等级" prop="level">
<el-input
v-model="queryParams.level"
placeholder="请输入等级"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="达成率" prop="ar">
<el-input
v-model="queryParams.ar"
placeholder="请输入达成率"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="服务总额" prop="totalPrice">
<el-input
v-model="queryParams.totalPrice"
placeholder="请输入服务总额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="佣金比例" prop="cr">
<el-input
v-model="queryParams.cr"
placeholder="请输入佣金比例"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="色值" prop="color">
<el-input
v-model="queryParams.color"
placeholder="请输入色值"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户背景图" prop="userBgimg">
<el-input
v-model="queryParams.userBgimg"
placeholder="请输入用户背景图"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable
v-model="queryParams.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="updatedAt">
<el-date-picker clearable
v-model="queryParams.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="deletedAt">
<el-date-picker clearable
v-model="queryParams.deletedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -135,7 +63,7 @@
<el-table v-loading="loading" :data="WorkerLevelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="ID" align="center" width="55" prop="id" />
<el-table-column label="等级名称" align="center" prop="title" />
<el-table-column label="等级" align="center" prop="level" />
<el-table-column label="达成率" align="center" prop="ar" />
@ -151,23 +79,7 @@
<image-preview :src="scope.row.bgImage" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="色值" align="center" prop="color" />
<el-table-column label="用户背景图" align="center" prop="userBgimg" />
<el-table-column label="${comment}" align="center" prop="createdAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="updatedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="deletedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deletedAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -187,7 +99,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"