V4.0功能修改

zhc4dev
zhc077 2 years ago
parent 41ceee56bb
commit 8abb8f42c9
  1. 187
      ant-design-vue-jeecg/src/views/team/GroupxList.vue
  2. 172
      ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
  3. 127
      ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
  4. 137
      ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal__Style#Drawer.vue
  5. 140
      ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
  6. 140
      ant-design-vue-jeecg/src/views/team/modules/GroupxModal__Style#Drawer.vue
  7. 152
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxController.java
  8. 149
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java
  9. 56
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
  10. 53
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java
  11. 14
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMapper.java
  12. 14
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMemberMapper.java
  13. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMapper.xml
  14. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMemberMapper.xml
  15. 14
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxMemberService.java
  16. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxService.java
  17. 18
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxMemberServiceImpl.java
  18. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxServiceImpl.java
  19. 2
      jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties
  20. 8
      jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties

@ -0,0 +1,187 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="部门编号">
<j-select-depart placeholder="请选择部门" v-model="queryParam.departId"/>
<!-- <a-input placeholder="请输入部门编号" v-model="queryParam.departId"></a-input>-->
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="班组名称">
<a-input placeholder="请输入班组名称" v-model="queryParam.groupName"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="负责人">
<a-input placeholder="请输入负责人" v-model="queryParam.enterprisesManager"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="手机号">
<a-input placeholder="请输入手机号" v-model="queryParam.mobile"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 操作按钮区域 -->
<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>
<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"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<!-- table区域-end -->
<!-- 表单区域 -->
<groupx-modal ref="modalForm" @ok="modalFormOk"></groupx-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import GroupxModal from './modules/GroupxModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
export default {
name: "GroupxList",
mixins: [JeecgListMixin],
components: {
GroupxModal,
JDictSelectTag,
JSelectDepart
},
data() {
return {
description: '班组管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: "center",
customRender: function (t, r, index) {
return parseInt(index) + 1;
}
},
{
title: '部门编号',
align: "center",
dataIndex: 'departId'
},
{
title: '班组名称',
align: "center",
dataIndex: 'groupName'
},
{
title: '负责人',
align: "center",
dataIndex: 'enterprisesManager'
},
{
title: '手机号',
align: "center",
dataIndex: 'mobile'
},
{
title: '操作',
dataIndex: 'action',
align: "center",
scopedSlots: {customRender: 'action'},
}
],
url: {
list: "/groupx/list",
delete: "/groupx/delete",
deleteBatch: "/groupx/deleteBatch",
exportXlsUrl: "/groupx/exportXls",
importExcelUrl: "/groupx/importExcel",
},
}
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,172 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="班组ID">
<a-input placeholder="请输入班组ID" v-model="queryParam.groupxId"></a-input>
<!-- <j-search-select-tag placeholder="请选择班组" v-model="queryParam.jcmcid" dict="groupx,group_name,id"/>-->
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户ID">
<a-input placeholder="请输入用户ID" v-model="queryParam.userId"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="加入时间">
<!-- <a-input placeholder="请输入加入时间" v-model="queryParam.joinTime"></a-input>-->
<a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="queryParam.joinTime"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 操作按钮区域 -->
<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>
<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"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<!-- table区域-end -->
<!-- 表单区域 -->
<groupxMember-modal ref="modalForm" @ok="modalFormOk"></groupxMember-modal>
</a-card>
</template>
<script>
import '@assets/less/TableExpand.less'
import GroupxMemberModal from './modules/GroupxMemberModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: "GroupxMemberList",
mixins:[JeecgListMixin],
components: {
GroupxMemberModal
},
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: 'groupxId'
},
{
title: '用户ID',
align:"center",
dataIndex: 'userId'
},
{
title: '加入时间',
align:"center",
dataIndex: 'joinTime'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
scopedSlots: { customRender: 'action' },
}
],
url: {
list: "/groupxMember/list",
delete: "/groupxMember/delete",
deleteBatch: "/groupxMember/deleteBatch",
exportXlsUrl: "/groupxMember/exportXls",
importExcelUrl: "/groupxMember/importExcel",
},
}
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,127 @@
<template>
<j-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupxId" label="请选择班组">
<!-- <a-input placeholder="请选择班组" v-model="model.groupxId" />-->
<j-search-select-tag placeholder="请选择班组" v-model="model.groupxId" dict="groupx,group_name,id"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId" label="请选择用户">
<a-input placeholder="请选择用户" v-model="model.userId"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">
<a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime"/>
</a-form-model-item>
</a-form-model>
</a-spin>
</j-modal>
</template>
<script>
import {httpAction} from '@/api/manage'
import moment from "moment"
export default {
name: "GroupxMemberModal",
data() {
return {
title: "操作",
visible: false,
model: {},
labelCol: {
xs: {span: 24},
sm: {span: 5},
},
wrapperCol: {
xs: {span: 24},
sm: {span: 16},
},
confirmLoading: false,
validatorRules: {
groupxId: [
{required: true},
],
userId: [
{required: true},
], joinTime: [
{required: true},
]
},
url: {
add: "/groupxMember/add",
edit: "/groupxMember/edit",
}
,
}
},
created() {
},
methods: {
add() {
//
this.edit({});
},
edit(record) {
this.model = Object.assign({}, record);
this.visible = true;
},
close() {
this.$emit('close');
this.visible = false;
this.$refs.form.clearValidate();
},
handleOk() {
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;
that.close();
})
} else {
return false;
}
})
},
handleCancel() {
this.close()
},
}
}
</script>
<style lang="less" scoped>
</style>

