diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue index 2a210fd6..a4c1e758 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue @@ -76,7 +76,8 @@ export default { width: '200px', options: [], placeholder: '请选择${title}', - }, { + }, + { title: '设备列表', key: 'machineIds', type: JVXETypes.selectMultiple, @@ -91,14 +92,43 @@ export default { options: [], placeholder: '请选择${title}', }, + // { + // title: 'JPopup', + // key: 'popup', + // type: JVXETypes.popup, + // width: '180px', + // popupCode: 'demo', + // field: 'name,sex,age', + // orgFields: 'name,sex,age', + // destFields: 'popup,popup_sex,popup_age' + // }, { - key: 'proProcess', title: '前导工序', - dictCode: 'zy_process,process_name,id,id in(select process_id from zy_product_process where product_id="1")', - width: '150', - type: JVXETypes.select + key: 'proProcess', + type: JVXETypes.popup, + width: '180px', + popupCode: 'zy_process', + field: 'id,process_code,process_name,process_describe', + orgFields: 'id,process_code,process_name,process_describe', + destFields: 'popup,id,popup_process_name,popup_process_describe', + }, + // { + // key: 'proProcess', + // title: '前导工序', + // dictCode: 'zy_process,process_name,id,id in(select process_id from zy_product_process where product_id="1")', + // width: '150', + // type: JVXETypes.select + // }, + { + title: '后导工序', + key: 'postProcess', + type: JVXETypes.popup, + width: '180px', + popupCode: 'zy_process', + field: 'id,process_code,process_name,process_describe', + orgFields: 'id,process_code,process_name,process_describe', + destFields: 'popup,id,popup_process_name,popup_process_describe', }, - {key: 'postProcess', title: '后导工序', width: '150', type: JVXETypes.select}, {key: 'inputProduct', title: '输入产品', width: '150', type: JVXETypes.input}, {key: 'semiProduct', title: '成品/半成品', width: '150', type: JVXETypes.input}, ], diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue index 6f91939d..56a843fd 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue @@ -1,422 +1,422 @@ - + + + - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue index 9bc4e3f5..3ab40408 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanTeamDataList.vue @@ -1,76 +1,27 @@ @@ -79,136 +30,88 @@ import '@/assets/less/TableExpand.less' import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' -import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' -import {getAction, httpAction, downFile, postAction} from "@api/manage"; -import {filterObj} from "@/utils/util"; +import {getAction, postAction} from "@api/manage"; +import {filterObj, pushIfNotExist, randomNumber, randomUUID} from "@/utils/util"; +import {JVXETypes} from '@/components/jeecg/JVxeTable' export default { - name: 'ZyPlanProcessList', + name: 'ZyPlanProcessDataList', mixins: [JeecgListMixin, mixinDevice], - components: { - ZyPlanProcessModal - }, data() { return { - description: '生产计划班组管理页面', - // 表头 + toolbarConfig: { + // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮 + btn: ['save'] + }, + description: '生产计划工序管理页面', + loading: false, + // 分页器参数 + // pagination: { + // // 当前页码 + // current: 1, + // // 每页的条数 + // pageSize: 10, + // // 可切换的条数 + // pageSizeOptions: ['10', '20', '30', '50'], + // // 数据总数（目前并不知道真实的总数，所以先填写0，在后台查出来后再赋值） + // total: 0, + // }, + // 选择的行 + // selectedRows: [], + // 数据源，控制表格的数据 + dataSource: [], + // columns, columns: [ - { - title: '#', - dataIndex: '', - key: 'rowIndex', - width: 60, - align: "center", - customRender: function (t, r, index) { - return parseInt(index) + 1; - } - }, - // { - // title: '计划id', - // align: "center", - // dataIndex: 'planId' - // }, - { - title: '工单编号', - align: "center", - dataIndex: 'workOrderId' - }, - { - title: '产品id', - align: "center", - dataIndex: 'productId' - }, - { - title: '产品', - align: "center", - dataIndex: 'productName' - }, - { - title: '车间', - align: "center", - dataIndex: 'departName' - }, - { - title: '工序', - align: "center", - dataIndex: 'processName' - }, + {key: 'workOrderId', title: '工单编号', width: '180px'}, + {key: 'productName', title: '产品名称', width: '180px'}, + {key: 'departName', title: '车间名称', width: '180px'}, + {key: 'processName', title: '工序名称', width: '180px'}, + {key: 'groupName', title: '班组名称', width: '180px'}, { title: '班组成员', - align: "center", - dataIndex: 'groupMemberList', - width: 150, - scopedSlots: {customRender: 'groupMemberList'} + key: 'userIds', + type: JVXETypes.selectMultiple, + width: '200px', + options: [], + placeholder: '请选择${title}', }, - // { - // title: '工位工具列表', - // align: "center", - // dataIndex: 'toolsList', - // width: 150, - // scopedSlots: {customRender: 'toolsList'} - // // scopedSlots: {customRender: this.toolsList} - // }, - // { - // title: '工具设备列表', - // align: "center", - // dataIndex: 'machineList', - // width: 150, - // scopedSlots: {customRender: 'machineList'} - // }, - { - title: '操作', - dataIndex: 'action', - align: "center", - fixed: "right", - width: 147, - scopedSlots: {customRender: 'action'} - } ], url: { list: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalist", - // getTeamDatalistByPlanId: "/org.jeecg.modules.productplan/zyPlanProcess/getTeamDatalistByPlanId", - groupMemberlist: "/groupxMember/list", - addTeamBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addTeamBatch", - // stationMachinelist: "/stationMachine/list", - // productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", - delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete", - // deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", - // exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", - // importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", + // addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch", + updateTeamBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addTeamBatch", }, loadRouteType: false, planId: "", - dictOptions: {}, - superFieldList: [], - toolsList: [], - machineList: [], - processIds: [], - memberIds: [], + groupMemberList: [], + clickTrue: true, } }, created() { - this.getSuperFieldList(); - // this.model = Object.assign({}, record); - }, - computed: { - importExcelUrl: function () { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; - }, }, methods: { - saveBatch() { - // alert("保存开始") - postAction(this.url.addTeamBatch, this.processIds).then((res) => { - if (res.success) { - this.$message.success(res.message) - this.$emit('ok') - this.close() - } else { - this.$message.warning(res.message) + // 【整体保存】点击保存按钮时触发的事件 + handleTableSave({$table, target}) { + console.log("保存开始-----") + // 校验整个表格 + $table.validate().then((errMap) => { + // 校验通过 + if (!errMap) { + // 获取所有数据 + let tableData = target.getTableData() + console.log('当前保存的数据是：', tableData) + // 【模拟保存】 + this.loading = true + postAction(this.url.updateTeamBatch, tableData).then(res => { + if (res.success) { + this.$message.success(`保存成功！`) + } else { + this.$message.warn(`保存失败：` + res.message) + } + }).finally(() => { + this.loading = false + }) } - }).finally(() => { - this.confirmLoading = false }) }, fanHui() { @@ -216,16 +119,7 @@ export default { path: '/productplan/ZyPlanTeamList', }); }, - //$event为当前所选的key - selectData($event, row) { - console.log("group_member key $event=" + $event); - // console.log("group_member key row=" + JSON.stringify(row)); - console.log("productProcessId=" + JSON.stringify(row.productProcessId)); - this.processIds.push({"processId": row.productProcessId, "userIds": $event}); - // for (var i = 0; i < processIds.length; i++) { - console.log("the processIds length:" + this.processIds.length); - }, //加载传递参数 loadParameter() { if (this.loadRouteType === false) { @@ -236,14 +130,16 @@ export default { } }, loadData(arg) { + console.log("the loadData---------开始"); + // var that = this; if (!this.url.list) { this.$message.error("请设置url.list属性!") return } //加载数据 若传入参数1则加载第一页的内容 - if (arg === 1) { - this.ipagination.current = 1; - } + // if (arg === 1) { + // this.ipagination.current = 1; + // } this.loadParameter(); var params = this.getQueryParams();//查询条件 this.loading = true; @@ -251,19 +147,12 @@ export default { getAction(this.url.list, params).then((res) => { if (res.success) { this.dataSource = res.result.records || res.result; - if (res.result.total) { - this.ipagination.total = res.result.total; - } else { - this.ipagination.total = 0; - } + this.groupMemberList = this.dataSource[0].groupMemberList; } else { + // this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')"; this.$message.warning(res.message) } }).finally(() => { - // this.dataSource.forEach(item => { - // item['stationName'] = this.stationName; - // item['stationNum'] = this.stationNum; - // }) this.loading = false }) }, @@ -281,51 +170,15 @@ export default { param.planId = this.planId; return filterObj(param); }, - // initDictConfig() { - // }, - getSuperFieldList() { - let fieldList = []; - fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) - fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''}) - fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''}) - fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) - this.superFieldList = fieldList - }, - // jumpPage1(record) { - // this.$router.push({ - // // path: '/productplan/ZyProductPlanList', - // path: '/productplan/ZyPlanProcessDataList', - // - // // query: { // 路由携带参数 - // // 'stationId': record.id, - // // 'stationName': record.stationName, - // // }, - // }); - // }, - // pf(record) { - // this.$router.push({ - // path: '/productplan/ZyPlanProcessAddList', - // query: { // 路由携带参数 - // } - // }); - // getAction("productPlanlist", {id: record.id}).then((res) => { - // if (res.success) { - // this.$router.push({ - // path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList', - // query: { // 路由携带参数 - // } - // }); - // } else { - // this.$message.error(res.message) - // } - // }); - // }, - } -} + // 当选择的行变化时触发的事件 + handleSelectRowChange(event) { + console.log("handleSelectRowChange-event:", event) + const {type, row, column, value, target, $table} = event + console.log("groupMemberList-----------", JSON.stringify(this.groupMemberList)); + // target.$refs.vxe.columns[6].dictCode = this.stationIdCode; + target.$refs.vxe.columns[7].options = this.groupMemberList; + }, + }, +}; - \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java index 184ec973..a9f03775 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java @@ -86,7 +86,7 @@ public class ZyPlanProcess implements Serializable { */ @Excel(name = "设备id列表", width = 15) @ApiModelProperty(value = "设备id列表") - @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id") private String machineIds; /** * 工具id列表 @@ -100,7 +100,7 @@ public class ZyPlanProcess implements Serializable { */ @Excel(name = "成员id列表", width = 15) @ApiModelProperty(value = "成员id列表") - @Dict(dictTable = "groupx_member", dicText = "user_id", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") private String userIds; /** @@ -108,12 +108,14 @@ public class ZyPlanProcess implements Serializable { */ @Excel(name = "前导工序", width = 15) @ApiModelProperty(value = "前导工序") + @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id") private String proProcess; /** * 后导工序 */ @Excel(name = "后导工序", width = 15) @ApiModelProperty(value = "后导工序") + @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id") private String postProcess; /** * 输入产品 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java index 13deea32..92401616 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.modules.team.entity.GroupxMember; +import org.jeecg.modules.team.vo.GroupxMemeberVo; import org.jeecg.modules.team.vo.StationVo; import java.io.Serializable; @@ -16,7 +17,7 @@ public class ProcessDataVo implements Serializable { private static final long serialVersionUID = 1009888L; -// private String id; + // private String id; //工单id private String workOrderId; @@ -34,8 +35,10 @@ public class ProcessDataVo implements Serializable { //工位 private List stationList; + private String groupName; + //班组成员列表 - private List groupMemberList; + private List groupMemberList; //产品工序id // @Dict(dictTable ="zy_process",dicText = "process_name",dicCode = "id") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 15dc6e56..d3933b79 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.productplan.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.modules.demo.base.service.IZyProcessService; import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess; @@ -14,11 +15,15 @@ import org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper; import org.jeecg.modules.productplan.service.IZyPlanProcessService; import org.jeecg.modules.productplan.service.IZyProductPlanService; import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.team.entity.GroupxMember; import org.jeecg.modules.team.entity.Station; import org.jeecg.modules.team.service.IGroupxMemberService; +import org.jeecg.modules.team.service.IGroupxService; import org.jeecg.modules.team.service.IStationService; +import org.jeecg.modules.team.vo.GroupxMemeberVo; import org.jeecg.modules.team.vo.StationVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +32,8 @@ import org.springframework.util.ObjectUtils; import java.util.LinkedList; import java.util.List; +import static com.sun.tools.internal.xjc.reader.Ring.add; + /** * @Description: 生产计划工序 * @Author: jeecg-boot @@ -47,10 +54,15 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl getProcessDatalist(ZyPlanProcess zyPlanProcess) { //生产计划id @@ -59,35 +71,35 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl result = new LinkedList<>(); - //根据产品id获取产品工序列表 -// List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "产品id")); - List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "1")); - if (!ObjectUtils.isEmpty(productProcessesList)) { - SysDepart depart = iSysDepartService.getById(departId); - List stationList = iStationService.list(new LambdaQueryWrapper().eq(Station::getDepartId, departId)); - List stationVoList = new LinkedList<>(); - if (!ObjectUtils.isEmpty(stationList)) { - stationList.forEach(en -> { - StationVo stationVo = new StationVo(); - stationVo.setId(en.getId()); - stationVo.setValue(en.getId()); - stationVo.setText(en.getStationName()); - stationVo.setTitle(en.getStationName()); - stationVoList.add(stationVo); - }); - } - productProcessesList.forEach(e -> { + SysDepart depart = iSysDepartService.getById(departId); + List stationList = iStationService.list(new LambdaQueryWrapper().eq(Station::getDepartId, departId)); + List stationVoList = new LinkedList<>(); + if (!ObjectUtils.isEmpty(stationList)) { + stationList.forEach(en -> { + StationVo stationVo = new StationVo(); + stationVo.setId(en.getId()); + stationVo.setValue(en.getId()); + stationVo.setText(en.getStationName()); + stationVo.setTitle(en.getStationName()); + stationVoList.add(stationVo); + }); + } + + List planProcessList = this.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, planId)); + //TODO暂定有一条数据时，查询产品工序记录，多条时说明已定制计划工序 + if (!ObjectUtils.isEmpty(planProcessList) && planProcessList.size() > 1) { + planProcessList.forEach(e -> { ProcessDataVo vo = new ProcessDataVo(); vo.setPlanId(planId); vo.setProcessId(e.getProcessId()); vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName()); - vo.setProductId(e.getProductId()); vo.setProductName("产品名称"); vo.setWorkOrderId(productCode); vo.setDepartId(departId); @@ -95,6 +107,25 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "产品id")); + List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "1")); + if (!ObjectUtils.isEmpty(productProcessesList)) { + productProcessesList.forEach(e -> { + ProcessDataVo vo = new ProcessDataVo(); + vo.setPlanId(planId); + vo.setProcessId(e.getProcessId()); + vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName()); + vo.setProductId(e.getProductId()); + vo.setProductName("产品名称"); + vo.setWorkOrderId(productCode); + vo.setDepartId(departId); + vo.setDepartName(depart.getDepartName()); + vo.setStationList(stationVoList); + result.add(vo); + }); + } } return result; } @@ -118,18 +149,31 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl groupxMemberList = iGroupxMemberService.list(new LambdaQueryWrapper().eq(GroupxMember::getGroupxId, zyProductPlan.getTeamId())); + List groupxMemberVoList = new LinkedList<>(); + if (!ObjectUtils.isEmpty(groupxMemberList)) { + groupxMemberList.forEach(en -> { + GroupxMemeberVo memeberVo = new GroupxMemeberVo(); + memeberVo.setId(en.getId()); + memeberVo.setValue(en.getUserId()); + SysUser sysUser = iSysUserService.getById(en.getUserId()); + memeberVo.setText(StringUtils.isNotBlank(sysUser.getRealname()) ? sysUser.getRealname() : ""); + memeberVo.setTitle(StringUtils.isNotBlank(sysUser.getRealname()) ? sysUser.getRealname() : ""); + groupxMemberVoList.add(memeberVo); + }); + } + productProcessesList.forEach(e -> { ProcessDataVo vo = new ProcessDataVo(); vo.setPlanId(planId); vo.setProcessId(e.getProcessId()); vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName()); vo.setProductId(e.getProductId()); -// vo.setProductName("产品名称") + vo.setProductName("产品名称"); vo.setWorkOrderId(productCode); vo.setDepartId(departId); vo.setDepartName(depart.getDepartName()); -// vo.setStationList(stationList); - vo.setGroupMemberList(groupxMemberList); + vo.setGroupMemberList(groupxMemberVoList); + vo.setGroupName(iGroupxService.getById(zyProductPlan.getTeamId()).getGroupName()); result.add(vo); }); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java index 22e478f9..bc92163a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java @@ -46,7 +46,7 @@ public class GroupxMember { */ @Excel(name = "用户id FK 用户表", width = 15) @ApiModelProperty(value = "用户id FK 用户表") -// @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") private String userId; @TableField(exist = false) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxMemeberVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxMemeberVo.java new file mode 100644 index 00000000..d4ec8f56 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxMemeberVo.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.team.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class GroupxMemeberVo { + + private String id; + private String value; + private String text; + private String title; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxVo.java new file mode 100644 index 00000000..0e9c1dea --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/GroupxVo.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.team.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class GroupxVo { + + private String id; + private String value; + private String text; + private String title; +}