Browse Source

1、添加工单状态权限细分

2、去掉检测项目权限细分
master
Aug 5 months ago
parent
commit
895eeb0122
16 changed files with 1131 additions and 21 deletions
  1. +171
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/controller/WorkorderPermissionStatusController.java
  2. +65
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/entity/WorkorderPermissionStatus.java
  3. +17
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/WorkorderPermissionStatusMapper.java
  4. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/xml/WorkorderPermissionStatusMapper.xml
  5. +14
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/IWorkorderPermissionStatusService.java
  6. +19
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/impl/WorkorderPermissionStatusServiceImpl.java
  7. +178
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/WorkorderPermissionStatusList.vue
  8. +109
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusForm.vue
  9. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.Style#Drawer.vue
  10. +60
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.vue
  11. +61
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.api.ts
  12. +39
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.data.ts
  13. +162
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatusList.vue
  14. +58
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/components/WorkorderPermissionStatusModal.vue
  15. +15
    -7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java
  16. +74
    -14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/controller/WorkorderPermissionStatusController.java View File

@ -0,0 +1,171 @@
package org.jeecg.modules.workorderPermissionStatus.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus;
import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 工单状态权限配置表
* @Author: jeecg-boot
* @Date: 2025-01-06
* @Version: V1.0
*/
@Api(tags="工单状态权限配置表")
@RestController
@RequestMapping("/workorderPermissionStatus/workorderPermissionStatus")
@Slf4j
public class WorkorderPermissionStatusController extends JeecgController<WorkorderPermissionStatus, IWorkorderPermissionStatusService> {
@Autowired
private IWorkorderPermissionStatusService workorderPermissionStatusService;
/**
* 分页列表查询
*
* @param workorderPermissionStatus
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "工单状态权限配置表-分页列表查询")
@ApiOperation(value="工单状态权限配置表-分页列表查询", notes="工单状态权限配置表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<WorkorderPermissionStatus>> queryPageList(WorkorderPermissionStatus workorderPermissionStatus,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<WorkorderPermissionStatus> queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionStatus, req.getParameterMap());
Page<WorkorderPermissionStatus> page = new Page<WorkorderPermissionStatus>(pageNo, pageSize);
IPage<WorkorderPermissionStatus> pageList = workorderPermissionStatusService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param workorderPermissionStatus
* @return
*/
@AutoLog(value = "工单状态权限配置表-添加")
@ApiOperation(value="工单状态权限配置表-添加", notes="工单状态权限配置表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody WorkorderPermissionStatus workorderPermissionStatus) {
workorderPermissionStatusService.save(workorderPermissionStatus);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param workorderPermissionStatus
* @return
*/
@AutoLog(value = "工单状态权限配置表-编辑")
@ApiOperation(value="工单状态权限配置表-编辑", notes="工单状态权限配置表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody WorkorderPermissionStatus workorderPermissionStatus) {
workorderPermissionStatusService.updateById(workorderPermissionStatus);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "工单状态权限配置表-通过id删除")
@ApiOperation(value="工单状态权限配置表-通过id删除", notes="工单状态权限配置表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
workorderPermissionStatusService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "工单状态权限配置表-批量删除")
@ApiOperation(value="工单状态权限配置表-批量删除", notes="工单状态权限配置表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.workorderPermissionStatusService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "工单状态权限配置表-通过id查询")
@ApiOperation(value="工单状态权限配置表-通过id查询", notes="工单状态权限配置表-通过id查询")
@GetMapping(value = "/queryById")
public Result<WorkorderPermissionStatus> queryById(@RequestParam(name="id",required=true) String id) {
WorkorderPermissionStatus workorderPermissionStatus = workorderPermissionStatusService.getById(id);
if(workorderPermissionStatus==null) {
return Result.error("未找到对应数据");
}
return Result.OK(workorderPermissionStatus);
}
/**
* 导出excel
*
* @param request
* @param workorderPermissionStatus
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionStatus workorderPermissionStatus) {
return super.exportXls(request, workorderPermissionStatus, WorkorderPermissionStatus.class, "工单状态权限配置表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, WorkorderPermissionStatus.class);
}
}

+ 65
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/entity/WorkorderPermissionStatus.java View File

@ -0,0 +1,65 @@
package org.jeecg.modules.workorderPermissionStatus.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 工单状态权限配置表
* @Author: jeecg-boot
* @Date: 2025-01-06
* @Version: V1.0
*/
@Data
@TableName("workorder_permission_status")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="workorder_permission_status对象", description="工单状态权限配置表")
public class WorkorderPermissionStatus implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**关联角色id*/
@Excel(name = "关联角色id", width = 15, dictTable = "workorder_role", dicText = "name", dicCode = "id")
@Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联角色id")
private java.lang.String roleId;
/**关联工单状态id*/
@Excel(name = "关联工单状态id", width = 15, dictTable = "workorder_status", dicText = "name", dicCode = "id")
@Dict(dictTable = "workorder_status", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联工单状态id")
private java.lang.String statusId;
//状态名称
@TableField(exist = false)
private java.lang.String statusId_dictText;
}

+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/WorkorderPermissionStatusMapper.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.workorderPermissionStatus.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 工单状态权限配置表
* @Author: jeecg-boot
* @Date: 2025-01-06
* @Version: V1.0
*/
public interface WorkorderPermissionStatusMapper extends BaseMapper<WorkorderPermissionStatus> {
}

+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/xml/WorkorderPermissionStatusMapper.xml View File

@ -0,0 +1,5 @@
<?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="org.jeecg.modules.workorderPermissionStatus.mapper.WorkorderPermissionStatusMapper">
</mapper>

+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/IWorkorderPermissionStatusService.java View File

@ -0,0 +1,14 @@
package org.jeecg.modules.workorderPermissionStatus.service;
import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 工单状态权限配置表
* @Author: jeecg-boot
* @Date: 2025-01-06
* @Version: V1.0
*/
public interface IWorkorderPermissionStatusService extends IService<WorkorderPermissionStatus> {
}

+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/impl/WorkorderPermissionStatusServiceImpl.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.workorderPermissionStatus.service.impl;
import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus;
import org.jeecg.modules.workorderPermissionStatus.mapper.WorkorderPermissionStatusMapper;
import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 工单状态权限配置表
* @Author: jeecg-boot
* @Date: 2025-01-06
* @Version: V1.0
*/
@Service
public class WorkorderPermissionStatusServiceImpl extends ServiceImpl<WorkorderPermissionStatusMapper, WorkorderPermissionStatus> implements IWorkorderPermissionStatusService {
}

+ 178
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/WorkorderPermissionStatusList.vue View File

@ -0,0 +1,178 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('工单状态权限配置表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<workorder-permission-status-modal ref="modalForm" @ok="modalFormOk"></workorder-permission-status-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import WorkorderPermissionStatusModal from './modules/WorkorderPermissionStatusModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'WorkorderPermissionStatusList',
mixins:[JeecgListMixin, mixinDevice],
components: {
WorkorderPermissionStatusModal
},
data () {
return {
description: '工单状态权限配置表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'关联角色id',
align:"center",
dataIndex: 'roleId_dictText'
},
{
title:'关联工单状态id',
align:"center",
dataIndex: 'statusId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/workorderPermissionStatus/workorderPermissionStatus/list",
delete: "/workorderPermissionStatus/workorderPermissionStatus/delete",
deleteBatch: "/workorderPermissionStatus/workorderPermissionStatus/deleteBatch",
exportXlsUrl: "/workorderPermissionStatus/workorderPermissionStatus/exportXls",
importExcelUrl: "workorderPermissionStatus/workorderPermissionStatus/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'roleId',text:'关联角色id',dictCode:"workorder_role,name,id"})
fieldList.push({type:'string',value:'statusId',text:'关联工单状态id',dictCode:"workorder_status,name,id"})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 109
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusForm.vue View File

@ -0,0 +1,109 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="关联角色id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
<j-dict-select-tag type="list" v-model="model.roleId" dictCode="workorder_role,name,id" placeholder="请选择关联角色id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联工单状态id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="statusId">
<j-dict-select-tag type="list" v-model="model.statusId" dictCode="workorder_status,name,id" placeholder="请选择关联工单状态id" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'WorkorderPermissionStatusForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/workorderPermissionStatus/workorderPermissionStatus/add",
edit: "/workorderPermissionStatus/workorderPermissionStatus/edit",
queryById: "/workorderPermissionStatus/workorderPermissionStatus/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<workorder-permission-status-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></workorder-permission-status-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import WorkorderPermissionStatusForm from './WorkorderPermissionStatusForm'
export default {
name: 'WorkorderPermissionStatusModal',
components: {
WorkorderPermissionStatusForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<workorder-permission-status-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></workorder-permission-status-form>
</j-modal>
</template>
<script>
import WorkorderPermissionStatusForm from './WorkorderPermissionStatusForm'
export default {
name: 'WorkorderPermissionStatusModal',
components: {
WorkorderPermissionStatusForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.api.ts View File

@ -0,0 +1,61 @@
import {defHttp} from '/@/utils/http/axios';
import {Modal} from 'ant-design-vue';
enum Api {
list = '/workorderPermissionStatus/workorderPermissionStatus/list',
save='/workorderPermissionStatus/workorderPermissionStatus/add',
edit='/workorderPermissionStatus/workorderPermissionStatus/edit',
deleteOne = '/workorderPermissionStatus/workorderPermissionStatus/delete',
deleteBatch = '/workorderPermissionStatus/workorderPermissionStatus/deleteBatch',
importExcel = '/workorderPermissionStatus/workorderPermissionStatus/importExcel',
exportXls = '/workorderPermissionStatus/workorderPermissionStatus/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
*
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

+ 39
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.data.ts View File

@ -0,0 +1,39 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '关联角色id',
align:"center",
dataIndex: 'roleId_dictText'
},
{
title: '关联工单状态id',
align:"center",
dataIndex: 'statusId_dictText'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '关联角色id',
field: 'roleId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"workorder_role,name,id"
},
},
{
label: '关联工单状态id',
field: 'statusId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"workorder_status,name,id"
},
},
];

+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatusList.vue View File

@ -0,0 +1,162 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="checkedKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<WorkorderPermissionStatusModal @register="registerModal" @success="handleSuccess"></WorkorderPermissionStatusModal>
</div>
</template>
<script lang="ts" name="workorderPermissionStatus-workorderPermissionStatus" setup>
import {ref, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import WorkorderPermissionStatusModal from './components/WorkorderPermissionStatusModal.vue'
import {columns, searchFormSchema} from './workorderPermissionStatus.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './workorderPermissionStatus.api';
const checkedKeys = ref<Array<string | number>>([]);
//model
const [registerModal, {openModal}] = useModal();
//table
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '工单状态权限配置表',
api: list,
columns,
canResize:false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter:true,
showAdvancedButton:true,
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
},
},
exportConfig: {
name:"工单状态权限配置表",
url: getExportUrl,
},
importConfig: {
url: getImportUrl
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, reload);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: checkedKeys.value}, reload);
}
/**
* 成功回调
*/
function handleSuccess() {
reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/components/WorkorderPermissionStatusModal.vue View File

@ -0,0 +1,58 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../workorderPermissionStatus.data';
import {saveOrUpdate} from '../workorderPermissionStatus.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
</style>

+ 15
- 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java View File

@ -560,7 +560,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String token) { public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionGeneral(token, generalStepone.getStepId());
//boolean permission = judgePermissionGeneral(token, generalStepone.getStepId());去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -583,7 +584,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String token) { public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionGeneral(token, generalSteptwo.getStepId());
//boolean permission = judgePermissionGeneral(token, generalSteptwo.getStepId());//去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -605,6 +607,7 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String token) { public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
//boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId());//去掉权限细分判断
boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId()); boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId());
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
@ -627,7 +630,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String token) { public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionGeneral(token, generalStepfour.getStepId());
//boolean permission = judgePermissionGeneral(token, generalStepfour.getStepId());//去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -649,7 +653,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String token) { public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionParam(token, paramStepone.getProcessId());
//boolean permission = judgePermissionParam(token, paramStepone.getProcessId());去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -671,7 +676,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String token) { public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionParam(token, paramSteptwo.getProcessId());
//boolean permission = judgePermissionParam(token, paramSteptwo.getProcessId());//去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -693,7 +699,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String token) { public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionParam(token, paramStepthree.getProcessId());
//boolean permission = judgePermissionParam(token, paramStepthree.getProcessId());//去掉权限细分判断
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }
@ -715,7 +722,8 @@ public class TemplateServiceImpl implements TemplateService {
public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String token) { public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String token) {
try{ try{
//判断是否有工序操作权限 //判断是否有工序操作权限
boolean permission = judgePermissionParam(token, paramStepfour.getProcessId());
//boolean permission = judgePermissionParam(token, paramStepfour.getProcessId());//去掉权限细分
boolean permission = judgePermissionTemplate(token);
if(!permission){ if(!permission){
return Result.error("没有该工序的操作权限"); return Result.error("没有该工序的操作权限");
} }


+ 74
- 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java View File

@ -6,16 +6,21 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiBean.PageBean;
import org.jeecg.modules.apiService.UserService; import org.jeecg.modules.apiService.UserService;
import org.jeecg.modules.workorderBanner.entity.WorkorderBanner;
import org.jeecg.modules.workorderPermission.entity.WorkorderPermission; import org.jeecg.modules.workorderPermission.entity.WorkorderPermission;
import org.jeecg.modules.workorderPermission.service.IWorkorderPermissionService; import org.jeecg.modules.workorderPermission.service.IWorkorderPermissionService;
import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole; import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService; import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService;
import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus;
import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService;
import org.jeecg.modules.workorderPermissionTemplate.entity.WorkorderPermissionTemplate; import org.jeecg.modules.workorderPermissionTemplate.entity.WorkorderPermissionTemplate;
import org.jeecg.modules.workorderPermissionTemplate.service.IWorkorderPermissionTemplateService; import org.jeecg.modules.workorderPermissionTemplate.service.IWorkorderPermissionTemplateService;
import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser; import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService; import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService;
import org.jeecg.modules.workorderRole.entity.WorkorderRole; import org.jeecg.modules.workorderRole.entity.WorkorderRole;
import org.jeecg.modules.workorderRole.service.IWorkorderRoleService; import org.jeecg.modules.workorderRole.service.IWorkorderRoleService;
import org.jeecg.modules.workorderStatus.entity.WorkorderStatus;
import org.jeecg.modules.workorderStatus.service.IWorkorderStatusService;
import org.jeecg.modules.workorderUser.entity.WorkorderUser; import org.jeecg.modules.workorderUser.entity.WorkorderUser;
import org.jeecg.modules.workorderUser.service.IWorkorderUserService; import org.jeecg.modules.workorderUser.service.IWorkorderUserService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -41,6 +46,14 @@ public class UserServiceImpl implements UserService {
@Resource @Resource
private IWorkorderPermissionUserService workorderPermissionUserService; private IWorkorderPermissionUserService workorderPermissionUserService;
//工单状态信息
@Resource
private IWorkorderStatusService workorderStatusService;
//工单状态权限信息
@Resource
private IWorkorderPermissionStatusService workorderPermissionStatusService;
// //权限信息 // //权限信息
// @Resource // @Resource
// private IWorkorderPermissionService workorderPermissionService; // private IWorkorderPermissionService workorderPermissionService;
@ -91,7 +104,6 @@ public class UserServiceImpl implements UserService {
}else { }else {
//非本人查询是否有查看权限 //非本人查询是否有查看权限
permission = judgePermissionTemplate(token); permission = judgePermissionTemplate(token);
map.put("permission", permission);
} }
if(!permission){ if(!permission){
return Result.error("没有查看权限"); return Result.error("没有查看权限");
@ -110,12 +122,29 @@ public class UserServiceImpl implements UserService {
.eq(WorkorderRole::getId, user.getRoleId()) .eq(WorkorderRole::getId, user.getRoleId())
.one(); .one();
user.setRoleName(role.getName()); user.setRoleName(role.getName());
map.put("role", role);
return Result.OK("用户信息详情", user);
//查看用户可修改的工单状态
List<WorkorderPermissionStatus> permissionStatusList = workorderPermissionStatusService
.lambdaQuery()
.eq(WorkorderPermissionStatus::getRoleId, role.getId())
.list();
List<WorkorderStatus> statusList = workorderStatusService
.lambdaQuery()
.list();
for (WorkorderPermissionStatus permissionStatus : permissionStatusList) {
for (WorkorderStatus status : statusList) {
if(permissionStatus.getStatusId().equals(status.getId())){
permissionStatus.setStatusId_dictText(status.getName());
}
}
}
map.put("permissionStatusList", permissionStatusList);
return Result.OK("用户信息详情", map);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return Result.error("用户信息详情获取失败", user);
return Result.error("用户信息详情获取失败", map);
} }
} }
@ -125,13 +154,12 @@ public class UserServiceImpl implements UserService {
public Result<?> login(String userName, String password) { public Result<?> login(String userName, String password) {
//返回信息 //返回信息
String message = "登录失败"; String message = "登录失败";
//返回数据 //返回数据
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
WorkorderUser user = null;
try{ try{
//查询用户信息详情 //查询用户信息详情
user = workorderUserService
WorkorderUser user = workorderUserService
.lambdaQuery() .lambdaQuery()
.eq(WorkorderUser::getName, userName) .eq(WorkorderUser::getName, userName)
.eq(WorkorderUser::getPassword, password) .eq(WorkorderUser::getPassword, password)
@ -145,19 +173,51 @@ public class UserServiceImpl implements UserService {
.eq(WorkorderRole::getId, user.getRoleId()) .eq(WorkorderRole::getId, user.getRoleId())
.one(); .one();
user.setRoleName(role.getName()); user.setRoleName(role.getName());
map.put("role", role);
//获取用户是否具有修改其他用户的权限
boolean permission = judgePermissionTemplate(user.getId());
map.put("permission", permission);
// //查看用户可修改的工单状态
// Page<WorkorderPermissionStatus> page = new Page<WorkorderPermissionStatus>(1, 1000);;//分页信息
// Page<WorkorderPermissionStatus> permissionStatusList = workorderPermissionStatusService
// .lambdaQuery()
// .eq(WorkorderPermissionStatus::getRoleId, role.getId())
// .page(page);
// map.put("permissionStatusList", permissionStatusList);
//
// //分页
// Page<WorkorderPermissionStatus> page = new Page<WorkorderPermissionStatus>(1, 1000);
// LambdaQueryChainWrapper<WorkorderPermissionStatus> query = workorderPermissionStatusService
// .lambdaQuery();
//
// //组装查询条件
// query.eq(WorkorderPermissionStatus::getRoleId, role.getId());
//
// //获取工单状态列表
// Page<WorkorderPermissionStatus> permissionStatusList = query.page(page);
//查看用户可修改的工单状态
List<WorkorderPermissionStatus> permissionStatusList = workorderPermissionStatusService
.lambdaQuery()
.eq(WorkorderPermissionStatus::getRoleId, role.getId())
.list();
List<WorkorderStatus> statusList = workorderStatusService
.lambdaQuery()
.list();
for (WorkorderPermissionStatus permissionStatus : permissionStatusList) {
for (WorkorderStatus status : statusList) {
if(permissionStatus.getStatusId().equals(status.getId())){
permissionStatus.setStatusId_dictText(status.getName());
}
}
}
map.put("permissionStatusList", permissionStatusList);
return Result.OK("用户登录成功", user);
return Result.OK("用户登录成功", map);
}else { }else {
return Result.error("该用户不存在", user);
return Result.error("该用户不存在", map);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return Result.error("登录失败", user);
return Result.error("登录失败", map);
} }
} }


Loading…
Cancel
Save