@ -0,0 +1,137 @@
<template>
<a-drawer
:title="title"
:width="800"
placement="right"
:closable="false"
@close="close"
:visible="visible">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupxId" label="班组id FK 班组表">
<a-input placeholder="请输入班组id FK 班组表" v-model="model.groupxId" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId" label="用户id FK 用户表">
<a-input placeholder="请输入用户id FK 用户表" v-model="model.userId" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">
<a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime" />
</a-form-model-item>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
<a-button type="primary" @click="handleOk">确定</a-button>
<a-button type="primary" @click="handleCancel">取消</a-button>
</div>
</a-drawer>
</template>
<script>
import { httpAction } from '@/api/manage'
import moment from "moment"
export default {
name: "GroupxMemberModal",
data () {
return {
title:"操作",
visible: false,
model: {},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules:{
},
url: {
add: "/groupxMember/add",
edit: "/groupxMember/edit",
},
}
},
created () {
},
methods: {
add () {
//
this.edit({});
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
close () {
this.$emit('close');
this.visible = false;
this.$refs.form.clearValidate();
},
handleOk () {
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;
that.close();
})
}else{
return false;
}
})
},
handleCancel () {
this.close()
},
}
}
</script>
<style lang="less" scoped>
/**Button按钮间距*/
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
/**抽屉按钮样式*/
.drawer-bootom-button {
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>

@ -0,0 +1,140 @@
<template>
<j-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="部门编号">
<!-- <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
<j-select-depart placeholder="请选择部门" v-model="model.departId"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupName" label="班组名称">
<a-input placeholder="请输入班组名称" v-model="model.groupName"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">
<a-input placeholder="请输入负责人" v-model="model.enterprisesManager"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile" label="手机号">
<a-input placeholder="请输入手机号" v-model="model.mobile"/>
</a-form-model-item>
</a-form-model>
</a-spin>
</j-modal>
</template>
<script>
import {httpAction} from '@/api/manage'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
export default {
name: "GroupxModal",
components: {
JDictSelectTag,
JSelectDepart,
},
data() {
return {
title: "操作",
visible: false,
model: {},
labelCol: {
xs: {span: 24},
sm: {span: 5},
},
wrapperCol: {
xs: {span: 24},
sm: {span: 16},
},
confirmLoading: false,
validatorRules: {
departId: [
{required: true},
],
groupName: [
{required: true},
],
enterprisesManager: [
{required: true},
],
mobile: [
{required: false},
{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
],
},
url: {
add: "/groupx/add",
edit: "/groupx/edit",
},
}
},
created() {
},
methods: {
add() {
//
this.edit({});
},
edit(record) {
this.model = Object.assign({}, record);
this.visible = true;
},
close() {
this.$emit('close');
this.visible = false;
this.$refs.form.clearValidate();
},
handleOk() {
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;
that.close();
})
} else {
return false;
}
})
},
handleCancel() {
this.close()
},
}
}
</script>
<style lang="less" scoped>
</style>

