diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java new file mode 100644 index 000000000..a3e6389a4 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamGroupEntity.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础班组表 实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@TableName("logpm_basicdata_team_group") +@ApiModel(value = "BasicdataTeamGroup对象", description = "基础班组表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamGroupEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 组名 + */ + @ApiModelProperty(value = "组名") + private String groupName; + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String belongTo; + /** + * 班组类型 + */ + @ApiModelProperty(value = "班组类型") + private Integer groupType; + /** + * 归属部门 + */ + @ApiModelProperty(value = "归属部门") + private Long department; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamStaffEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamStaffEntity.java new file mode 100644 index 000000000..f0451e30d --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTeamStaffEntity.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 班组人员表 实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@TableName("logpm_basicdata_team_staff") +@ApiModel(value = "BasicdataTeamStaff对象", description = "班组人员表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamStaffEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 班组ID + */ + @ApiModelProperty(value = "班组ID") + private String teamGroupId; + /** + * 姓名 + */ + @ApiModelProperty(value = "姓名") + private String name; + /** + * 工号 + */ + @ApiModelProperty(value = "工号") + private String jobNumber; + /** + * 员工表ID + */ + @ApiModelProperty(value = "员工表ID") + private String staffId; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java new file mode 100644 index 000000000..ce4a3a030 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 基础班组表 Feign接口类 + * + * @author BladeX + * @since 2023-06-16 + */ +@FeignClient( + value = "blade-basicdataTeamGroup" +) +public interface IBasicdataTeamGroupClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/to1p"; + + /** + * 获取基础班组表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java new file mode 100644 index 000000000..e792ba4b2 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 班组人员表 Feign接口类 + * + * @author BladeX + * @since 2023-06-16 + */ +@FeignClient( + value = "blade-basicdataTeamStaff" +) +public interface IBasicdataTeamStaffClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/to3p"; + + /** + * 获取班组人员表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java index 8fc99e053..7818c54f3 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java @@ -42,6 +42,8 @@ public class BasicdataGoodsAreaVO extends BasicdataGoodsAreaEntity { private String label; private String value; + //仓库名称 + private String name; private Boolean leaf; diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java new file mode 100644 index 000000000..7eaee0d2c --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础班组表 视图实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamGroupVO extends BasicdataTeamGroupEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamStaffVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamStaffVO.java new file mode 100644 index 000000000..a17bc7439 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamStaffVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 班组人员表 视图实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamStaffVO extends BasicdataTeamStaffEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java new file mode 100644 index 000000000..ee2294b5b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import com.logpm.basicdata.vo.BasicdataTeamGroupVO; +import com.logpm.basicdata.excel.BasicdataTeamGroupExcel; +import com.logpm.basicdata.service.IBasicdataTeamGroupService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 基础班组表 控制器 + * + * @author BladeX + * @since 2023-06-16 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataTeamGroup") +@Api(value = "基础班组表", tags = "基础班组表接口") +public class BasicdataTeamGroupController extends BladeController { + + private final IBasicdataTeamGroupService basicdataTeamGroupService; + + /** + * 基础班组表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataTeamGroup") + public R detail(BasicdataTeamGroupEntity basicdataTeamGroup) { + BasicdataTeamGroupEntity detail = basicdataTeamGroupService.getOne(Condition.getQueryWrapper(basicdataTeamGroup)); + return R.data(detail); + } + /** + * 基础班组表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataTeamGroup") + public R> list(@ApiIgnore @RequestParam Map basicdataTeamGroup, Query query) { + IPage pages = basicdataTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class)); + return R.data(pages); + } + + /** + * 基础班组表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataTeamGroup") + public R> page(BasicdataTeamGroupVO basicdataTeamGroup, Query query) { + IPage pages = basicdataTeamGroupService.selectBasicdataTeamGroupPage(Condition.getPage(query), basicdataTeamGroup); + return R.data(pages); + } + + /** + * 基础班组表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataTeamGroup") + public R save(@Valid @RequestBody BasicdataTeamGroupEntity basicdataTeamGroup) { + return R.status(basicdataTeamGroupService.save(basicdataTeamGroup)); + } + + /** + * 基础班组表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataTeamGroup") + public R update(@Valid @RequestBody BasicdataTeamGroupEntity basicdataTeamGroup) { + return R.status(basicdataTeamGroupService.updateById(basicdataTeamGroup)); + } + + /** + * 基础班组表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataTeamGroup") + public R submit(@Valid @RequestBody BasicdataTeamGroupEntity basicdataTeamGroup) { + return R.status(basicdataTeamGroupService.saveOrUpdate(basicdataTeamGroup)); + } + + /** + * 基础班组表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataTeamGroupService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataTeamGroup") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataTeamGroup") + public void exportBasicdataTeamGroup(@ApiIgnore @RequestParam Map basicdataTeamGroup, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataTeamGroup::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataTeamGroupEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataTeamGroupService.exportBasicdataTeamGroup(queryWrapper); + ExcelUtil.export(response, "基础班组表数据" + DateUtil.time(), "基础班组表数据表", list, BasicdataTeamGroupExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamStaffController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamStaffController.java new file mode 100644 index 000000000..6c0f36fcc --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamStaffController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import com.logpm.basicdata.vo.BasicdataTeamStaffVO; +import com.logpm.basicdata.excel.BasicdataTeamStaffExcel; +import com.logpm.basicdata.service.IBasicdataTeamStaffService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 班组人员表 控制器 + * + * @author BladeX + * @since 2023-06-16 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataTeamStaff") +@Api(value = "班组人员表", tags = "班组人员表接口") +public class BasicdataTeamStaffController extends BladeController { + + private final IBasicdataTeamStaffService basicdataTeamStaffService; + + /** + * 班组人员表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataTeamStaff") + public R detail(BasicdataTeamStaffEntity basicdataTeamStaff) { + BasicdataTeamStaffEntity detail = basicdataTeamStaffService.getOne(Condition.getQueryWrapper(basicdataTeamStaff)); + return R.data(detail); + } + /** + * 班组人员表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataTeamStaff") + public R> list(@ApiIgnore @RequestParam Map basicdataTeamStaff, Query query) { + IPage pages = basicdataTeamStaffService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamStaff, BasicdataTeamStaffEntity.class)); + return R.data(pages); + } + + /** + * 班组人员表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataTeamStaff") + public R> page(BasicdataTeamStaffVO basicdataTeamStaff, Query query) { + IPage pages = basicdataTeamStaffService.selectBasicdataTeamStaffPage(Condition.getPage(query), basicdataTeamStaff); + return R.data(pages); + } + + /** + * 班组人员表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataTeamStaff") + public R save(@Valid @RequestBody BasicdataTeamStaffEntity basicdataTeamStaff) { + return R.status(basicdataTeamStaffService.save(basicdataTeamStaff)); + } + + /** + * 班组人员表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataTeamStaff") + public R update(@Valid @RequestBody BasicdataTeamStaffEntity basicdataTeamStaff) { + return R.status(basicdataTeamStaffService.updateById(basicdataTeamStaff)); + } + + /** + * 班组人员表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataTeamStaff") + public R submit(@Valid @RequestBody BasicdataTeamStaffEntity basicdataTeamStaff) { + return R.status(basicdataTeamStaffService.saveOrUpdate(basicdataTeamStaff)); + } + + /** + * 班组人员表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataTeamStaffService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataTeamStaff") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataTeamStaff") + public void exportBasicdataTeamStaff(@ApiIgnore @RequestParam Map basicdataTeamStaff, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataTeamStaff, BasicdataTeamStaffEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataTeamStaff::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataTeamStaffEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataTeamStaffService.exportBasicdataTeamStaff(queryWrapper); + ExcelUtil.export(response, "班组人员表数据" + DateUtil.time(), "班组人员表数据表", list, BasicdataTeamStaffExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamGroupDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamGroupDTO.java new file mode 100644 index 000000000..4c4bb6878 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamGroupDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础班组表 数据传输对象实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamGroupDTO extends BasicdataTeamGroupEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamStaffDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamStaffDTO.java new file mode 100644 index 000000000..9711281db --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamStaffDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 班组人员表 数据传输对象实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataTeamStaffDTO extends BasicdataTeamStaffEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java new file mode 100644 index 000000000..e5405ad8a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamGroupExcel.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 基础班组表 Excel实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataTeamGroupExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 组名 + */ + @ColumnWidth(20) + @ExcelProperty("组名") + private String groupName; + /** + * 仓库 + */ + @ColumnWidth(20) + @ExcelProperty("仓库") + private String belongTo; + /** + * 班组类型 + */ + @ColumnWidth(20) + @ExcelProperty("班组类型") + private Integer groupType; + /** + * 归属部门 + */ + @ColumnWidth(20) + @ExcelProperty("归属部门") + private Long department; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamStaffExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamStaffExcel.java new file mode 100644 index 000000000..79b6c3f2d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTeamStaffExcel.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 班组人员表 Excel实体类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataTeamStaffExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 班组ID + */ + @ColumnWidth(20) + @ExcelProperty("班组ID") + private String teamGroupId; + /** + * 姓名 + */ + @ColumnWidth(20) + @ExcelProperty("姓名") + private String name; + /** + * 工号 + */ + @ColumnWidth(20) + @ExcelProperty("工号") + private String jobNumber; + /** + * 员工表ID + */ + @ColumnWidth(20) + @ExcelProperty("员工表ID") + private String staffId; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamGroupClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamGroupClient.java new file mode 100644 index 000000000..f121a115b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamGroupClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import com.logpm.basicdata.service.IBasicdataTeamGroupService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 基础班组表 Feign实现类 + * + * @author BladeX + * @since 2023-06-16 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataTeamGroupClient implements IBasicdataTeamGroupClient { + + private final IBasicdataTeamGroupService basicdataTeamGroupService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataTeamGroupService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamStaffClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamStaffClient.java new file mode 100644 index 000000000..7458bf68c --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTeamStaffClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import com.logpm.basicdata.service.IBasicdataTeamStaffService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 班组人员表 Feign实现类 + * + * @author BladeX + * @since 2023-06-16 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataTeamStaffClient implements IBasicdataTeamStaffClient { + + private final IBasicdataTeamStaffService basicdataTeamStaffService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataTeamStaffService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 537984034..30f065a90 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -31,10 +31,12 @@ AND id = #{id} + select * from logpm_basicdata_team_group where is_deleted = 0 + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.java new file mode 100644 index 000000000..04ee8a3d9 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import com.logpm.basicdata.vo.BasicdataTeamStaffVO; +import com.logpm.basicdata.excel.BasicdataTeamStaffExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 班组人员表 Mapper 接口 + * + * @author BladeX + * @since 2023-06-16 + */ +public interface BasicdataTeamStaffMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataTeamStaff + * @return + */ + List selectBasicdataTeamStaffPage(IPage page, BasicdataTeamStaffVO basicdataTeamStaff); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataTeamStaff(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.xml new file mode 100644 index 000000000..9056f1f2d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamGroupService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamGroupService.java new file mode 100644 index 000000000..b3faf6eb2 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamGroupService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import com.logpm.basicdata.vo.BasicdataTeamGroupVO; +import com.logpm.basicdata.excel.BasicdataTeamGroupExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 基础班组表 服务类 + * + * @author BladeX + * @since 2023-06-16 + */ +public interface IBasicdataTeamGroupService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataTeamGroup + * @return + */ + IPage selectBasicdataTeamGroupPage(IPage page, BasicdataTeamGroupVO basicdataTeamGroup); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataTeamGroup(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamStaffService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamStaffService.java new file mode 100644 index 000000000..0f9f26840 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTeamStaffService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import com.logpm.basicdata.vo.BasicdataTeamStaffVO; +import com.logpm.basicdata.excel.BasicdataTeamStaffExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 班组人员表 服务类 + * + * @author BladeX + * @since 2023-06-16 + */ +public interface IBasicdataTeamStaffService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataTeamStaff + * @return + */ + IPage selectBasicdataTeamStaffPage(IPage page, BasicdataTeamStaffVO basicdataTeamStaff); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataTeamStaff(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java new file mode 100644 index 000000000..36a7c29fd --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamGroupServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import com.logpm.basicdata.vo.BasicdataTeamGroupVO; +import com.logpm.basicdata.excel.BasicdataTeamGroupExcel; +import com.logpm.basicdata.mapper.BasicdataTeamGroupMapper; +import com.logpm.basicdata.service.IBasicdataTeamGroupService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 基础班组表 服务实现类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Service +public class BasicdataTeamGroupServiceImpl extends BaseServiceImpl implements IBasicdataTeamGroupService { + + @Override + public IPage selectBasicdataTeamGroupPage(IPage page, BasicdataTeamGroupVO basicdataTeamGroup) { + return page.setRecords(baseMapper.selectBasicdataTeamGroupPage(page, basicdataTeamGroup)); + } + + + @Override + public List exportBasicdataTeamGroup(Wrapper queryWrapper) { + List basicdataTeamGroupList = baseMapper.exportBasicdataTeamGroup(queryWrapper); + //basicdataTeamGroupList.forEach(basicdataTeamGroup -> { + // basicdataTeamGroup.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataTeamGroup.getType())); + //}); + return basicdataTeamGroupList; + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamStaffServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamStaffServiceImpl.java new file mode 100644 index 000000000..869102cba --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamStaffServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import com.logpm.basicdata.vo.BasicdataTeamStaffVO; +import com.logpm.basicdata.excel.BasicdataTeamStaffExcel; +import com.logpm.basicdata.mapper.BasicdataTeamStaffMapper; +import com.logpm.basicdata.service.IBasicdataTeamStaffService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 班组人员表 服务实现类 + * + * @author BladeX + * @since 2023-06-16 + */ +@Service +public class BasicdataTeamStaffServiceImpl extends BaseServiceImpl implements IBasicdataTeamStaffService { + + @Override + public IPage selectBasicdataTeamStaffPage(IPage page, BasicdataTeamStaffVO basicdataTeamStaff) { + return page.setRecords(baseMapper.selectBasicdataTeamStaffPage(page, basicdataTeamStaff)); + } + + + @Override + public List exportBasicdataTeamStaff(Wrapper queryWrapper) { + List basicdataTeamStaffList = baseMapper.exportBasicdataTeamStaff(queryWrapper); + //basicdataTeamStaffList.forEach(basicdataTeamStaff -> { + // basicdataTeamStaff.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataTeamStaff.getType())); + //}); + return basicdataTeamStaffList; + } + +}