添加班组代码

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;
+
+}

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;
+
+}

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<BasicdataTeamGroupEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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<BasicdataTeamStaffEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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;
 

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;
+
+}

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;
+
+}

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<BasicdataTeamGroupEntity> 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<IPage<BasicdataTeamGroupEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataTeamGroup, Query query) {
+		IPage<BasicdataTeamGroupEntity> 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<IPage<BasicdataTeamGroupVO>> page(BasicdataTeamGroupVO basicdataTeamGroup, Query query) {
+		IPage<BasicdataTeamGroupVO> 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<String, Object> basicdataTeamGroup, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicdataTeamGroupEntity> 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<BasicdataTeamGroupExcel> list = basicdataTeamGroupService.exportBasicdataTeamGroup(queryWrapper);
+		ExcelUtil.export(response, "基础班组表数据" + DateUtil.time(), "基础班组表数据表", list, BasicdataTeamGroupExcel.class);
+	}
+
+}

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<BasicdataTeamStaffEntity> 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<IPage<BasicdataTeamStaffEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataTeamStaff, Query query) {
+		IPage<BasicdataTeamStaffEntity> 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<IPage<BasicdataTeamStaffVO>> page(BasicdataTeamStaffVO basicdataTeamStaff, Query query) {
+		IPage<BasicdataTeamStaffVO> 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<String, Object> basicdataTeamStaff, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicdataTeamStaffEntity> 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<BasicdataTeamStaffExcel> list = basicdataTeamStaffService.exportBasicdataTeamStaff(queryWrapper);
+		ExcelUtil.export(response, "班组人员表数据" + DateUtil.time(), "班组人员表数据表", list, BasicdataTeamStaffExcel.class);
+	}
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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<BasicdataTeamGroupEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicdataTeamGroupEntity> page = basicdataTeamGroupService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

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<BasicdataTeamStaffEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicdataTeamStaffEntity> page = basicdataTeamStaffService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -31,10 +31,12 @@
              AND id = #{id}
     </update>
     <select id="stockUp" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
-        select *
-        from logpm_warehouse_goods_area
+        select wga.id,wga.headline ,wga.enable_status ,wga.area_type ,ww.name
+        from logpm_warehouse_goods_area wga
+                 left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
         where warehouse_id in (select id
-                               from logpm_warehouse_warehouse where department = #{par.department}) and area_type = 1
+                               from logpm_warehouse_warehouse where department = #{par.department})
+          and wga.area_type = 1 and wga.enable_status = 1
     </select>
 
     <select id="selectWarehouseGoodsAreaPage" resultMap="warehouseGoodsAreaResultMap">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.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.BasicdataTeamGroupEntity;
+import com.logpm.basicdata.vo.BasicdataTeamGroupVO;
+import com.logpm.basicdata.excel.BasicdataTeamGroupExcel;
+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 BasicdataTeamGroupMapper extends BaseMapper<BasicdataTeamGroupEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTeamGroup
+	 * @return
+	 */
+	List<BasicdataTeamGroupVO> selectBasicdataTeamGroupPage(IPage page, BasicdataTeamGroupVO basicdataTeamGroup);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTeamGroupExcel> exportBasicdataTeamGroup(@Param("ew") Wrapper<BasicdataTeamGroupEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml

@@ -0,0 +1,37 @@
+<?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="com.logpm.basicdata.mapper.BasicdataTeamGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicdataTeamGroupResultMap" type="com.logpm.basicdata.entity.BasicdataTeamGroupEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="group_name" property="groupName"/>
+        <result column="belong_to" property="belongTo"/>
+        <result column="group_type" property="groupType"/>
+        <result column="department" property="department"/>
+    </resultMap>
+
+
+    <select id="selectBasicdataTeamGroupPage" resultMap="basicdataTeamGroupResultMap">
+        select * from logpm_basicdata_team_group where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicdataTeamGroup" resultType="com.logpm.basicdata.excel.BasicdataTeamGroupExcel">
+        SELECT * FROM logpm_basicdata_team_group ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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<BasicdataTeamStaffEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTeamStaff
+	 * @return
+	 */
+	List<BasicdataTeamStaffVO> selectBasicdataTeamStaffPage(IPage page, BasicdataTeamStaffVO basicdataTeamStaff);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTeamStaffExcel> exportBasicdataTeamStaff(@Param("ew") Wrapper<BasicdataTeamStaffEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamStaffMapper.xml

@@ -0,0 +1,37 @@
+<?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="com.logpm.basicdata.mapper.BasicdataTeamStaffMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicdataTeamStaffResultMap" type="com.logpm.basicdata.entity.BasicdataTeamStaffEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="team_group_id" property="teamGroupId"/>
+        <result column="name" property="name"/>
+        <result column="job_number" property="jobNumber"/>
+        <result column="staff_id" property="staffId"/>
+    </resultMap>
+
+
+    <select id="selectBasicdataTeamStaffPage" resultMap="basicdataTeamStaffResultMap">
+        select * from logpm_basicdata_team_staff where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicdataTeamStaff" resultType="com.logpm.basicdata.excel.BasicdataTeamStaffExcel">
+        SELECT * FROM logpm_basicdata_team_staff ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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<BasicdataTeamGroupEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTeamGroup
+	 * @return
+	 */
+	IPage<BasicdataTeamGroupVO> selectBasicdataTeamGroupPage(IPage<BasicdataTeamGroupVO> page, BasicdataTeamGroupVO basicdataTeamGroup);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTeamGroupExcel> exportBasicdataTeamGroup(Wrapper<BasicdataTeamGroupEntity> queryWrapper);
+
+}

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<BasicdataTeamStaffEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTeamStaff
+	 * @return
+	 */
+	IPage<BasicdataTeamStaffVO> selectBasicdataTeamStaffPage(IPage<BasicdataTeamStaffVO> page, BasicdataTeamStaffVO basicdataTeamStaff);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTeamStaffExcel> exportBasicdataTeamStaff(Wrapper<BasicdataTeamStaffEntity> queryWrapper);
+
+}

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<BasicdataTeamGroupMapper, BasicdataTeamGroupEntity> implements IBasicdataTeamGroupService {
+
+	@Override
+	public IPage<BasicdataTeamGroupVO> selectBasicdataTeamGroupPage(IPage<BasicdataTeamGroupVO> page, BasicdataTeamGroupVO basicdataTeamGroup) {
+		return page.setRecords(baseMapper.selectBasicdataTeamGroupPage(page, basicdataTeamGroup));
+	}
+
+
+	@Override
+	public List<BasicdataTeamGroupExcel> exportBasicdataTeamGroup(Wrapper<BasicdataTeamGroupEntity> queryWrapper) {
+		List<BasicdataTeamGroupExcel> basicdataTeamGroupList = baseMapper.exportBasicdataTeamGroup(queryWrapper);
+		//basicdataTeamGroupList.forEach(basicdataTeamGroup -> {
+		//	basicdataTeamGroup.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataTeamGroup.getType()));
+		//});
+		return basicdataTeamGroupList;
+	}
+
+}

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<BasicdataTeamStaffMapper, BasicdataTeamStaffEntity> implements IBasicdataTeamStaffService {
+
+	@Override
+	public IPage<BasicdataTeamStaffVO> selectBasicdataTeamStaffPage(IPage<BasicdataTeamStaffVO> page, BasicdataTeamStaffVO basicdataTeamStaff) {
+		return page.setRecords(baseMapper.selectBasicdataTeamStaffPage(page, basicdataTeamStaff));
+	}
+
+
+	@Override
+	public List<BasicdataTeamStaffExcel> exportBasicdataTeamStaff(Wrapper<BasicdataTeamStaffEntity> queryWrapper) {
+		List<BasicdataTeamStaffExcel> basicdataTeamStaffList = baseMapper.exportBasicdataTeamStaff(queryWrapper);
+		//basicdataTeamStaffList.forEach(basicdataTeamStaff -> {
+		//	basicdataTeamStaff.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataTeamStaff.getType()));
+		//});
+		return basicdataTeamStaffList;
+	}
+
+}