@ -0,0 +1,140 @@
<template>
<a-drawer
:title="title"
:width="800"
placement="right"
:closable="false"
@close="close"
:visible="visible">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="部门编号">
<a-input placeholder="请输入部门编号" v-model="model.departId" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupName" label="班组名称">
<a-input placeholder="请输入班组名称" v-model="model.groupName" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">
<a-input placeholder="请输入负责人" v-model="model.enterprisesManager" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile" label="手机号">
<a-input placeholder="请输入手机号" v-model="model.mobile" />
</a-form-model-item>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
<a-button type="primary" @click="handleOk">确定</a-button>
<a-button type="primary" @click="handleCancel">取消</a-button>
</div>
</a-drawer>
</template>
<script>
import { httpAction } from '@/api/manage'
import moment from "moment"
export default {
name: "GroupxModal",
data () {
return {
title:"操作",
visible: false,
model: {},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules:{
},
url: {
add: "/groupx/add",
edit: "/groupx/edit",
},
}
},
created () {
},
methods: {
add () {
//
this.edit({});
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
close () {
this.$emit('close');
this.visible = false;
this.$refs.form.clearValidate();
},
handleOk () {
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;
that.close();
})
}else{
return false;
}
})
},
handleCancel () {
this.close()
},
}
}
</script>
<style lang="less" scoped>
/**Button按钮间距*/
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
/**抽屉按钮样式*/
.drawer-bootom-button {
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>

@ -0,0 +1,152 @@
package org.jeecg.modules.team.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.team.entity.Groupx;
import org.jeecg.modules.team.service.IGroupxService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 班组
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Slf4j
@Api(tags="班组管理")
@RestController
@RequestMapping("/groupx")
public class GroupxController extends JeecgController<Groupx, IGroupxService> {
@Autowired
private IGroupxService groupxService;
/**
* 分页列表查询
*
* @param groupx
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "班组-分页列表查询")
@ApiOperation(value="班组-分页列表查询", notes="班组-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(Groupx groupx,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Groupx> queryWrapper = QueryGenerator.initQueryWrapper(groupx, req.getParameterMap());
Page<Groupx> page = new Page<Groupx>(pageNo, pageSize);
IPage<Groupx> pageList = groupxService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param groupx
* @return
*/
@AutoLog(value = "班组-添加")
@ApiOperation(value="班组-添加", notes="班组-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody Groupx groupx) {
groupxService.save(groupx);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param groupx
* @return
*/
@AutoLog(value = "班组-编辑")
@ApiOperation(value="班组-编辑", notes="班组-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody Groupx groupx) {
groupxService.updateById(groupx);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "班组-通过id删除")
@ApiOperation(value="班组-通过id删除", notes="班组-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
groupxService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "班组-批量删除")
@ApiOperation(value="班组-批量删除", notes="班组-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.groupxService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
Groupx groupx = groupxService.getById(id);
return Result.OK(groupx);
}
/**
* 导出excel
*
* @param request
* @param groupx
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Groupx groupx) {
return super.exportXls(request, groupx, Groupx.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, Groupx.class);
}
}

@ -0,0 +1,149 @@
package org.jeecg.modules.team.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.service.IGroupxMemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 班组成员管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Slf4j
@Api(tags = "班组成员表管理")
@RestController
@RequestMapping("/groupxMember")
public class GroupxMemberController extends JeecgController<GroupxMember, IGroupxMemberService> {
@Autowired
private IGroupxMemberService groupxMemberService;
/**
* 分页列表查询
*
* @param groupxMember
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "班组成员表管理-分页列表查询")
@ApiOperation(value = "班组成员表管理-分页列表查询", notes = "班组成员表管理-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(GroupxMember groupxMember, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<GroupxMember> queryWrapper = QueryGenerator.initQueryWrapper(groupxMember, req.getParameterMap());
Page<GroupxMember> page = new Page<GroupxMember>(pageNo, pageSize);
IPage<GroupxMember> pageList = groupxMemberService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param groupxMember
* @return
*/
@AutoLog(value = "班组成员表管理-添加")
@ApiOperation(value = "班组成员表管理-添加", notes = "班组成员表管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody GroupxMember groupxMember) {
groupxMemberService.save(groupxMember);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param groupxMember
* @return
*/
@AutoLog(value = "班组成员表管理-编辑")
@ApiOperation(value = "班组成员表管理-编辑", notes = "班组成员表管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody GroupxMember groupxMember) {
groupxMemberService.updateById(groupxMember);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "班组成员表管理-通过id删除")
@ApiOperation(value = "班组成员表管理-通过id删除", notes = "班组成员表管理-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
groupxMemberService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "班组成员表管理-批量删除")
@ApiOperation(value = "班组成员表管理-批量删除", notes = "班组成员表管理-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.groupxMemberService.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<?> queryById(@RequestParam(name = "id", required = true) String id) {
GroupxMember groupxMember = groupxMemberService.getById(id);
return Result.OK(groupxMember);
}
/**
* 导出excel
*
* @param request
* @param groupxMember
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, GroupxMember groupxMember) {
return super.exportXls(request, groupxMember, GroupxMember.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, GroupxMember.class);
}
}

@ -0,0 +1,56 @@
package org.jeecg.modules.team.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Description: 班组
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Data
@TableName("groupx")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="groupx对象", description="班组")
public class Groupx {
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**部门id*/
@Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id")
private String departId;
/**班组名称*/
@Excel(name = "班组名称", width = 15)
@ApiModelProperty(value = "班组名称")
private String groupName;
/**负责人;fk用户表id*/
@Excel(name = "负责人;fk用户表id", width = 15)
@ApiModelProperty(value = "负责人;fk用户表id")
private String enterprisesManager;
/**手机号*/
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
private String mobile;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
}

@ -0,0 +1,53 @@
package org.jeecg.modules.team.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Description: 班组成员表管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Data
@TableName("groupx_member")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="groupx_member对象", description="班组成员管理")
public class GroupxMember {
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**班组id FK 班组表*/
@Excel(name = "班组id FK 班组表", width = 15)
@ApiModelProperty(value = "班组id FK 班组表")
private String groupxId;
/**用户id FK 用户表*/
@Excel(name = "用户id FK 用户表", width = 15)
@ApiModelProperty(value = "用户id FK 用户表")
private String userId;
/**加入时间*/
@Excel(name = "加入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "加入时间")
private Date joinTime;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
}

@ -0,0 +1,14 @@
package org.jeecg.modules.team.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.team.entity.Groupx;
/**
* @Description: 班组
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
public interface GroupxMapper extends BaseMapper<Groupx> {
}

@ -0,0 +1,14 @@
package org.jeecg.modules.team.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.team.entity.GroupxMember;
/**
* @Description: 班组成员表管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
public interface GroupxMemberMapper extends BaseMapper<GroupxMember> {
}

@ -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.team.mapper.GroupxMapper">
</mapper>

@ -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.team.mapper.GroupxMemberMapper">
</mapper>

@ -0,0 +1,14 @@
package org.jeecg.modules.team.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.team.entity.GroupxMember;
/**
* @Description: 班组成员表管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
public interface IGroupxMemberService extends IService<GroupxMember> {
}

@ -0,0 +1,13 @@
package org.jeecg.modules.team.service;
import org.jeecg.modules.team.entity.Groupx;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 班组
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
public interface IGroupxService extends IService<Groupx> {
}

@ -0,0 +1,18 @@
package org.jeecg.modules.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.mapper.GroupxMemberMapper;
import org.jeecg.modules.team.service.IGroupxMemberService;
import org.springframework.stereotype.Service;
/**
* @Description: 班组成员表管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Service
public class GroupxMemberServiceImpl extends ServiceImpl<GroupxMemberMapper, GroupxMember> implements IGroupxMemberService {
}

@ -0,0 +1,17 @@
package org.jeecg.modules.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.team.entity.Groupx;
import org.jeecg.modules.team.mapper.GroupxMapper;
import org.jeecg.modules.team.service.IGroupxService;
import org.springframework.stereotype.Service;
/**
* @Description: 班组
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Version: V1.0
*/
@Service
public class GroupxServiceImpl extends ServiceImpl<GroupxMapper, Groupx> implements IGroupxService {
}

@ -1,7 +1,7 @@
#code_generate_project_path #code_generate_project_path
project_path=E:\\eclipse2018-workspace\\jeecg-boot project_path=E:\\eclipse2018-workspace\\jeecg-boot
#bussi_package[User defined] #bussi_package[User defined]
bussi_package=org.jeecg.modules.demo bussi_package=
#default code path #default code path

@ -1,9 +1,9 @@
#mysql #mysql
diver_name=com.mysql.jdbc.Driver diver_name=com.mysql.jdbc.Driver
url: jdbc:mysql://mysql-lee.mysql.rds.aliyuncs.com:3306/zy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai database_name=costumingplatform
username: root1 url: jdbc:mysql://182.92.169.222:3306/costumingplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
password: zxcvbnm023@lee username: root
database_name=jeecg-boot password: ycwl2022.
#oracle #oracle
#diver_name=oracle.jdbc.driver.OracleDriver #diver_name=oracle.jdbc.driver.OracleDriver

Loading…
Cancel
Save